From 4a081bcb7179ad00f3771113176c27706ca43a76 Mon Sep 17 00:00:00 2001 From: Alexander Kukushkin Date: Mon, 14 Sep 2015 11:58:10 +0200 Subject: [PATCH] Run cancel_initialization with retry --- patroni/zookeeper.py | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/patroni/zookeeper.py b/patroni/zookeeper.py index f2ef2e99..38891c58 100644 --- a/patroni/zookeeper.py +++ b/patroni/zookeeper.py @@ -228,13 +228,16 @@ class ZooKeeper(AbstractDCS): if isinstance(self.cluster, Cluster) and self.cluster.leader.name == self._name: self.client.delete(self.leader_path, version=self.cluster.leader.index) - def cancel_initialization(self): + def _cancel_initialization(self): node = self.get_node(self.initialize_path) if node and node[0] == self._name: - try: - self.client.retry(self.client.delete, self.initialize_path, version=node[1].mzxid) - except KazooException: - logger.exception("Unable to delete initialize key") + self.client.delete(self.initialize_path, version=node[1].mzxid) + + def cancel_initialization(self): + try: + self.client.retry(self._cancel_initialization) + except: + logger.exception("Unable to delete initialize key") def watch(self, timeout): self.cluster_event.wait(timeout)