From ae9e4e81d992fb81c01acd2dfcb1cb3d32956041 Mon Sep 17 00:00:00 2001
From: Vishvananda Ishaya <vishvananda@gmail.com>
Date: Fri, 16 Jul 2010 19:12:36 +0000
Subject: Removed unused Pool from process.py, added a singleton pool called
 SharedPool, changed calls in node to use singleton pool

---
 nova/process.py | 46 +++++++++++-----------------------------------
 1 file changed, 11 insertions(+), 35 deletions(-)

(limited to 'nova/process.py')

diff --git a/nova/process.py b/nova/process.py
index ff789a08a..ebfb2f4ba 100644
--- a/nova/process.py
+++ b/nova/process.py
@@ -85,7 +85,7 @@ class _BackRelay(protocol.ProcessProtocol):
     def errReceivedIsBad(self, text):
         if self.deferred is not None:
             self.onProcessEnded = defer.Deferred()
-            err = _UnexpectedErrorOutput(text, self.onProcessEnded)
+            err = UnexpectedErrorOutput(text, self.onProcessEnded)
             self.deferred.errback(failure.Failure(err))
             self.deferred = None
             self.transport.loseConnection()
@@ -152,8 +152,8 @@ def getProcessOutput(executable, args=None, env=None, path=None, reactor=None,
     d = defer.Deferred()
     p = BackRelayWithInput(
             d, startedDeferred=startedDeferred, error_ok=error_ok, input=input)
-    # VISH: commands come in as unicode, but self.executes needs
-    #       strings or process.spawn raises a deprecation warning
+    # NOTE(vish): commands come in as unicode, but self.executes needs
+    #             strings or process.spawn raises a deprecation warning
     executable = str(executable)
     if not args is None:
         args = [str(x) for x in args]
@@ -171,7 +171,7 @@ class ProcessPool(object):
         self.size = size and size or FLAGS.process_pool_size
         self._pool = defer.DeferredSemaphore(self.size)
 
-    def simpleExecute(self, cmd, **kw):
+    def simple_execute(self, cmd, **kw):
         """ Weak emulation of the old utils.execute() function.
 
         This only exists as a way to quickly move old execute methods to
@@ -205,34 +205,10 @@ class ProcessPool(object):
         self._pool.release()
         return rv
 
-
-class Pool(object):
-    """ A simple process pool implementation around mutliprocessing.
-
-    Allows up to `size` processes at a time and queues the rest.
-
-    Using workarounds for multiprocessing behavior described in:
-    http://pypi.python.org/pypi/twisted.internet.processes/1.0b1
-    """
-
-    def __init__(self, size=None):
-        self._size = size
-        self._pool = multiprocessing.Pool(size)
-        self._registerShutdown()
-
-    def _registerShutdown(self):
-        reactor.addSystemEventTrigger(
-                'during', 'shutdown', self.shutdown, reactor)
-
-    def shutdown(self, reactor=None):
-        if not self._pool:
-            return
-        self._pool.close()
-        # wait for workers to finish
-        self._pool.terminate()
-        self._pool = None
-
-    def apply(self, f, *args, **kw):
-        """ Add a task to the pool and return a deferred. """
-        result = self._pool.apply_async(f, args, kw)
-        return threads.deferToThread(result.get)
+class SharedPool(ProcessPool):
+    _instance = None
+    def __new__(cls, *args, **kwargs):
+        if not cls._instance:
+            cls._instance = super(SharedPool, cls).__new__(
+                    cls, *args, **kwargs)
+        return cls._instance
-- 
cgit 


From 52f0ec017c04ad9356eb45d96bcab90a0807d914 Mon Sep 17 00:00:00 2001
From: Vishvananda Ishaya <vishvananda@gmail.com>
Date: Fri, 16 Jul 2010 20:32:51 +0000
Subject: make simple method wrapper for process pool simple_execute

---
 nova/process.py | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'nova/process.py')

diff --git a/nova/process.py b/nova/process.py
index ebfb2f4ba..d3558ed2e 100644
--- a/nova/process.py
+++ b/nova/process.py
@@ -212,3 +212,6 @@ class SharedPool(ProcessPool):
             cls._instance = super(SharedPool, cls).__new__(
                     cls, *args, **kwargs)
         return cls._instance
+
+def simple_execute(cmd, **kwargs):
+    return SharedPool().simple_execute(cmd, **kwargs)
-- 
cgit