Merge lp:~jacekn/charms/trusty/mysql/mysql-storage into lp:charms/trusty/mysql

[Jacek Nykis]

This change improves persistent storage support.

MySQL data will be kept in persistent storage if it's present.

[uosci-testing-bot (uosci-testing-bot)]

charm_lint_check #582 trusty-mysql for jacekn mp245744
    LINT OK: passed

Build: http://10.245.162.77:8080/job/charm_lint_check/582/

[uosci-testing-bot (uosci-testing-bot)]

charm_unit_test #611 trusty-mysql for jacekn mp245744
    UNIT FAIL: unit-test missing

UNIT Results (max last 2 lines):
INFO:root:Search string not found in makefile target commands.
ERROR:root:No make target was executed.

Full unit test output: http://paste.ubuntu.com/9687881/
Build: http://10.245.162.77:8080/job/charm_unit_test/611/

[Review Queue (review-queue)]

The results (PASS) are in and available here: http://reports.vapour.ws/charm-tests/charm-bundle-test-10874-results

review: Approve (automated testing)

[Adam Israel (aisrael)]

Hi Jacek,

Thanks for your work on improving the mysql charm! I've had the opportunity to review this merge proposal. I've successfully tested this addition, with the caveat that it was done with the 'storage' charm under the local provider. More testing may be needed, but as of now this LGTM. You've got my +1.

review: Approve

[Jacek Nykis (jacekn)]

Hello,

Is there anything I need to do before this can be merged?

review: Needs Resubmitting

[Tim Van Steenburgh (tvansteenburgh)]

+1 LGTM.

review: Approve

=== modified file 'config.yaml'
--- config.yaml	2015-01-07 14:31:43 +0000
+++ config.yaml	2015-01-07 14:31:43 +0000
@@ -123,7 +123,7 @@
         type: string
         description: "mysql bind host address"
     backup_dir:
-        default: "/srv/backups"
+        default: "/var/lib/mysql/backups"
         type: string
         description: "Directory where bakcups will be stored"
     backup_schedule:

=== modified file 'hooks/common.py'
--- hooks/common.py	2014-08-15 06:31:44 +0000
+++ hooks/common.py	2015-01-07 14:31:43 +0000
@@ -3,6 +3,9 @@
 import os
 import MySQLdb
 import subprocess
+import shutil
+from charmhelpers.core import hookenv, host
+from charmhelpers.core.templating import render
 
 
 def get_service_user_file(service):
@@ -120,3 +123,26 @@
                                               remote_ip))
     finally:
         cursor.close()
+
+
+def migrate_to_mount(new_path):
+    """Invoked when new mountpoint appears. This function safely migrates
+    MySQL data from local disk to persistent storage (only if needed)
+    """
+    old_path = '/var/lib/mysql'
+    if os.path.islink(old_path):
+        hookenv.log('{} is already a symlink, skipping migration'.format(
+            old_path))
+        return True
+    os.chmod(new_path, 0700)
+    if os.path.isdir('/etc/apparmor.d/local'):
+        render('apparmor.j2', '/etc/apparmor.d/local/usr.sbin.mysqld',
+               context={'path': os.path.join(new_path, '')})
+        host.service_reload('apparmor')
+    host.service_stop('mysql')
+    host.rsync(os.path.join(old_path, ''),  # Ensure we have trailing slashes
+               os.path.join(new_path, ''),
+               options=['--archive'])
+    shutil.rmtree(old_path)
+    os.symlink(new_path, old_path)
+    host.service_start('mysql')

=== added symlink 'hooks/data-relation-changed'
=== target is u'data-relation.py'
=== added symlink 'hooks/data-relation-departed'
=== target is u'data-relation.py'
=== added symlink 'hooks/data-relation-joined'
=== target is u'data-relation.py'
=== added file 'hooks/data-relation.py'
--- hooks/data-relation.py	1970-01-01 00:00:00 +0000
+++ hooks/data-relation.py	2015-01-07 14:31:43 +0000
@@ -0,0 +1,31 @@
+#!/usr/bin/env python
+
+import sys
+
+import common
+from charmhelpers.core import hookenv, host
+
+
+hooks = hookenv.Hooks()
+mountpoint = '/srv/mysql'
+
+
[e-mail]('data-relation-joined', 'data-relation-changed')
+def data_relation():
+    if hookenv.relation_get('mountpoint') == mountpoint:
+        # Other side of relation is ready
+        common.migrate_to_mount(mountpoint)
+    else:
+        # Other side not ready yet, provide mountpoint
+        hookenv.log('Requesting storage for {}'.format(mountpoint))
+        hookenv.relation_set(mountpoint=mountpoint)
+
+
[e-mail]('data-relation-departed', 'data-relation-broken')
+def data_relation_gone():
+    hookenv.log('Data relation no longer present, stopping MysQL.')
+    host.service_stop('mysql')
+
+
+if __name__ == '__main__':
+    hooks.execute(sys.argv)

=== modified file 'metadata.yaml'
--- metadata.yaml	2014-05-08 11:23:53 +0000
+++ metadata.yaml	2015-01-07 14:31:43 +0000
@@ -27,6 +27,9 @@
   nrpe-external-master:
     interface: nrpe-external-master
     scope: container
+  data:
+    interface: block-storage
+    scope: container
 peers:
   cluster:
     interface: mysql-ha

=== added file 'templates/apparmor.j2'
--- templates/apparmor.j2	1970-01-01 00:00:00 +0000
+++ templates/apparmor.j2	2015-01-07 14:31:43 +0000
@@ -0,0 +1,15 @@
+#
+#    "             "
+#  mmm   m   m   mmm   m   m
+#    #   #   #     #   #   #
+#    #   #   #     #   #   #
+#    #   "mm"#     #   "mm"#
+#    #             #
+#  ""            ""
+# This file is managed by Juju. Do not make local changes.
+
+# Site-specific additions and overrides for usr.sbin.mysqld.
+# For more details, please see /etc/apparmor.d/local/README.
+
+{{path}}   r,
+{{path}}** rwk,