diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-06-17 08:42:42 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-06-17 08:42:42 +0000 |
| commit | 8f53db4e24027d83ed2f2b0e777023c47717e149 (patch) | |
| tree | 7389abd65c5f799d1b8846dc28a49e689f9b7337 | |
| parent | 8e02005eb586f428065a22895fec190ad505a28b (diff) | |
| parent | 274f9a61c1af032736a9749437effe4e59f0a68d (diff) | |
| download | tooz-8f53db4e24027d83ed2f2b0e777023c47717e149.tar.gz | |
Merge "redis: do not force LuaLock"
| -rw-r--r-- | tooz/drivers/redis.py | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/tooz/drivers/redis.py b/tooz/drivers/redis.py index c86b204..299a56e 100644 --- a/tooz/drivers/redis.py +++ b/tooz/drivers/redis.py @@ -26,7 +26,6 @@ from oslo_utils import encodeutils from oslo_utils import strutils import redis from redis import exceptions -from redis import lock as redis_locks from redis import sentinel import six from six.moves import map as compat_map @@ -59,9 +58,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) - self._lock = redis_locks.LuaLock(client, name, - timeout=timeout, - thread_local=False) + self._lock = client.lock(name, + timeout=timeout, + thread_local=False) self._coord = coord self._client = client |
