Merge lp:~hloeung/ubuntu-repository-cache/i-really-am-the-leader into lp:~tribaal/ubuntu-repository-cache/trunk

[Haw Loeung]

Ensure unit is the leader

Per LP#1723184, if the unit was elected (thus causing leader-elected
hook to fire) but then another elected, leader-set fails and we end up
in a leader-elected hook loop. Let's ensure this unit is the leader.

[Chris Glass (tribaal)]

Looks good!

Will merge.

review: Approve

=== modified file 'hooks/hooks.py'
--- hooks/hooks.py	2017-04-04 12:12:06 +0000
+++ hooks/hooks.py	2017-12-04 23:42:37 +0000
@@ -233,6 +233,10 @@
     We need to tell other units what the unit name for the leader is (the unit
     name of the currently-running hook).
     """
+    # Per LP#1723184, double check that we're the leader.
+    if not hookenv.is_leader():
+        LOG('leader-elected fired. This is not the leader')
+        return
     LOG('leader-elected fired. This unit is the new leader: {}'.format(
             hookenv.local_unit()))
     hookenv.leader_set(leader_id=hookenv.local_unit())