Merge lp:~1chb1n/charms/trusty/swift-storage/next-mkfs-udev-race into lp:~openstack-charmers-archive/charms/trusty/swift-storage/next

[Ryan Beisner]

Use udevadm settle to address mkfs/udev race
https://bugs.launchpad.net/charms/+source/swift-storage/+bug/1513204

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

charm_lint_check #13159 swift-storage-next for 1chb1n mp276806
    LINT OK: passed

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

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

charm_unit_test #12266 swift-storage-next for 1chb1n mp276806
    UNIT OK: passed

Build: http://10.245.162.77:8080/job/charm_unit_test/12266/

Unmerged revisions

94. By Ryan Beisner on 2015-11-05

Wait for udev to settle before block operations

=== modified file 'lib/swift_storage_utils.py'
--- lib/swift_storage_utils.py	2015-10-13 13:07:27 +0000
+++ lib/swift_storage_utils.py	2015-11-05 18:44:33 +0000
@@ -218,7 +218,16 @@
     return gdevs
 
 
+def udevadm_settle():
+    log('Waiting for udev to settle...')
+    cmd = ['udevadm', 'settle']
+    check_call(cmd)
+
+
 def determine_block_devices():
+    log('Determining block devices...')
+    udevadm_settle()
+
     block_device = config('block-device')
 
     if not block_device or block_device in ['None', 'none']:
@@ -248,7 +257,7 @@
     for dev in determine_block_devices():
         if config('overwrite') in ['True', 'true']:
             clean_storage(dev)
-        # if not cleaned and in use, mkfs should fail.
+        # if not cleaned or in use, mkfs will fail
         mkfs_xfs(dev)
         _dev = os.path.basename(dev)
         _mp = os.path.join('/srv', 'node', _dev)