x/python-ganttclient
Code Issues Proposed changes

Fixed assertion "Someone released me too many times: too many tokens!"

Browse Source
This commit is contained in:
Ewan Mellor
2010-07-29 12:37:30 +00:00
committed by Tarmac
parent 1911e05996 7265888587
commit 61e4b87185
2 changed files with 14 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
nova/process.py
View File

@@ -205,13 +205,13 @@ class ProcessPool(object):
self._pool.release() self._pool.release()
return rv return rv
class SharedPool(ProcessPool): class SharedPool(object):
_instance = None _instance = None
def __new__(cls, *args, **kwargs): def __init__(self):
if not cls._instance: if SharedPool._instance is None:
cls._instance = super(SharedPool, cls).__new__( self.__class__._instance = ProcessPool()
cls, *args, **kwargs) def __getattr__(self, key):
return cls._instance return getattr(self._instance, key)
def simple_execute(cmd, **kwargs): def simple_execute(cmd, **kwargs):
return SharedPool().simple_execute(cmd, **kwargs) return SharedPool().simple_execute(cmd, **kwargs)

9
nova/tests/process_unittest.py
View File

@@ -118,5 +118,12 @@ class ProcessTestCase(test.TrialTestCase):
def test_shared_pool_is_singleton(self): def test_shared_pool_is_singleton(self):
pool1 = process.SharedPool() pool1 = process.SharedPool()
pool2 = process.SharedPool() pool2 = process.SharedPool()
self.assert_(id(pool1) == id(pool2)) self.assertEqual(id(pool1._instance), id(pool2._instance))
def test_shared_pool_works_as_singleton(self):
d1 = process.simple_execute('sleep 1')
d2 = process.simple_execute('sleep 0.005')
# lp609749: would have failed with
# exceptions.AssertionError: Someone released me too many times:
# too many tokens!
return d1