Merge lp:~daniel-thewatkins/charms/trusty/ubuntu-repository-cache/handle_mounted_ephemeral_disk into lp:charms/trusty/ubuntu-repository-cache

[Dan Watkins]

This cleans up the epheremal disk code path, as well as adding a fix to charmhelpers so we can handle full disk partitions.

[lp:~daniel-thewatkins/charms/trusty/ubuntu-repository-cache/handle_mounted_ephemeral_disk]

196. By Dan Watkins on 2015-06-09

Fix finding of partitions on a disk.

197. By Dan Watkins on 2015-06-09

Remove redundant directory creation (which now breaks permissions).

198. By Dan Watkins on 2015-06-09

Fix typo in log message.

199. By Dan Watkins on 2015-06-09

Add is_device_mounted fix.

[Adam Israel (aisrael)]

Hi Dan,

I was able to review this yesterday. Per our conversation in #juju, this MP is to fix the issue reported on lp:262072. It might be easier if you merged these changes with that branch, but this update is otherwise good and fixes the charm.

review: Approve

[Marco Ceppi (marcoceppi)]

Hi Dan, it seems you're trying patch issues in charmhelpers directly in your charm. You'll instead want/need to make these changes directly to the lp:charm-helpers library and then sync charm-helpers into the charm. This way not only will your charm benefit from these fixes, so will everyone else using charm-helpers. It'll also prevent them from being wiped out on the next sync with this charm.

On that basis alone I'm rejecting this merge, if that's not the case and these changes have found their way into charm-helpers let me know and move the status back to "Needs Review"

Thanks!

review: Disapprove

[Dan Watkins (daniel-thewatkins)]

Ahem: https://code.launchpad.net/~daniel-thewatkins/charm-helpers/lp1370053/+merge/260864

;)

Unmerged revisions

199. By Dan Watkins on 2015-06-09

Add is_device_mounted fix.

198. By Dan Watkins on 2015-06-09

Fix typo in log message.

197. By Dan Watkins on 2015-06-09

Remove redundant directory creation (which now breaks permissions).

196. By Dan Watkins on 2015-06-09

Fix finding of partitions on a disk.

=== modified file 'lib/charmhelpers/contrib/storage/linux/utils.py'
--- lib/charmhelpers/contrib/storage/linux/utils.py	2015-06-03 10:05:41 +0000
+++ lib/charmhelpers/contrib/storage/linux/utils.py	2015-06-09 07:43:30 +0000
@@ -67,4 +67,4 @@
     out = check_output(['mount']).decode('UTF-8')
     if is_partition:
         return bool(re.search(device + r"\b", out))
-    return bool(re.search(device + r"[0-9]+\b", out))
+    return bool(re.search(device + r"[0-9]*\b", out))

=== modified file 'lib/ubuntu_repository_cache/storage.py'
--- lib/ubuntu_repository_cache/storage.py	2015-03-27 20:04:13 +0000
+++ lib/ubuntu_repository_cache/storage.py	2015-06-09 07:43:30 +0000
@@ -79,8 +79,6 @@
     # Add the primary mount last for squid.  This allocates it last
     # and saves additional space for metadata mirrors
     squid_cache = '/'.join((primary_mount, 'squid'))
-    _mkdir(os.path.dirname(squid_cache), owner='proxy', group='proxy',
-           perms=0o770)
     _mkdir(squid_cache, owner='proxy', group='proxy', perms=0o770)
     max_size = _disk_free(squid_cache)
     # Reserve 8GB for metadata and 4GB for the OS
@@ -129,7 +127,8 @@
             LOG('%s is not a block device, skipping' % dev, hookenv.ERROR)
             continue
 
-        partitions = glob.glob(dev + '*').remove(dev) or []
+        partitions = glob.glob(dev + '*') or []
+        partitions.remove(dev)
         for part in partitions:
             if Storage.is_device_mounted(part):
                 LOG('Ephemeral device had a mounted partition %s skipping' %
@@ -196,7 +195,7 @@
 
     config = hookenv.config()
     try:
-        LOG('Adding check for ephemeral stoage {}'.format(
+        LOG('Adding check for ephemeral storage {}'.format(
             config['ephemeral-mounts']),
             hookenv.DEBUG)
     except KeyError:

=== added file 'patches/storage-0001-full-disk-is_device_mounted.patch'
--- patches/storage-0001-full-disk-is_device_mounted.patch	1970-01-01 00:00:00 +0000
+++ patches/storage-0001-full-disk-is_device_mounted.patch	2015-06-09 07:43:30 +0000
@@ -0,0 +1,12 @@
+Submitted as https://code.launchpad.net/~daniel-thewatkins/charm-helpers/lp1370053/+merge/260864.
+
+diff --git a/lib/charmhelpers/contrib/storage/linux/utils.py b/lib/charmhelpers/contrib/storage/linux/utils.py
+index c8373b7..e2769e4 100644
+--- a/lib/charmhelpers/contrib/storage/linux/utils.py
++++ b/lib/charmhelpers/contrib/storage/linux/utils.py
+@@ -67,4 +67,4 @@ def is_device_mounted(device):
+     out = check_output(['mount']).decode('UTF-8')
+     if is_partition:
+         return bool(re.search(device + r"\b", out))
+-    return bool(re.search(device + r"[0-9]+\b", out))
++    return bool(re.search(device + r"[0-9]*\b", out))