Merge lp:~clint-fewbar/charms/oneiric/mysql/add-config into lp:charms/oneiric/mysql

[Clint Byrum]

This branch adds some high level config parameters and commonly desirable direct tunables to the mysql charm. All changes to config cause mysql to restart.

It also removes the use of augeas for mysql (its still used for apache configs). So the charm now fully generates the whole mysql config itself.

[Juan L. Negron (negronjl)]

review: Approve

=== added file 'config.yaml'
--- config.yaml	1970-01-01 00:00:00 +0000
+++ config.yaml	2011-12-07 00:11:24 +0000
@@ -0,0 +1,25 @@
+options:
+    dataset-size:
+        default: 1G
+        description: How much data do you want to keep in memory in the DB. This will be used to tune settings in the database server appropriately. Any more specific settings will override these defaults though. This currently sets innodb_buffer_pool_size or key_cache_size depending on the setting in preferred-storage-engine. If query-cache-type is set to 'ON' or 'DEMAND' 10% of this is given to query-cache-size.
+        type: string
+    preferred-storage-engine:
+        default: InnoDB
+        type: string
+        description: Tune the server for usage of this storage engine. Other possible value is MyISAM. Comma separated will cause settings to split resources evenly among given engines.
+    tuning-level:
+        default: safest
+        type: string
+        description: Valid values are 'safest', 'fast', and 'unsafe'. If set to safest, all settings are tuned to have maximum safety at the cost of performance. Fast will turn off most controls, but may lose data on crashes. unsafe will turn off all protections.
+    query-cache-type:
+        default: "ON"
+        type: string
+        description: Query cache is usually a good idea, but can hurt concurrency. Valid values are "OFF", "ON", or "DEMAND". http://dev.mysql.com/doc/refman/5.1/en/server-system-variables.html#sysvar_query_cache_type
+    query-cache-size:
+        default: -1
+        type: int
+        description: Override the computed version from dataset-size. Still works if query-cache-type is "OFF" since sessions can override the cache type setting on their own.
+    max-connections:
+        default: -1
+        type: int
+        description: Maximum connections to allow. -1 means use the server's compiled in default.
 
