From ca3414bda049a88abf36167b95d003dc02948a99 Mon Sep 17 00:00:00 2001 From: Alexander Kukushkin Date: Fri, 18 Mar 2016 13:24:30 +0100 Subject: [PATCH] Ha loop was writing into scheduled_at during "manual_failover" --- patroni/api.py | 2 +- patroni/ha.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/patroni/api.py b/patroni/api.py index 342e1bf6..ac227619 100644 --- a/patroni/api.py +++ b/patroni/api.py @@ -197,7 +197,7 @@ class RestApiHandler(BaseHTTPRequestHandler): elif scheduled_at < datetime.datetime.now(pytz.utc): data = b'Cannot schedule failover in the past' status_code = 422 - elif self.server.patroni.dcs.manual_failover(leader, member, scheduled_at): + elif self.server.patroni.dcs.manual_failover(leader, member, scheduled_at=scheduled_at): data = b'Failover scheduled' status_code = 200 except (ValueError, TypeError): diff --git a/patroni/ha.py b/patroni/ha.py index 8c841290..84fb1225 100644 --- a/patroni/ha.py +++ b/patroni/ha.py @@ -298,7 +298,7 @@ class Ha(object): return elif delta < - int(self.patroni.nap_time * 1.5): logger.warning('Found a stale failover value, cleaning up: %s', failover.scheduled_at) - self.dcs.manual_failover('', '', self.cluster.failover.index) + self.dcs.manual_failover('', '', index=self.cluster.failover.index) return # The value is very close to now @@ -323,7 +323,7 @@ class Ha(object): self.cluster.failover.leader, self.state_handler.name) logger.info('Trying to clean up failover key') - self.dcs.manual_failover('', '', self.cluster.failover.index) + self.dcs.manual_failover('', '', index=self.cluster.failover.index) def process_unhealthy_cluster(self): if self.is_healthiest_node():