From 42f20eb8cc053b274fe6681fe26fbeac69635e56 Mon Sep 17 00:00:00 2001
From: Felipe Reyes <felipe.reyes@canonical.com>
Date: Wed, 4 Mar 2015 11:42:47 -0300
Subject: [PATCH] Create mysql resource to monitor the daemon

This new pcmkr resource will take care of keep running mysqld and if it can't
then it will migrate the vip to a node where it is.
---
 hooks/percona_hooks.py | 27 ++++++++++++++++-----------
 templates/my.cnf       |  1 +
 2 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/hooks/percona_hooks.py b/hooks/percona_hooks.py
index d269a7c..5efa1a3 100755
--- a/hooks/percona_hooks.py
+++ b/hooks/percona_hooks.py
@@ -73,14 +73,11 @@ from charmhelpers.contrib.network.ip import (
 hooks = Hooks()
 
 LEADER_RES = 'grp_percona_cluster'
-RES_MYSQL_PARAMS = ('params config="/etc/my.cnf" '
-                    'pid="/var/lib/mysql/mysqld.pid" '
+RES_MYSQL_PARAMS = ('params config="/etc/mysql/my.cnf" '
+                    'pid="/var/run/mysqld/mysqld.pid" '
                     'socket="/var/run/mysqld/mysqld.sock" '
-                    'replication_user="sstuser" '
-                    'replication_passwd="%(sstpsswd)s" '
-                    'max_slave_lag="60" '
-                    'evict_outdated_slaves="false" '
-                    'binary="/usr/libexec/mysqld" '
+                    'max_slave_lag="60" '  # default is 3600
+                    'binary="/usr/sbin/mysqld" '
                     'op monitor interval="5s" role="Master" '
                     'OCF_CHECK_LEVEL="1" '
                     'op monitor interval="2s" role="Slave" '
@@ -405,20 +402,28 @@ def ha_relation_joined():
                      (vip, vip_cidr, vip_iface)
 
     resources = {'res_mysql_vip': res_mysql_vip,
-                 'res_mysql': 'ocf:percona:mysql'}
+                 'res_mysqld': 'ocf:percona:mysql'}
     db_helper = get_db_helper()
-    sstpsswd = db_helper.get_mysql_password(username='sstuser')
+    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': RES_MYSQL_PARAMS % {'sstpsswd': sstpsswd}}
+                       'res_mysqld': RES_MYSQL_PARAMS % {'sstpsswd': sstpsswd}}
     groups = {'grp_percona_cluster': 'res_mysql_vip'}
 
+    clones = {'cl_mysqld': 'res_mysqld meta interleave=true'}
+
+    colocations = {'vip_mysqld': 'inf: res_mysqld res_mysql_vip role=Master'}
+
     for rel_id in relation_ids('ha'):
         relation_set(relation_id=rel_id,
                      corosync_bindiface=corosync_bindiface,
                      corosync_mcastport=corosync_mcastport,
                      resources=resources,
                      resource_params=resource_params,
-                     groups=groups)
+                     groups=groups,
+                     clones=clones,
+                     colocations=colocations)
 
 
 @hooks.hook('ha-relation-changed')
diff --git a/templates/my.cnf b/templates/my.cnf
index 19f3f86..28891f5 100644
--- a/templates/my.cnf
+++ b/templates/my.cnf
@@ -11,6 +11,7 @@ wsrep_provider_options = {{ wsrep_provider_options }}
 
 datadir=/var/lib/mysql
 user=mysql
+pid_file = /var/run/mysqld/mysqld.pid
 
 # Path to Galera library
 wsrep_provider=/usr/lib/libgalera_smm.so