=== added file 'hooks/config-changed'
--- hooks/config-changed	1970-01-01 00:00:00 +0000
+++ hooks/config-changed	2011-12-07 00:11:24 +0000
@@ -0,0 +1,233 @@
+#!/usr/bin/python
+
+from subprocess import check_output,check_call
+import tempfile
+import json
+import re
+import hashlib
+import os
+
+num_re = re.compile('^[0-9]+$')
+
+configs=json.loads(check_output(['config-get','--format=json']))
+
+# There should be a library for this
+def human_to_bytes(human):
+    if num_re.match(human):
+        return human
+    factors = { 'K' : 1024 , 'M' : 1048576, 'G' : 1073741824, 'T' : 1099511627776 }
+    modifier=human[-1]
+    if modifier in factors:
+        return int(human[:-1]) * factors[modifier]
+    raise Exception("Can only convert K,M,G, or T")
+
+# smart-calc stuff in the configs
+dataset_bytes = human_to_bytes(configs['dataset-size'])
+
+if configs['query-cache-size'] == -1 and configs['query-cache-type'] in ['ON','DEMAND']:
+    configs['query-cache-size'] = int(dataset_bytes * 0.20)
+    dataset_bytes -= configs['query-cache-size']
+
+# 5.5 allows the words, but not 5.1
+if configs['query-cache-type'] == 'ON':
+    configs['query-cache-type']=1
+elif configs['query-cache-type'] == 'DEMAND':
+    configs['query-cache-type']=2
+else:
+    configs['query-cache-type']=0
+
+preferred_engines=configs['preferred-storage-engine'].split(',')
+chunk_size = int(dataset_bytes / len(preferred_engines))
+configs['innodb-flush-log-at-trx-commit']=1
+configs['sync-binlog']=1
+if 'InnoDB' in preferred_engines:
+    configs['innodb-buffer-pool-size'] = chunk_size
+    if configs['tuning-level'] == 'fast':
+        configs['innodb-flush-log-at-trx-commit']=2
+else:
+    configs['innodb-buffer-pool-size'] = 0
+
+configs['default-storage-engine'] = preferred_engines[0]
+
+if 'MyISAM' in preferred_engines:
+    configs['key-buffer'] = chunk_size
+else:
+    # Need a bit for auto lookups always
+    configs['key-buffer'] = human_to_bytes('8M')
+
+if configs['tuning-level'] == 'fast':
+    configs['sync-binlog']=0
+
+if configs['max-connections'] == -1:
+    configs['max-connections'] = '# max_connections = ?'
+else:
+    configs['max-connections'] = 'max_connections = %s' % configs['max-connections']
+
+template="""
+######################################
+#
+#
+#
+# This file generated by the juju MySQL charm!
+#
+# Local changes will not be preserved!
+#
+#
+#
+######################################
+#
+# The MySQL database server configuration file.
+#
+# You can copy this to one of:
+# - "/etc/mysql/my.cnf" to set global options,
+# - "~/.my.cnf" to set user-specific options.
+# 
+# One can use all long options that the program supports.
+# Run program with --help to get a list of available options and with
+# --print-defaults to see which it would actually understand and use.
+#
+# For explanations see
+# http://dev.mysql.com/doc/mysql/en/server-system-variables.html
+
+# This will be passed to all mysql clients
+# It has been reported that passwords should be enclosed with ticks/quotes
+# escpecially if they contain "#" chars...
+# Remember to edit /etc/mysql/debian.cnf when changing the socket location.
+[client]
+port		= 3306
+socket		= /var/run/mysqld/mysqld.sock
+
+# Here is entries for some specific programs
+# The following values assume you have at least 32M ram
+
+# This was formally known as [safe_mysqld]. Both versions are currently parsed.
+[mysqld_safe]
+socket		= /var/run/mysqld/mysqld.sock
+nice		= 0
+
+[mysqld]
+#
+# * Basic Settings
+#
+
+#
+# * IMPORTANT
+#   If you make changes to these settings and your system uses apparmor, you may
+#   also need to also adjust /etc/apparmor.d/usr.sbin.mysqld.
+#
+
+user		= mysql
+socket		= /var/run/mysqld/mysqld.sock
+port		= 3306
+basedir		= /usr
+datadir		= /var/lib/mysql
+tmpdir		= /tmp
+skip-external-locking
+#
+# Instead of skip-networking the default is now to listen only on
+# localhost which is more compatible and is not less secure.
+bind-address		= 0.0.0.0
+#
+# * Fine Tuning
+#
+key_buffer		= %(key-buffer)s
+max_allowed_packet	= 16M
+# This replaces the startup script and checks MyISAM tables if needed
+# the first time they are touched
+myisam-recover         = BACKUP
+%(max-connections)s
+#table_cache            = 64
+#thread_concurrency     = 10
+#
+# * Query Cache Configuration
+#
+query_cache_limit = 1M
+query_cache_size = %(query-cache-size)s
+query_cache_type = %(query-cache-type)s
+#
+# * Logging and Replication
+#
+# Both location gets rotated by the cronjob.
+# Be aware that this log type is a performance killer.
+# As of 5.1 you can enable the log at runtime!
+#general_log_file        = /var/log/mysql/mysql.log
+#general_log             = 1
+
+log_error                = /var/log/mysql/error.log
+
+# Here you can see queries with especially long duration
+#log_slow_queries	= /var/log/mysql/mysql-slow.log
+#long_query_time = 2
+#log-queries-not-using-indexes
+#
+# The following can be used as easy to replay backup logs or for replication.
+# note: if you are setting up a replication slave, see README.Debian about
+#       other settings you may need to change.
+#server-id		= 1
+#log_bin			= /var/log/mysql/mysql-bin.log
+expire_logs_days	= 10
+max_binlog_size         = 100M
+#binlog_do_db		= include_database_name
+#binlog_ignore_db	= include_database_name
+#
+# * InnoDB
+#
+# InnoDB is enabled by default with a 10MB datafile in /var/lib/mysql/.
+# Read the manual for more InnoDB related options. There are many!
+#
+innodb_buffer_pool_size = %(innodb-buffer-pool-size)s
+innodb_flush_log_at_trx_commit = %(innodb-flush-log-at-trx-commit)s
+sync_binlog = %(sync-binlog)s
+default_storage_engine = %(default-storage-engine)s
+skip-name-resolve
+# * Security Features
+#
+# Read the manual, too, if you want chroot!
+# chroot = /var/lib/mysql/
+#
+# For generating SSL certificates I recommend the OpenSSL GUI "tinyca".
+#
+# ssl-ca=/etc/mysql/cacert.pem
+# ssl-cert=/etc/mysql/server-cert.pem
+# ssl-key=/etc/mysql/server-key.pem
+
+
+
+[mysqldump]
+quick
+quote-names
+max_allowed_packet	= 16M
+
+[mysql]
+#no-auto-rehash	# faster start of mysql but no tab completition
+
+[isamchk]
+key_buffer		= 16M
+
+#
+# * IMPORTANT: Additional settings that can override those from this file!
+#   The files must end with '.cnf', otherwise they'll be ignored.
+#
+!includedir /etc/mysql/conf.d/
+"""
+
+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'])
+        else:
+            check_call(['juju-log','my.cnf not changed, skipping restart/replace'])
 
