From 281b0b8455c83dfec5a97fdf5ed2d71575d45111 Mon Sep 17 00:00:00 2001 From: Alexander Kukushkin Date: Tue, 12 May 2015 11:07:52 +0200 Subject: [PATCH] Bugfix in has_lock: sometimes leader can be undefined --- helpers/ha.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/helpers/ha.py b/helpers/ha.py index 0399b0fe..3131a235 100644 --- a/helpers/ha.py +++ b/helpers/ha.py @@ -33,8 +33,9 @@ class Ha: return not (self.cluster.leader and self.cluster.leader.hostname) def has_lock(self): - logger.info('Lock owner: %s; I am %s', self.cluster.leader.hostname, self.state_handler.name) - return self.cluster.leader.hostname == self.state_handler.name + lock_owner = self.cluster.leader and self.cluster.leader.hostname + logger.info('Lock owner: %s; I am %s', lock_owner, self.state_handler.name) + return lock_owner == self.state_handler.name def demote(self): return self.state_handler.demote(self.cluster.leader)