openstack
/
tooz
Code Issues Proposed changes

Merge "Fix inappropriate logic in memcachedlock.release()"

This commit is contained in:
Zuul 2022-07-15 20:17:58 +00:00 committed by Gerrit Code Review
parent e3de0e634a 6b2216ebcc
commit 1e86b91035
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
releasenotes/notes/memcached-fix-lock-release-I6fc33b8e0a88510.yaml Normal file
View File

@ -0,0 +1,4 @@
---
fixes:
- |
Fixs inappropriate logic in memcachedlock.release()

9
tooz/drivers/memcached.py
View File

@ -150,11 +150,16 @@ class MemcachedLock(locking.Lock):
# it being done in the client side (non-atomic).
value = self.coord.client.get(self.name)
if value != self.coord._member_id:
# NOTE(zhen): Although ``member_ id`` is different, self lock
# object needs to be removed from'_ acquired_locks' because it
# has the same key.
self.coord._acquired_locks.remove(self)
return False
else:
# NOTE(zhen): Whether 'was_deleted' was 'TRUE' or not,
# eventually we have to remove self from '_acquired_locks'.
was_deleted = self.coord.client.delete(self.name, noreply=False)
if was_deleted:
self.coord._acquired_locks.remove(self)
self.coord._acquired_locks.remove(self)
return was_deleted
@_translate_failures