Merge lp:~gnuoy/charms/trusty/percona-cluster/sstpasswd2 into lp:~le-charmers/charms/trusty/percona-cluster/leadership-election

[Liam Young]

[Edward Hope-Morley (hopem)]

I'm surprised this has not given is more issue in production. So, unfortunately the way you are doing things here will break the case where no password is provided in config.yaml sst-passwd and is therefore auto-generated and shared on the peer relation. A better option might be to add a new param to get_mysl_password() e.g. create_if_none=False so that we check the peer rel and only create a new one if create_if_none if True which we would be the case only if we were the leader. FTR get_mysql_password() is also called from install() and config_changed() so will need protection there too.

review: Needs Fixing

Unmerged revisions

=== modified file 'hooks/charmhelpers/contrib/database/mysql.py'
--- hooks/charmhelpers/contrib/database/mysql.py	2015-05-11 10:23:34 +0000
+++ hooks/charmhelpers/contrib/database/mysql.py	2015-05-13 10:25:03 +0000
@@ -134,6 +134,14 @@
         finally:
             cursor.close()
 
+    def wipe_disk_passwords(self):
+        """Remove all passwords stored on disk"""
+        dirname = os.path.dirname(self.root_passwd_file_template)
+        path = os.path.join(dirname, '*.passwd')
+        for f in glob.glob(path):
+            log("Removing password file {}".format(f), level=DEBUG)
+            os.unlink(f)
+
     def migrate_passwords_to_peer_relation(self, excludes=None):
         """Migrate any passwords storage on disk to cluster peer relation."""
         dirname = os.path.dirname(self.root_passwd_file_template)
@@ -156,7 +164,7 @@
                 # NOTE cluster relation not yet ready - skip for now
                 pass
 
-    def get_mysql_password_on_disk(self, username=None, password=None):
+    def get_mysql_password_on_disk(self, username=None, password=None, create_if_none=True):
         """Retrieve, generate or store a mysql password for the provided
         username on disk."""
         if username:
@@ -170,7 +178,7 @@
             log("Using existing password file '%s'" % passwd_file, level=DEBUG)
             with open(passwd_file, 'r') as passwd:
                 _password = passwd.read().strip()
-        else:
+        elif create_if_none:
             log("Generating new password file '%s'" % passwd_file, level=DEBUG)
             if not os.path.isdir(os.path.dirname(passwd_file)):
                 # NOTE: need to ensure this is not mysql root dir (which needs
@@ -207,7 +215,8 @@
         for key in keys:
             yield key
 
-    def get_mysql_password(self, username=None, password=None):
+    def get_mysql_password(self, username=None, password=None,
+                           create_if_none=True):
         """Retrieve, generate or store a mysql password for the provided
         username using peer relation cluster."""
         excludes = []
@@ -227,12 +236,18 @@
             # cluster relation is not yet started; use on-disk
             _password = None
 
-        # If none available, generate new one
+        # If none available, check if one is on disk, if not
+        # get_mysql_password_on_disk will generate a new one if create_if_none
+        # is true
         if not _password:
-            _password = self.get_mysql_password_on_disk(username, password)
+            _password = self.get_mysql_password_on_disk(
+                username,
+                password,
+                create_if_none=create_if_none,
+            )
 
         # Put on wire if required
-        if self.migrate_passwd_to_peer_relation:
+        if _password and self.migrate_passwd_to_peer_relation:
             self.migrate_passwords_to_peer_relation(excludes=excludes)
 
         return _password
 
=== modified file 'hooks/charmhelpers/contrib/peerstorage/__init__.py'
=== modified file 'hooks/charmhelpers/core/hookenv.py'
=== modified file 'hooks/percona_hooks.py'
--- hooks/percona_hooks.py	2015-05-11 10:23:34 +0000
+++ hooks/percona_hooks.py	2015-05-13 10:25:03 +0000
@@ -61,6 +61,13 @@
     is_clustered,
     oldest_peer,
     peer_units,
