Merge lp:~james-page/charms/trusty/percona-cluster/status into lp:~openstack-charmers-archive/charms/trusty/percona-cluster/next

[James Page]

Add status support

[lp:~james-page/charms/trusty/percona-cluster/status]

82. By James Page on 2015-10-08

Drop a comment

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

charm_lint_check #11507 percona-cluster-next for james-page mp273825
    LINT OK: passed

Build: http://10.245.162.77:8080/job/charm_lint_check/11507/

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

charm_unit_test #10700 percona-cluster-next for james-page mp273825
    UNIT OK: passed

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

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

charm_amulet_test #7212 percona-cluster-next for james-page mp273825
    AMULET FAIL: amulet-test failed

AMULET Results (max last 2 lines):
make: *** [functional_test] Error 124
ERROR:root:Make target returned non-zero.

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

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

charm_amulet_test #7216 percona-cluster-next for james-page mp273825
    AMULET FAIL: amulet-test failed

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

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

[Liam Young (gnuoy)]

Approved, assuming osci agrees

[David Ames (thedac)]

Resubmit to get OSCI to run again.

review: Resubmit

[James Page (james-page)]

as osci appears to be asleep running the amulet tests manually.

[lp:~james-page/charms/trusty/percona-cluster/status]

83. By James Page on 2015-10-09

Set initial state for mysql unit to active, not unknown

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

charm_lint_check #11620 percona-cluster-next for james-page mp273825
    LINT OK: passed

Build: http://10.245.162.77:8080/job/charm_lint_check/11620/

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

charm_unit_test #10809 percona-cluster-next for james-page mp273825
    UNIT OK: passed

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

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

charm_amulet_test #7270 percona-cluster-next for james-page mp273825
    AMULET FAIL: amulet-test failed

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

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

[lp:~james-page/charms/trusty/percona-cluster/status]

84. By James Page on 2015-10-10

Fixup tests deal with single units

85. By James Page on 2015-10-10

Rework assess_status location, call on service resume action

86. By James Page on 2015-10-10

Normalize messages in actions

[James Page (james-page)]

I've run the amulet tests by hand as well as the unit and lint tests - all OK.

=== modified file 'actions/actions.py'
--- actions/actions.py	2015-10-06 15:07:52 +0000
+++ actions/actions.py	2015-10-10 16:20:17 +0000
@@ -5,6 +5,7 @@
 
 from charmhelpers.core.host import service_pause, service_resume
 from charmhelpers.core.hookenv import action_fail, status_set
+from percona_utils import assess_status
 
 
 MYSQL_SERVICE = "mysql"
@@ -18,7 +19,8 @@
     if not service_pause(MYSQL_SERVICE):
         raise Exception("Failed to pause MySQL service.")
     status_set(
-        "maintenance", "Paused. Use 'resume' action to resume normal service.")
+        "maintenance",
+        "Unit paused - use 'resume' action to resume normal service")
 
 
 def resume(args):
