diff options
| -rw-r--r-- | oslo_concurrency/lockutils.py | 29 | ||||
| -rw-r--r-- | oslo_concurrency/tests/unit/test_lockutils_eventlet.py | 16 |
2 files changed, 26 insertions, 19 deletions
diff --git a/oslo_concurrency/lockutils.py b/oslo_concurrency/lockutils.py index 4b085c4..8ca6d1a 100644 --- a/oslo_concurrency/lockutils.py +++ b/oslo_concurrency/lockutils.py @@ -32,6 +32,14 @@ from oslo_utils import timeutils from oslo_concurrency._i18n import _ +try: + # import eventlet optionally + import eventlet + from eventlet import patcher as eventlet_patcher +except ImportError: + eventlet = None + eventlet_patcher = None + LOG = logging.getLogger(__name__) @@ -79,12 +87,23 @@ def get_lock_path(conf): return conf.oslo_concurrency.lock_path -InterProcessLock = fasteners.InterProcessLock -ReaderWriterLock = fasteners.ReaderWriterLock -"""A reader/writer lock. +class ReaderWriterLock(fasteners.ReaderWriterLock): + """A reader/writer lock. + + .. versionadded:: 0.4 + """ + def __init__(self, *args, **kwargs): + super().__init__(*args, **kwargs) + # Until https://github.com/eventlet/eventlet/issues/731 is resolved + # we need to use eventlet.getcurrent instead of + # threading.current_thread if we are running in a monkey patched + # environment + if eventlet is not None and eventlet_patcher is not None: + if eventlet_patcher.is_monkey_patched('thread'): + self._current_thread = eventlet.getcurrent + -.. versionadded:: 0.4 -""" +InterProcessLock = fasteners.InterProcessLock class FairLocks(object): diff --git a/oslo_concurrency/tests/unit/test_lockutils_eventlet.py b/oslo_concurrency/tests/unit/test_lockutils_eventlet.py index 24fd7f6..ad51f03 100644 --- a/oslo_concurrency/tests/unit/test_lockutils_eventlet.py +++ b/oslo_concurrency/tests/unit/test_lockutils_eventlet.py @@ -99,18 +99,6 @@ class TestInternalLock(test_base.BaseTestCase): ) def test_fair_lock_with_spawn_n(self): - # This is bug 1988311 where spawn_n does not work with fair locks - ex = self.assertRaises( - AssertionError, - self._test_internal_lock_with_two_threads, - fair=True, - spawn=eventlet.spawn_n, - ) - self.assertEqual( - "'finished' is not None: " - "Two threads was able to take the same lock", - str(ex), + self._test_internal_lock_with_two_threads( + fair=True, spawn=eventlet.spawn_n ) - # self._test_internal_lock_with_two_threads( - # fair=True, spawn=eventlet.spawn_n - # ) |