summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZuul <zuul@review.opendev.org>2019-12-16 17:13:57 +0000
committerGerrit Code Review <review@openstack.org>2019-12-16 17:13:57 +0000
commit4c85e958a53e66d995c0fb150d3f26531c19db08 (patch)
treec676b5ac9a7f7272f033532b608e4236afc1eb1b
parentea29fbfdab42ce7771e12f5fb5bfc90b5b4d348a (diff)
parent55864ed2450dc8adb3ea77be0e2edba061b6c548 (diff)
downloadtooz-4c85e958a53e66d995c0fb150d3f26531c19db08.tar.gz
Merge "Fix membership lease issue on the etcd3gw driver"1.67.1
-rw-r--r--tooz/drivers/etcd3gw.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/tooz/drivers/etcd3gw.py b/tooz/drivers/etcd3gw.py
index eedaf6f..0c64e70 100644
--- a/tooz/drivers/etcd3gw.py
+++ b/tooz/drivers/etcd3gw.py
@@ -218,7 +218,9 @@ class Etcd3Driver(coordination.CoordinationDriverWithExecutor):
# NOTE(jaypipes): Copying because set can mutate during iteration
for lock in self._acquired_locks.copy():
lock.heartbeat()
- return self.lock_timeout
+ # TODO(kaifeng) use the same lease for locks?
+ self._membership_lease.refresh()
+ return min(self.lock_timeout, self.membership_timeout)
def watch_join_group(self, group_id, callback):
raise tooz.NotImplemented