openstack
/
tooz
Code Issues Proposed changes

redis: make sure we don't release and heartbeat a lock at the same time 

Otherwise that makes Redis unhappy.

Change-Id: I4659bee93b2112733fe76d329bf73327878c5641
Closes-Bug: #1557593
This commit is contained in:
Julien Danjou 2016-11-24 14:54:23 +01:00
parent da12883f2b
commit 486524c37f
1 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
tooz/drivers/redis.py
View File

@ -20,6 +20,7 @@ import contextlib
from distutils import version
import logging
import string
import threading
from concurrent import futures
from oslo_utils import encodeutils
@ -58,6 +59,9 @@ class RedisLock(locking.Lock):
def __init__(self, coord, client, name, timeout):
name = "%s_%s_lock" % (coord.namespace, six.text_type(name))
super(RedisLock, self).__init__(name)
# NOTE(jd) Make sure we don't release and heartbeat at the same time by
# using a exclusive access lock (LP#1557593)
self._exclusive_access = threading.Lock()
self._lock = client.lock(name,
timeout=timeout,
thread_local=False)
@ -86,20 +90,22 @@ class RedisLock(locking.Lock):
return acquired
def release(self):
if not self.acquired:
return False
with _translate_failures():
try:
self._lock.release()
except exceptions.LockError:
with self._exclusive_access:
if not self.acquired:
return False
self._coord._acquired_locks.discard(self)
return True
with _translate_failures():
try:
self._lock.release()
except exceptions.LockError:
return False
self._coord._acquired_locks.discard(self)
return True
def heartbeat(self):
if self.acquired:
with _translate_failures():
self._lock.extend(self._lock.timeout)
with self._exclusive_access:
if self.acquired:
with _translate_failures():
self._lock.extend(self._lock.timeout)
@property
def acquired(self):