Merge lp:~gnuoy/charms/trusty/percona-cluster/use-dc-stable into lp:~openstack-charmers-archive/charms/trusty/percona-cluster/trunk

[Liam Young]

[lp:~gnuoy/charms/trusty/percona-cluster/use-dc-stable]

62. By Liam Young on 2015-06-08

Revert unconnected charmhelpers/contrib/database/mysql.py

[uosci-testing-bot (uosci-testing-bot)]

charm_lint_check #5123 percona-cluster for gnuoy mp261372
    LINT FAIL: lint-test failed

LINT Results (max last 2 lines):
make: *** [lint] Error 1
ERROR:root:Make target returned non-zero.

Full lint test output: http://paste.ubuntu.com/11648258/
Build: http://10.245.162.77:8080/job/charm_lint_check/5123/

[uosci-testing-bot (uosci-testing-bot)]

charm_unit_test #4802 percona-cluster for gnuoy mp261372
    UNIT OK: passed

Build: http://10.245.162.77:8080/job/charm_unit_test/4802/

[uosci-testing-bot (uosci-testing-bot)]

charm_amulet_test #4530 percona-cluster for gnuoy mp261372
    AMULET FAIL: amulet-test missing

AMULET Results (max last 2 lines):
INFO:root:Search string not found in makefile target commands.
ERROR:root:No make target was executed.

Full amulet test output: http://paste.ubuntu.com/11648285/
Build: http://10.245.162.77:8080/job/charm_amulet_test/4530/

[James Page (james-page)]

review: Approve

=== modified file 'hooks/charmhelpers/contrib/hahelpers/cluster.py'
--- hooks/charmhelpers/contrib/hahelpers/cluster.py	2015-03-03 02:26:12 +0000
+++ hooks/charmhelpers/contrib/hahelpers/cluster.py	2015-06-08 12:21:34 +0000
@@ -52,6 +52,8 @@
     bool_from_string,
 )
 
+DC_RESOURCE_NAME = 'DC'
+
 
 class HAIncompleteConfig(Exception):
     pass
@@ -95,6 +97,27 @@
     return False
 
 
+def is_crm_dc():
+    """
+    Determine leadership by querying the pacemaker Designated Controller
+    """
+    cmd = ['crm', 'status']
+    try:
+        status = subprocess.check_output(cmd, stderr=subprocess.STDOUT)
+        if not isinstance(status, six.text_type):
+            status = six.text_type(status, "utf-8")
+    except subprocess.CalledProcessError:
+        return False
+    current_dc = ''
+    for line in status.split('\n'):
+        if line.startswith('Current DC'):
+            # Current DC: juju-lytrusty-machine-2 (168108163) - partition with quorum
+            current_dc = line.split(':')[1].split()[0]
+    if current_dc == get_unit_hostname():
+        return True
+    return False
+
+
 @retry_on_exception(5, base_delay=2, exc_type=CRMResourceNotFound)
 def is_crm_leader(resource, retry=False):
     """
@@ -104,6 +127,8 @@
     We allow this operation to be retried to avoid the possibility of getting a
     false negative. See LP #1396246 for more info.
     """
+    if resource == DC_RESOURCE_NAME:
+        return is_crm_dc()
     cmd = ['crm', 'resource', 'show', resource]
     try:
         status = subprocess.check_output(cmd, stderr=subprocess.STDOUT)
 
=== modified file 'hooks/percona_hooks.py'
--- hooks/percona_hooks.py	2015-04-21 09:29:08 +0000
+++ hooks/percona_hooks.py	2015-06-08 12:21:34 +0000
@@ -56,6 +56,7 @@
     PerconaClusterHelper,
 )
 from charmhelpers.contrib.hahelpers.cluster import (
+    DC_RESOURCE_NAME,
     peer_units,
     oldest_peer,
     eligible_leader,
@@ -74,7 +75,6 @@
 
 hooks = Hooks()
 
-LEADER_RES = 'grp_percona_cluster'
 RES_MONITOR_PARAMS = ('params user="sstuser" password="%(sstpass)s" '
                       'pid="/var/run/mysqld/mysqld.pid" '
                       'socket="/var/run/mysqld/mysqld.sock" '
@@ -207,7 +207,7 @@
 @hooks.hook('db-relation-changed')
 @hooks.hook('db-admin-relation-changed')
 def db_changed(relation_id=None, unit=None, admin=None):
-    if not eligible_leader(LEADER_RES):
+    if not eligible_leader(DC_RESOURCE_NAME):
         log('Service is peered, clearing db relation'
             ' as this service unit is not the leader')
         relation_clear(relation_id)
@@ -269,7 +269,7 @@
 # TODO: This could be a hook common between mysql and percona-cluster
 @hooks.hook('shared-db-relation-changed')
 def shared_db_changed(relation_id=None, unit=None):
-    if not eligible_leader(LEADER_RES):
+    if not eligible_leader(DC_RESOURCE_NAME):
         relation_clear(relation_id)
         # Each unit needs to set the db information otherwise if the unit
         # with the info dies the settings die with it Bug# 1355848
@@ -437,7 +437,7 @@
 @hooks.hook('ha-relation-changed')
 def ha_relation_changed():
     clustered = relation_get('clustered')
-    if (clustered and is_leader(LEADER_RES)):
+    if (clustered and is_leader(DC_RESOURCE_NAME)):
         log('Cluster configured, notifying other services')
         # Tell all related services to start using the VIP
         for r_id in relation_ids('shared-db'):