diff options
| -rw-r--r-- | lib/spack/llnl/util/lock.py | 8 | ||||
| -rw-r--r-- | lib/spack/spack/test/llnl/util/lock.py | 57 |
2 files changed, 64 insertions, 1 deletions
diff --git a/lib/spack/llnl/util/lock.py b/lib/spack/llnl/util/lock.py index c675c7c452..86a45e2d7c 100644 --- a/lib/spack/llnl/util/lock.py +++ b/lib/spack/llnl/util/lock.py @@ -351,7 +351,13 @@ class Lock(object): else: self._writes -= 1 - return False + + # when the last *write* is released, we call release_fn here + # instead of immediately before releasing the lock. + if self._writes == 0: + return release_fn() if release_fn is not None else True + else: + return False def _debug(self, *args): tty.debug(*args) diff --git a/lib/spack/spack/test/llnl/util/lock.py b/lib/spack/spack/test/llnl/util/lock.py index 3bf8a236b1..2b0892a25e 100644 --- a/lib/spack/spack/test/llnl/util/lock.py +++ b/lib/spack/spack/test/llnl/util/lock.py @@ -783,6 +783,12 @@ class AssertLock(lk.Lock): super(AssertLock, self).__init__(lock_path) self.vals = vals + # assert hooks for subclasses + assert_acquire_read = lambda self: None + assert_acquire_write = lambda self: None + assert_release_read = lambda self: None + assert_release_write = lambda self: None + def acquire_read(self, timeout=None): self.assert_acquire_read() result = super(AssertLock, self).acquire_read(timeout) @@ -1030,6 +1036,57 @@ def test_transaction_with_context_manager(lock_path, transaction, type): assert_only_ctx_exception(raises=False) +def test_nested_write_transaction(lock_path): + """Ensure that the outermost write transaction writes.""" + + def write(t, v, tb): + vals['wrote'] = True + + vals = collections.defaultdict(lambda: False) + lock = AssertLock(lock_path, vals) + + # write/write + with lk.WriteTransaction(lock, release=write): + assert not vals['wrote'] + with lk.WriteTransaction(lock, release=write): + assert not vals['wrote'] + assert not vals['wrote'] + assert vals['wrote'] + + # read/write + vals.clear() + with lk.ReadTransaction(lock): + assert not vals['wrote'] + with lk.WriteTransaction(lock, release=write): + assert not vals['wrote'] + assert vals['wrote'] + + # write/read/write + vals.clear() + with lk.WriteTransaction(lock, release=write): + assert not vals['wrote'] + with lk.ReadTransaction(lock): + assert not vals['wrote'] + with lk.WriteTransaction(lock, release=write): + assert not vals['wrote'] + assert not vals['wrote'] + assert not vals['wrote'] + assert vals['wrote'] + + # read/write/read/write + vals.clear() + with lk.ReadTransaction(lock): + with lk.WriteTransaction(lock, release=write): + assert not vals['wrote'] + with lk.ReadTransaction(lock): + assert not vals['wrote'] + with lk.WriteTransaction(lock, release=write): + assert not vals['wrote'] + assert not vals['wrote'] + assert not vals['wrote'] + assert vals['wrote'] + + def test_lock_debug_output(lock_path): host = socket.getfqdn() |