summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSoren Hansen <soren@linux2go.dk>2011-02-14 21:06:16 +0100
committerSoren Hansen <soren@linux2go.dk>2011-02-14 21:06:16 +0100
commit89ca05c457cb951e91060359493e5f830fe5eeda (patch)
tree6f401d0401436a602743d8bb5bcc4175c886c41e
parent799f5222e5eea2825f1e05a66e44eb4df709234e (diff)
downloadnova-89ca05c457cb951e91060359493e5f830fe5eeda.tar.gz
nova-89ca05c457cb951e91060359493e5f830fe5eeda.tar.xz
nova-89ca05c457cb951e91060359493e5f830fe5eeda.zip
Use eventlet.green.subprocess instead of standard subprocess
Eventlet's monkey patching causes the os.wait call in the standard subprocess module to be non-blocking. This means that if it happens to call self.wait on a Popen object that hasn't completely terminated it'll be left as a zombie and its fd's are also leaked.
-rw-r--r--nova/utils.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/nova/utils.py b/nova/utils.py
index 8d7ff1f64..ba71ebf39 100644
--- a/nova/utils.py
+++ b/nova/utils.py
@@ -25,7 +25,6 @@ import inspect
import json
import os
import random
-import subprocess
import socket
import struct
import sys
@@ -36,6 +35,7 @@ import netaddr
from eventlet import event
from eventlet import greenthread
+from eventlet.green import subprocess
from nova import exception
from nova.exception import ProcessExecutionError