=== modified file 'hooks/install'
--- hooks/install	2011-09-16 21:54:23 +0000
+++ hooks/install	2011-12-07 00:11:24 +0000
@@ -15,26 +15,14 @@
 
 unit_id=`echo $JUJU_UNIT_NAME | cut -d/ -f2`
 
-# augeas 0.8.0 and later knows about my.cnf format .. otherwise use ours
-augvers=`dpkg -l augeas-lenses|awk '/^ii/ {print $3}'`
-if dpkg --compare-versions $augvers '<' 0.8.0 || \
-  ! [ -f /usr/share/augeas/lenses/dist/mysql.aug ] ; then
-  echo augeas $augvers needs mysql.aug and inifile.aug file from formula...
-  mv -f /usr/share/augeas/lenses/dist/inifile.aug /var/backups
-  cp -v `dirname $0`/../inifile.aug /usr/share/augeas/lenses/dist
-  cp -v `dirname $0`/../mysql.aug /usr/share/augeas/lenses/dist
-else
-  echo using mysql.aug from $augvers
-fi
-augtool <<EOF
-defnode mysqld '/files/etc/mysql/my.cnf/target[. = "mysqld"]'
-set \$mysqld/server_id $unit_id
-set \$mysqld/log_bin /var/log/mysql/mysql-bin.log
-set \$mysqld/default_storage_engine InnoDB
-set \$mysqld/bind-address 0.0.0.0
-set \$mysqld/skip-name-resolve ""
-save
+# 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 'hooks/master-relation-changed'
--- hooks/master-relation-changed	2011-11-09 19:43:42 +0000
+++ hooks/master-relation-changed	2011-12-07 00:11:24 +0000
@@ -34,7 +34,7 @@
 chown -v -R www-data.www-data /var/www
 
 remote_host=`relation-get hostname`
-test -n "$remote_host" || exit 1
+test -n "$remote_host" || exit 0
 remote_ip=`dig +short $remote_host`
 pass=`pwgen -s 16`
 augtool -b <<EOF
@@ -45,9 +45,10 @@
 save
 EOF
 service apache2 reload
-mysql $ROOTARGS -e "GRANT REPLICATION SLAVE, REPLICATION CLIENT ON *.* TO \`$JUJU_REMOTE_UNIT\`@\`$remote_ip\` IDENTIFIED BY '$pass'"
+user=`echo $JUJU_REMOTE_UNIT | sed -e 's,/,-,'`
+mysql $ROOTARGS -e "GRANT REPLICATION SLAVE, REPLICATION CLIENT ON *.* TO \`$user\`@\`$remote_ip\` IDENTIFIED BY '$pass'"
 relation-set dumpurl=/snaps/$name \
