[martin-hilton, r=timkuhlman] The stops the replica-set-relation-broken hook from erroring if the unit isn't in a replica set.

1 files changed, 11 insertions, 0 deletions

diff --git a/hooks/hooks.py b/hooks/hooks.py
index aa09ff5..eafce5a 100755
--- a/hooks/hooks.py
+++ b/hooks/hooks.py
@@ -1166,6 +1166,12 @@ def replica_set_relation_joined():
 juju_log("replica_set_relation_joined-finish")
 
 
+def in_replica_set():
+ c = Connection('localhost')
+ r = run_admin_command(c, 'isMaster')
+ return 'setName' in r
+
+
 def am_i_primary():
 c = Connection('localhost')
 for i in xrange(10):
@@ -1260,6 +1266,11 @@ def replica_set_relation_departed():
 def replica_set_relation_broken():
 juju_log('replica_set_relation_broken-start')
 
+ if not in_replica_set():
+ juju_log('not in replica set', level=DEBUG)
+ juju_log('replica_set_relation_broken-finish')
+ return
+
 if am_i_primary():
 juju_log('I was primary - removing myself via new primary.', 'DEBUG')
 mongo_client('localhost', 'rs.stepDown()')