+<<<<<<< TREE
+=======
+    oldest_peer,
+    is_elected_leader,
+    is_clustered,
+    is_leader,
+>>>>>>> MERGE-SOURCE
 )
 from charmhelpers.payload.execd import execd_preinstall
 from charmhelpers.contrib.network.ip import (
@@ -94,6 +101,13 @@
         add_source(config('source'), config('key'))
 
     configure_mysql_root_password(config('root-password'))
+<<<<<<< TREE
+=======
+    db_helper = get_db_helper(migrate_passwd_to_peer_relation=False)
+    cfg_passwd = config('sst-password')
+    mysql_password = db_helper.get_mysql_password(username='sstuser',
+                                                  password=cfg_passwd)
+>>>>>>> MERGE-SOURCE
     # Render base configuration (no cluster)
     render_config()
     apt_update(fatal=True)
@@ -105,6 +119,15 @@
     if not os.path.exists(os.path.dirname(MY_CNF)):
         os.makedirs(os.path.dirname(MY_CNF))
 
+<<<<<<< TREE
+=======
+    if not mysql_password:
+        db_helper = get_db_helper(migrate_passwd_to_peer_relation=False)
+        cfg_passwd = config('sst-password')
+        mysql_password = db_helper.get_mysql_password(username='sstuser',
+                                                      password=cfg_passwd)
+
+>>>>>>> MERGE-SOURCE
     context = {
         'cluster_name': 'juju_cluster',
         'private_address': get_host_ip(),
@@ -141,7 +164,9 @@
     clustered = len(hosts) > 1
     pre_hash = file_hash(MY_CNF)
     render_config(clustered, hosts)
+    db_helper = get_db_helper()
     if file_hash(MY_CNF) != pre_hash:
+<<<<<<< TREE
         try:
             # NOTE(jamespage): try with leadership election
             if clustered and not is_leader() and not seeded():
@@ -162,6 +187,18 @@
                 # Restart with new configuration
                 service_restart('mysql')
 
+=======
+        oldest = oldest_peer(peer_units())
+        if clustered and not oldest and not seeded():
+            # Bootstrap node into seeded cluster
+            service_restart('mysql')
+            mark_seeded()
+            # Bootstrapping from existing cluster invalidates passwords
+            db_helper.wipe_disk_passwords()
+        elif not clustered:
+            # Restart with new configuration
+            service_restart('mysql')
+>>>>>>> MERGE-SOURCE
     # Notify any changes to the access network
     for r_id in relation_ids('shared-db'):
         for unit in related_units(r_id):
@@ -210,8 +247,15 @@
 @hooks.hook('db-relation-changed')
 @hooks.hook('db-admin-relation-changed')
 def db_changed(relation_id=None, unit=None, admin=None):
+<<<<<<< TREE
     if not is_elected_leader(LEADER_RES):
         log('Not leader of service, deferring db-changed to leader')
+=======
+    if not is_elected_leader(LEADER_RES):
+        log('Service is peered, clearing db relation'
+            ' as this service unit is not the leader')
+        relation_clear(relation_id)
+>>>>>>> MERGE-SOURCE
         return
 
     if is_clustered():
@@ -280,10 +324,14 @@
 # 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):
+<<<<<<< TREE
     if not is_elected_leader(LEADER_RES):
         # NOTE(jamespage): relation level data candidate
         log('Service is peered, clearing shared-db relation'
             ' as this service unit is not the leader')
+=======
+    if not is_elected_leader(LEADER_RES):
+>>>>>>> MERGE-SOURCE
         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
@@ -417,13 +465,17 @@
 
     resources = {'res_mysql_vip': res_mysql_vip,
                  'res_mysql_monitor': 'ocf:percona:mysql_monitor'}
-    db_helper = get_db_helper()
+    if is_elected_leader(LEADER_RES):
+        migrate_passwd=True
+    else:
+        migrate_passwd=False
+    db_helper = get_db_helper(migrate_passwd_to_peer_relation=migrate_passwd)
     cfg_passwd = config('sst-password')
     sstpsswd = db_helper.get_mysql_password(username='sstuser',
                                             password=cfg_passwd)
     resource_params = {'res_mysql_vip': vip_params,
                        'res_mysql_monitor':
-                           RES_MONITOR_PARAMS % {'sstpass': sstpsswd}}
+                       RES_MONITOR_PARAMS % {'sstpass': sstpsswd}}
     groups = {'grp_percona_cluster': 'res_mysql_vip'}
 
     clones = {'cl_mysql_monitor': 'res_mysql_monitor meta interleave=true'}
 
=== modified file 'hooks/percona_utils.py'
--- hooks/percona_utils.py	2015-03-09 14:02:03 +0000
+++ hooks/percona_utils.py	2015-05-13 10:25:03 +0000
@@ -135,11 +135,12 @@
                            "BY '{}'")
 
 
-def get_db_helper():
+def get_db_helper(migrate_passwd_to_peer_relation=True):
     return MySQLHelper(rpasswdf_template='/var/lib/charm/%s/mysql.passwd' %
                        (service_name()),
                        upasswdf_template='/var/lib/charm/%s/mysql-{}.passwd' %
-                       (service_name()))
+                       (service_name()),
+                       migrate_passwd_to_peer_relation=migrate_passwd_to_peer_relation)
 
 
 def configure_sstuser(sst_password):