-                     user=$JUJU_REMOTE_UNIT \
+                     user=$user \
                      password=$pass \
                      hostname=`unit-get private-address` \
                      port=3306
 
=== added file 'hooks/slave-relation-broken'
--- hooks/slave-relation-broken	1970-01-01 00:00:00 +0000
+++ hooks/slave-relation-broken	2011-12-07 00:11:24 +0000
@@ -0,0 +1,9 @@
+#!/bin/sh
+
+# Kill the replication
+mysql -uroot -p`cat /var/lib/juju/mysql.passwd` -e 'STOP SLAVE;'
+mysql -uroot -p`cat /var/lib/juju/mysql.passwd` -e 'RESET SLAVE;'
+# No longer a slave
+# XXX this may change the server-id .. not sure if thats what we
+# want!
+rm /var/lib/juju/i.am.a.slave
 
=== modified file 'hooks/slave-relation-changed'
--- hooks/slave-relation-changed	2011-09-16 21:54:23 +0000
+++ hooks/slave-relation-changed	2011-12-07 00:11:24 +0000
@@ -60,25 +60,28 @@
 basedir=/usr
 EOF
 
-serverid=`augtool get /files/etc/mysql/my.cnf/target[3]/server_id | awk -F" = " '{print $2}'`
-server_id_name="server_id"
-if [ -z "$serverid" ] ; then
-  serverid=`augtool get /files/etc/mysql/my.cnf/target[3]/server-id | awk -F" = " '{print $2}'`
-  server_id_name="server-id"
-fi
 if [ -z "$serverid" ] ; then
   serverid=`echo $user | cut -d/ -f2`
 fi
-if [ -z "$serverid" -o "$serverid" -lt 100000 ] ; then
-  # add 100000 to server_id to avoid conflicts w/ masters
-  serverid=$(($serverid+100000))
-  echo "set /files/etc/mysql/my.cnf/target[3]/$server_id_name $serverid\nsave" | augtool -b
+# add 100000 to server_id to avoid conflicts w/ masters
+serverid=$(($serverid+100000))
+if [ -f /etc/mysql/conf.d/slave.cf ] ; then
+    old_hash=`md5sum /etc/mysql/conf.d/slave.cf`
+else
+    old_hash="xxx"
+fi
+cat > /etc/mysql/conf.d/binlog.cnf <<EOF
+[mysqld]
+server-id = $serverid
+log_bin = /var/log/mysql/mysql-bin.log
+EOF
+new_hash=`md5sum /etc/mysql/conf.d/binlog.cnf`
+if [ "$new_hash" != "$old_hash" ] ; then
   service mysql stop
-  # clear binlogs
-  binlog=`augtool get /files/etc/mysql/my.cnf/target[3]/log_bin|cut -d' ' -f3`
+  # clear any binlogs
   backupdir=/var/backups/binlogs-`date +%Y%m%d%H%M%S`
   mkdir -p $backupdir
-  mv $binlog* $backupdir || :
+  mv /var/log/mysql/mysql-bin* $backupdir || :
   service mysql start
 fi
 mysql $ROOTARGS -e "START SLAVE"
 
=== added symlink 'hooks/slave-relation-departed'
=== target is u'slave-relation-broken'
=== removed file 'hooks/slave-relation-departed'
--- hooks/slave-relation-departed	2011-09-16 21:54:23 +0000
+++ hooks/slave-relation-departed	1970-01-01 00:00:00 +0000
@@ -1,2 +0,0 @@
-#!/bin/sh
-rm /var/lib/juju/i.am.a.slave
 
=== added file 'hooks/upgrade-charm'
--- hooks/upgrade-charm	1970-01-01 00:00:00 +0000
+++ hooks/upgrade-charm	2011-12-07 00:11:24 +0000
@@ -0,0 +1,4 @@
+#!/bin/sh
+home=`dirname $0`
+$home/install
+exec $home/config-changed
 
=== modified file 'revision'
--- revision	2011-12-05 20:17:48 +0000
+++ revision	2011-12-07 00:11:24 +0000
@@ -1,1 +1,1 @@
-109
+118