diff options
| author | Zuul <zuul@review.opendev.org> | 2022-07-15 20:20:25 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2022-07-15 20:20:25 +0000 |
| commit | a10db5d089a45da013f2b2875680ceb44d2ac562 (patch) | |
| tree | 6944dfbbcc8d11bee3ca6fa850b65f062603f006 | |
| parent | 1e86b9103584ce4360633df8e9c536a559a1f79b (diff) | |
| parent | ae5adcf3874d3ab40a8f6c475b450e72a75f5d23 (diff) | |
| download | tooz-a10db5d089a45da013f2b2875680ceb44d2ac562.tar.gz | |
Merge "[etcd3gw] create new lease if expired."
| -rw-r--r-- | releasenotes/notes/etcd3gw_create_new_lease_if_expired_during_refresh-1d631d36c21ea28c.yaml | 7 | ||||
| -rw-r--r-- | tooz/drivers/etcd3gw.py | 12 |
2 files changed, 17 insertions, 2 deletions
diff --git a/releasenotes/notes/etcd3gw_create_new_lease_if_expired_during_refresh-1d631d36c21ea28c.yaml b/releasenotes/notes/etcd3gw_create_new_lease_if_expired_during_refresh-1d631d36c21ea28c.yaml new file mode 100644 index 0000000..72360bb --- /dev/null +++ b/releasenotes/notes/etcd3gw_create_new_lease_if_expired_during_refresh-1d631d36c21ea28c.yaml @@ -0,0 +1,7 @@ +--- +fixes: + - | + [etcd3gw] Membership lease can be already expired to the moment of lease + refreshing. In this case heartbeat will try to refresh expired lease + forever without success. The patch checks if lease is expired and creates + new one. diff --git a/tooz/drivers/etcd3gw.py b/tooz/drivers/etcd3gw.py index d4a7693..d426b74 100644 --- a/tooz/drivers/etcd3gw.py +++ b/tooz/drivers/etcd3gw.py @@ -14,6 +14,7 @@ import base64 import functools +import logging import threading import uuid @@ -27,6 +28,8 @@ from tooz import coordination from tooz import locking from tooz import utils +LOG = logging.getLogger(__name__) + def _encode(data): """Safely encode data for consumption of the gateway.""" @@ -218,6 +221,7 @@ class Etcd3Driver(coordination.CoordinationDriverWithExecutor): self.membership_timeout = int(options.get( 'membership_timeout', timeout)) self._acquired_locks = set() + self._membership_lease = None def _start(self): super(Etcd3Driver, self)._start() @@ -227,11 +231,15 @@ class Etcd3Driver(coordination.CoordinationDriverWithExecutor): return Etcd3Lock(self, name, self.lock_timeout) def heartbeat(self): + # TODO(kaifeng) use the same lease for locks? + if self._membership_lease.refresh() == -1: + expired_lease = self._membership_lease.id + self._membership_lease = self.client.lease(self.membership_timeout) + LOG.debug('Created new lease %s after previous lease %s expired.', + self._membership_lease.id, expired_lease) # NOTE(jaypipes): Copying because set can mutate during iteration for lock in self._acquired_locks.copy(): lock.heartbeat() - # 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): |