Merge lp:~hopem/charms/precise/mysql/lp1251560 into lp:charms/mysql

[Edward Hope-Morley]

[Ante Karamatić (ivoks)]

FWIW; I've tested this charm and it works as intended.

[James Page (james-page)]

This is fine with > argonaut; I recently landed some changes into charm-helpers to deal with <= argonaut:

https://code.launchpad.net/~james-page/charm-helpers/folsom-ceph-support/+merge/192557

review: Needs Fixing

[Marco Ceppi (marcoceppi)]

LGTM, +1

review: Approve

=== modified file 'config.yaml'
--- config.yaml	2013-12-12 17:07:59 +0000
+++ config.yaml	2014-01-29 09:37:41 +0000
@@ -68,3 +68,13 @@
           The name that will be used to create the Ceph's RBD image with. If the
           image name exists in Ceph, it will be re-used and the data will be
           overwritten.
+    ceph-osd-replication-count:
+        default: 2
+        type: int
+        description: |
+            This value dictates the number of replicas ceph must make of any
+            object it stores within the mysql rbd pool. Of course, this only
+            applies if using Ceph as a backend store. Note that once the mysql
+            rbd pool has been created, changing this value will not have any
+            effect (although it can be changed in ceph by manually configuring
+            your ceph cluster).

=== modified file 'hooks/ha_relations.py'
--- hooks/ha_relations.py	2013-03-18 10:35:17 +0000
+++ hooks/ha_relations.py	2014-01-29 09:37:41 +0000
@@ -110,11 +110,13 @@
         sizemb = int(utils.config_get('block-size')) * 1024
         rbd_img = utils.config_get('rbd-name')
         blk_device = '/dev/rbd/%s/%s' % (POOL_NAME, rbd_img)
+        rbd_pool_rep_count = utils.config_get('ceph-osd-replication-count')
         ceph.ensure_ceph_storage(service=SERVICE_NAME, pool=POOL_NAME,
                                  rbd_img=rbd_img, sizemb=sizemb,
                                  fstype='ext4', mount_point=DATA_SRC_DST,
                                  blk_device=blk_device,
-                                 system_services=['mysql'])
+                                 system_services=['mysql'],
+                                 rbd_pool_replicas=rbd_pool_rep_count)
     else:
         utils.juju_log('INFO',
                        'This is not the peer leader. Not configuring RBD.')

=== modified file 'hooks/lib/ceph_utils.py'
--- hooks/lib/ceph_utils.py	2013-08-08 21:50:40 +0000
+++ hooks/lib/ceph_utils.py	2014-01-29 09:37:41 +0000
@@ -9,6 +9,7 @@
 #
 
 import commands
+import json
 import subprocess
 import os
 import shutil
@@ -66,15 +67,61 @@
     return name in out
 
 
-def create_pool(service, name):
-    cmd = [
-        'rados',
-        '--id',
-        service,
-        'mkpool',
-        name
-        ]
-    execute(cmd)
+def ceph_version():
+    ''' Retrieve the local version of ceph '''
+    if os.path.exists('/usr/bin/ceph'):
+        cmd = ['ceph', '-v']
+        output = subprocess.check_output(cmd)
+        output = output.split()
+        if len(output) > 3:
+            return output[2]
+        else:
+            return None
+    else:
+        return None
+
+
+def get_osds(service):
+    '''
+    Return a list of all Ceph Object Storage Daemons
+    currently in the cluster
+    '''
+    version = ceph_version()
+    if version and version >= '0.56':
+        cmd = ['ceph', '--id', service, 'osd', 'ls', '--format=json']
+        return json.loads(subprocess.check_output(cmd))
+    else:
+        return None
+
+
+def create_pool(service, name, replicas=2):
+    ''' Create a new RADOS pool '''
+    if pool_exists(service, name):
+        utils.juju_log('WARNING',
+                       "Ceph pool {} already exists, "
+                       "skipping creation".format(name))
+        return
+
+    osds = get_osds(service)
+    if osds:
+        pgnum = (len(osds) * 100 / replicas)
+    else:
+        # NOTE(james-page): Default to 200 for older ceph versions
+        # which don't support OSD query from cli
+        pgnum = 200
+
+    cmd = [
+        'ceph', '--id', service,
+        'osd', 'pool', 'create',
+        name, str(pgnum)
+    ]
+    subprocess.check_call(cmd)
+    cmd = [
+        'ceph', '--id', service,
+        'osd', 'pool', 'set', name,
+        'size', str(replicas)
+    ]
+    subprocess.check_call(cmd)
 
 
 def keyfile_path(service):
@@ -220,7 +267,8 @@
 
 
 def ensure_ceph_storage(service, pool, rbd_img, sizemb, mount_point,
-                        blk_device, fstype, system_services=[]):
+                        blk_device, fstype, system_services=[],
+                        rbd_pool_replicas=2):
     """
     To be called from the current cluster leader.
     Ensures given pool and RBD image exists, is mapped to a block device,
@@ -235,7 +283,7 @@
     # Ensure pool, RBD image, RBD mappings are in place.
     if not pool_exists(service, pool):
         utils.juju_log('INFO', 'ceph: Creating new pool %s.' % pool)
-        create_pool(service, pool)
+        create_pool(service, pool, replicas=rbd_pool_replicas)
 
     if not rbd_exists(service, pool, rbd_img):
         utils.juju_log('INFO', 'ceph: Creating RBD image (%s).' % rbd_img)

=== modified file 'revision'
--- revision	2013-08-08 21:50:40 +0000
+++ revision	2014-01-29 09:37:41 +0000
@@ -1,1 +1,1 @@
-309
+310