Merge lp:~tribaal/charms/trusty/rabbitmq-server/add-extra-logging into lp:~openstack-charmers-archive/charms/trusty/rabbitmq-server/next

[Chris Glass]

This branch addresses some of the review comments from https://code.launchpad.net/~tribaal/charms/trusty/rabbitmq-server/backport-lp1500204/+merge/273958

This addresses the logging part in order to make for an easy backport to -stable.

[Liam Young (gnuoy)]

Approved

review: Approve

=== modified file 'hooks/rabbit_utils.py'
--- hooks/rabbit_utils.py	2015-10-06 21:52:17 +0000
+++ hooks/rabbit_utils.py	2015-10-13 15:41:33 +0000
@@ -312,13 +312,13 @@
         if node in running_nodes():
             log('Host already clustered with %s.' % node)
             return False
-        log('Clustering with remote rabbit host (%s).' % node)
         # NOTE: The primary problem rabbitmq has clustering is when
         # more than one node attempts to cluster at the same time.
         # The asynchronous nature of hook firing nearly guarantees
         # this. Using random time wait is a hack until we can
         # implement charmhelpers.coordinator.
         time.sleep(random.random()*100)
+        log('Clustering with remote rabbit host (%s).' % node)
         try:
             cmd = [RABBITMQ_CTL, 'stop_app']
             subprocess.check_call(cmd)
 
=== modified file 'hooks/rabbitmq_server_relations.py'
--- hooks/rabbitmq_server_relations.py	2015-10-06 18:55:33 +0000
+++ hooks/rabbitmq_server_relations.py	2015-10-13 15:41:33 +0000
@@ -261,10 +261,12 @@
     min_size = config('min-cluster-size')
     if min_size:
         # Ignore min-cluster-size if juju has leadership election
-        try: 
+        try:
             is_leader()
+            log("Ignoring min-cluster-size in favour of Juju leader election")
             return True
         except NotImplementedError:
+            log("Leader election is not available, using min-cluster-size")
             size = 0
             for rid in relation_ids('cluster'):
                 size = len(related_units(rid))