Merge lp:~ahasenack/charms/precise/rabbitmq-server/check-device-before-mkfs into lp:charms/rabbitmq-server

[Andreas Hasenack]

Check for the existence of the rbd device before attempting to format it. If it doesn't exist, wait in a loop for up to 10s before failing.

[Adam Gandelman (gandelman-a)]

This looks sane. Can you please also propose the same fix to charm-helpers, as this code now lives there in charmhelpers/contrib/hacluster/ceph.py

review: Approve

=== modified file 'hooks/lib/ceph_utils.py'
--- hooks/lib/ceph_utils.py	2013-03-18 10:28:17 +0000
+++ hooks/lib/ceph_utils.py	2013-08-08 21:24:23 +0000
@@ -12,6 +12,7 @@
 import subprocess
 import os
 import shutil
+import time
 import lib.utils as utils
 
 KEYRING = '/etc/ceph/ceph.client.%s.keyring'
@@ -153,11 +154,22 @@
 
 
 def make_filesystem(blk_device, fstype='ext4'):
-    utils.juju_log('INFO',
-                   'ceph: Formatting block device %s as filesystem %s.' %\
-                   (blk_device, fstype))
-    cmd = ['mkfs', '-t', fstype, blk_device]
-    execute(cmd)
+    count = 0
+    e_noent = os.errno.ENOENT
+    while not os.path.exists(blk_device):
+        if count >= 10:
+            utils.juju_log('ERROR',
+                'ceph: gave up waiting on block device %s' % blk_device)
+            raise IOError(e_noent, os.strerror(e_noent), blk_device)
+        utils.juju_log('INFO',
+            'ceph: waiting for block device %s to appear' % blk_device)
+        count += 1
+        time.sleep(1)
+    else:
+        utils.juju_log('INFO',
+            'ceph: Formatting block device %s as filesystem %s.' %
+            (blk_device, fstype))
+        execute(['mkfs', '-t', fstype, blk_device])
 
 
 def place_data_on_ceph(service, blk_device, data_src_dst, fstype='ext4'):
 
=== modified file 'revision'
--- revision	2013-07-26 22:31:07 +0000
+++ revision	2013-08-08 21:24:23 +0000
@@ -1,1 +1,1 @@
-96
+97