Merge lp:~clint-fewbar/charms/precise/mysql/add-binlog-format into lp:charms/mysql

[Clint Byrum]

Adds the ability to set the binlog format, and will also turn off binlogging in 'fast' tuning.

[Marco Ceppi (marcoceppi)]

This looks great!

review: Approve

=== modified file 'config.yaml'
--- config.yaml	2011-12-06 02:01:20 +0000
+++ config.yaml	2012-04-25 09:05:26 +0000
@@ -23,3 +23,7 @@
         default: -1
         type: int
         description: Maximum connections to allow. -1 means use the server's compiled in default.
+    binlog-format:
+        default: 'MIXED'
+        type: string
+        description: If binlogging is enabled, this is the format that will be used. Ignored when tuning-level == fast.

=== modified file 'hooks/common.py'
--- hooks/common.py	2011-12-05 20:17:48 +0000
+++ hooks/common.py	2012-04-25 09:05:26 +0000
@@ -1,6 +1,7 @@
 # vim: syntax=python
 
 import os
+import sys
 import MySQLdb
 import subprocess
 import uuid
@@ -25,17 +26,20 @@
     os.unlink(get_service_user_file(service))
 
 
-try:
-    change_unit = os.environ['JUJU_REMOTE_UNIT']
-except KeyError:
-    pass
-
-if len(change_unit) == 0:
-    # XXX hack to work around https://launchpad.net/bugs/791042
-    change_unit  = subprocess.check_output(['relation-list']).strip().split("\n")[0]
+relation_id = os.environ.get('JUJU_RELATION_ID')
+change_unit = os.environ.get('JUJU_REMOTE_UNIT')
 
 # We'll name the database the same as the service.
-database_name, _ = change_unit.split("/")
+database_name_file = '.%s_database_name' % (relation_id)
+# change_unit will be None on broken hooks
+if change_unit:
+    database_name, _ = change_unit.split("/")
+elif os.path.exists(database_name_file):
+    with open(database_name_file, 'r') as dbname:
+        database_name = dbname.readline()
+else:
+    print 'No established database and no REMOTE_UNIT. Exitting gracefully.'
+    sys.exit(0)
 # A user per service unit so we can deny access quickly
 user = get_service_user(database_name)
 connection = None

=== modified file 'hooks/config-changed'
--- hooks/config-changed	2011-12-06 21:17:17 +0000
+++ hooks/config-changed	2012-04-25 09:05:26 +0000
@@ -211,23 +211,56 @@
 !includedir /etc/mysql/conf.d/
 """
 
+i_am_a_slave = os.path.isfile('/var/lib/juju/i.am.a.slave')
+unit_id = os.environ['JUJU_UNIT_NAME'].split('/')[1]
+
+if not i_am_a_slave and configs['tuning-level'] == 'fast':
+    binlog_cnf = ''
+else:
+    # On slaves, this gets overwritten
+    binlog_template = """
+[mysqld]
+server_id = %s
+log_bin = /var/log/mysql/mysql-bin.log
+binlog_format = %s
+"""
+
+    binlog_cnf = binlog_template % (unit_id,
+        configs.get('binlog_format','MIXED'))
+
 mycnf=template % configs
-with tempfile.NamedTemporaryFile(mode='w',dir='/etc/mysql',delete=False) as t:
-    t.write(mycnf)
-    t.flush()
-    tmd5 = hashlib.md5()
-    tmd5.update(mycnf)
-    with open('/etc/mysql/my.cnf','r') as old:
-        md5=hashlib.md5()
-        md5.update(old.read())
-        oldhash = md5.digest()
-        if oldhash != tmd5.digest():
-            os.rename('/etc/mysql/my.cnf','/etc/mysql/my.cnf.%s' % md5.hexdigest())
-            os.rename(t.name, '/etc/mysql/my.cnf')
-            try:
-                check_call(['service','mysql','stop'])
-            except subprocess.CalledProcessError:
-                pass
-            check_call(['service','mysql','start'])
+
+targets = {'/etc/mysql/conf.d/binlog.cnf': binlog_cnf,
+           '/etc/mysql/my.cnf': mycnf,
+           }
+
+need_restart = False
+for target,content in targets.iteritems():
+    tdir = os.path.dirname(target) 
+    if len(content) == 0 and os.path.exists(target):
+        os.unlink(target)
+        need_restart = True
+        continue
+    with tempfile.NamedTemporaryFile(mode='w',dir=tdir,delete=False) as t:
+        t.write(content)
+        t.flush()
+        tmd5 = hashlib.md5()
+        tmd5.update(content)
+        if os.path.exists(target):
+            with open(target,'r') as old:
+                md5=hashlib.md5()
+                md5.update(old.read())
+                oldhash = md5.digest()
+                if oldhash != tmd5.digest():
+                    os.rename(target,'%s.%s' % (target, md5.hexdigest()))
+                    need_restart = True
         else:
-            check_call(['juju-log','my.cnf not changed, skipping restart/replace'])
+            need_restart = True
+        os.rename(t.name, target)
+
+if need_restart:
+    try:
+        check_call(['service','mysql','stop'])
+    except subprocess.CalledProcessError:
+        pass
+    check_call(['service','mysql','start'])

=== modified file 'hooks/db-relation-joined'
--- hooks/db-relation-joined	2011-11-29 01:36:56 +0000
+++ hooks/db-relation-joined	2012-04-25 09:05:26 +0000
@@ -81,6 +81,8 @@
 else:
     if not broken and not admin:
         runsql("create database `%s` character set utf8" % database_name)
+        with open(database_name_file, 'w') as dbname:
+            dbname.write(database_name)
 
 if broken:
     os.unlink(broken_path)

=== modified file 'hooks/install'
--- hooks/install	2011-12-20 06:13:08 +0000
+++ hooks/install	2012-04-25 09:05:26 +0000
@@ -13,17 +13,3 @@
 echo mysql-server-5.1 mysql-server/root_password_again password $PASSWORD | debconf-set-selections
 
 DEBIAN_FRONTEND=noninteractive apt-get -y install -qq mysql-server
-
-unit_id=`echo $JUJU_UNIT_NAME | cut -d/ -f2`
-
-# On slaves, this gets overwritten
-if [ ! -f /var/lib/juju/i.am.a.slave ] ; then
-    cat > /etc/mysql/conf.d/binlog.cnf <<EOF
-[mysqld]
-server_id = $unit_id
-log_bin = /var/log/mysql/mysql-bin.log
-EOF
-fi
-
-service mysql stop || :
-service mysql start

=== modified file 'revision'
--- revision	2011-12-06 21:17:17 +0000
+++ revision	2012-04-25 09:05:26 +0000
@@ -1,1 +1,1 @@
-118
+121