Merge lp:~gnuoy/charms/trusty/percona-cluster/sstpasswd 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

79. By Liam Young on 2015-05-12

Fix le bug where non-leaders try and migrate on disk passwords to peer relation and explode

=== modified file 'hooks/percona_hooks.py'
--- hooks/percona_hooks.py	2015-05-11 10:23:34 +0000
+++ hooks/percona_hooks.py	2015-05-12 10:34:23 +0000
@@ -419,11 +419,15 @@
                  'res_mysql_monitor': 'ocf:percona:mysql_monitor'}
     db_helper = get_db_helper()
     cfg_passwd = config('sst-password')
-    sstpsswd = db_helper.get_mysql_password(username='sstuser',
-                                            password=cfg_passwd)
+    if is_elected_leader(LEADER_RES):
+        # get_mysql_password creates the user if it doesn't exist and updates
+        # peer or db settings. Only the leader shoud do that.
+        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': cfg_passwd}}
     groups = {'grp_percona_cluster': 'res_mysql_vip'}
 
     clones = {'cl_mysql_monitor': 'res_mysql_monitor meta interleave=true'}