@@ -27,7 +29,7 @@
     @raises Exception should the service fail to start."""
     if not service_resume(MYSQL_SERVICE):
         raise Exception("Failed to resume MySQL service.")
-    status_set("active", "")
+    assess_status()
 
 
 # A dictionary of all the defined actions to callables (which take

=== added symlink 'actions/percona_utils.py'
=== target is u'../hooks/percona_utils.py'
=== modified file 'hooks/percona_hooks.py'
--- hooks/percona_hooks.py	2015-09-23 18:29:21 +0000
+++ hooks/percona_hooks.py	2015-10-10 16:20:17 +0000
@@ -61,6 +61,7 @@
     notify_bootstrapped,
     is_bootstrapped,
     get_wsrep_value,
+    assess_status,
 )
 from charmhelpers.contrib.database.mysql import (
     PerconaClusterHelper,
@@ -625,6 +626,7 @@
         hooks.execute(sys.argv)
     except UnregisteredHookError as e:
         log('Unknown hook {} - skipping.'.format(e))
+    assess_status()
 
 
 if __name__ == '__main__':

=== modified file 'hooks/percona_utils.py'
--- hooks/percona_utils.py	2015-07-30 09:59:33 +0000
+++ hooks/percona_utils.py	2015-10-10 16:20:17 +0000
@@ -25,6 +25,7 @@
     INFO,
     WARNING,
     ERROR,
+    status_set,
 )
 from charmhelpers.fetch import (
     apt_install,
@@ -360,3 +361,36 @@
         (cluster_uuid), DEBUG)
     for rid in rids:
         relation_set(relation_id=rid, **{'bootstrap-uuid': cluster_uuid})
+
+
+def cluster_in_sync():
+    '''
+    Determines whether the current unit is in sync
+    with the rest of the cluster
+    '''
+    ready = get_wsrep_value('wsrep_ready') or False
+    sync_status = get_wsrep_value('wsrep_local_state') or 0
+    if ready and int(sync_status) in [2, 4]:
+        return True
+    return False
+
+
+def assess_status():
+    '''Assess the status of the current unit'''
+    min_size = config('min-cluster-size')
+    # Ensure that number of peers > cluster size configuration
+    if not is_sufficient_peers():
+        status_set('blocked', 'Insufficient peers to bootstrap cluster')
+        return
+
+    if min_size and int(min_size) > 1:
+        # Once running, ensure that cluster is in sync
+        # and has the required peers
+        if not is_bootstrapped():
+            status_set('waiting', 'Unit waiting for cluster bootstrap')
+        elif is_bootstrapped() and cluster_in_sync():
+            status_set('active', 'Unit is ready and clustered')
+        else:
+            status_set('blocked', 'Unit is not in sync')
+    else:
+        status_set('active', 'Unit is ready')

=== added symlink 'hooks/update-status'
=== target is u'percona_hooks.py'
=== modified file 'tests/31-test-pause-and-resume.py'
--- tests/31-test-pause-and-resume.py	2015-09-15 12:25:04 +0000
+++ tests/31-test-pause-and-resume.py	2015-10-10 16:20:17 +0000
@@ -14,7 +14,7 @@
         uid = 'percona-cluster/0'
         unit = self.d.sentry.unit[uid]
         assert self.is_mysqld_running(unit), 'mysql not running: %s' % uid
-        assert utils.status_get(unit)[0] == "unknown"
+        assert utils.status_get(unit)[0] == "active"
 
         action_id = utils.run_action(unit, "pause")
         assert utils.wait_on_action(action_id), "Pause action failed."

=== modified file 'unit_tests/test_percona_hooks.py'
--- unit_tests/test_percona_hooks.py	2015-09-29 15:30:53 +0000
+++ unit_tests/test_percona_hooks.py	2015-10-10 16:20:17 +0000
@@ -11,7 +11,9 @@
             'relation_set',
             'update_nrpe_config',
             'get_iface_for_address',
-            'get_netmask_for_address']
+            'get_netmask_for_address',
+            'is_bootstrapped',
+            'is_sufficient_peers']
 
 
 class TestHaRelation(CharmTestCase):

=== modified file 'unit_tests/test_percona_utils.py'
--- unit_tests/test_percona_utils.py	2015-08-26 13:22:41 +0000
+++ unit_tests/test_percona_utils.py	2015-10-10 16:20:17 +0000
@@ -7,6 +7,8 @@
 sys.modules['MySQLdb'] = mock.Mock()
 import percona_utils
 
+from test_utils import CharmTestCase
+
 
 class UtilsTests(unittest.TestCase):
     def setUp(self):
@@ -160,3 +162,72 @@
         self.assertEqual(percona_utils.determine_packages(),
                          ['percona-xtradb-cluster-server-5.5',
                           'percona-xtradb-cluster-client-5.5'])
+
+    @mock.patch.object(percona_utils, 'get_wsrep_value')
+    def test_cluster_in_sync_not_ready(self, _wsrep_value):
+        _wsrep_value.side_effect = [None, None]
+        self.assertFalse(percona_utils.cluster_in_sync())
+
+    @mock.patch.object(percona_utils, 'get_wsrep_value')
+    def test_cluster_in_sync_ready_syncing(self, _wsrep_value):
+        _wsrep_value.side_effect = [True, None]
+        self.assertFalse(percona_utils.cluster_in_sync())
+
+    @mock.patch.object(percona_utils, 'get_wsrep_value')
+    def test_cluster_in_sync_ready_sync(self, _wsrep_value):
+        _wsrep_value.side_effect = [True, 4]
+        self.assertTrue(percona_utils.cluster_in_sync())
+
+    @mock.patch.object(percona_utils, 'get_wsrep_value')
+    def test_cluster_in_sync_ready_sync_donor(self, _wsrep_value):
+        _wsrep_value.side_effect = [True, 2]
+        self.assertTrue(percona_utils.cluster_in_sync())
+
+
+TO_PATCH = [
+    'status_set',
+    'is_sufficient_peers',
+    'is_bootstrapped',
+    'config',
+    'cluster_in_sync',
+]
+
+
+class TestAssessStatus(CharmTestCase):
+    def setUp(self):
+        CharmTestCase.setUp(self, percona_utils, TO_PATCH)
+
+    def test_single_unit(self):
+        self.config.return_value = None
+        self.is_sufficient_peers.return_value = True
+        percona_utils.assess_status()
+        self.status_set.assert_called_with('active', mock.ANY)
+
+    def test_insufficient_peers(self):
+        self.config.return_value = 3
+        self.is_sufficient_peers.return_value = False
+        percona_utils.assess_status()
+        self.status_set.assert_called_with('blocked', mock.ANY)
+
+    def test_not_bootstrapped(self):
+        self.config.return_value = 3
+        self.is_sufficient_peers.return_value = True
+        self.is_bootstrapped.return_value = False
+        percona_utils.assess_status()
+        self.status_set.assert_called_with('waiting', mock.ANY)
+
+    def test_bootstrapped_in_sync(self):
+        self.config.return_value = 3
+        self.is_sufficient_peers.return_value = True
+        self.is_bootstrapped.return_value = True
+        self.cluster_in_sync.return_value = True
+        percona_utils.assess_status()
+        self.status_set.assert_called_with('active', mock.ANY)
+
+    def test_bootstrapped_not_in_sync(self):
+        self.config.return_value = 3
+        self.is_sufficient_peers.return_value = True
+        self.is_bootstrapped.return_value = True
+        self.cluster_in_sync.return_value = False
+        percona_utils.assess_status()
+        self.status_set.assert_called_with('blocked', mock.ANY)