merge trunk at 0.6.3~bzr551

smoser · smoser · commit 947a60975ab6 · 2016-08-23T16:48:29.000-04:00
diff --git a/ChangeLog b/ChangeLog
@@ -37,6 +37,7 @@
  - add option 'apt_pipelining' to address issue with S3 mirrors 
    (LP: #948461) [Ben Howard]
  - warn on non-multipart, non-handled user-data [Martin Packman]
+ - run resizefs in the background in order to not block boot (LP: #961226)
 0.6.2:
  - fix bug where update was not done unless update was explicitly set.
    It would not be run if 'upgrade' or packages were set to be installed
diff --git a/cloudinit/CloudConfig/cc_resizefs.py b/cloudinit/CloudConfig/cc_resizefs.py
@@ -22,6 +22,8 @@
 import subprocess
 import os
 import stat
+import sys
+import time
 import tempfile
 from cloudinit.CloudConfig import per_always
 
@@ -34,15 +36,14 @@ def handle(_name, cfg, _cloud, log, args):
         if str(args[0]).lower() in ['true', '1', 'on', 'yes']:
             resize_root = True
     else:
-        resize_root = util.get_cfg_option_bool(cfg, "resize_rootfs", True)
+        resize_root = util.get_cfg_option_str(cfg, "resize_rootfs", True)
 
-    if not resize_root:
+    if str(resize_root).lower() in ['false', '0']:
         return
 
-    # this really only uses the filename from mktemp, then we mknod into it
-    (fd, devpth) = tempfile.mkstemp()
-    os.unlink(devpth)
-    os.close(fd)
+    # we use mktemp rather than mkstemp because early in boot nothing
+    # else should be able to race us for this, and we need to mknod.
+    devpth = tempfile.mktemp(prefix="cloudinit.resizefs.", dir="/run")
 
     try:
         st_dev = os.stat("/").st_dev
@@ -65,9 +66,6 @@ def handle(_name, cfg, _cloud, log, args):
         os.unlink(devpth)
         raise
 
-    log.debug("resizing root filesystem (type=%s, maj=%i, min=%i)" %
-        (str(fstype).rstrip("\n"), os.major(st_dev), os.minor(st_dev)))
-
     if str(fstype).startswith("ext"):
         resize_cmd = ['resize2fs', devpth]
     elif fstype == "xfs":
@@ -77,7 +75,28 @@ def handle(_name, cfg, _cloud, log, args):
         log.debug("not resizing unknown filesystem %s" % fstype)
         return
 
+    if resize_root == "noblock":
+        fid = os.fork()
+        if fid == 0:
+            try:
+                do_resize(resize_cmd, devpth, log)
+                os._exit(0)  # pylint: disable=W0212
+            except Exception as exc:
+                sys.stderr.write("Failed: %s" % exc)
+                os._exit(1)  # pylint: disable=W0212
+    else:
+        do_resize(resize_cmd, devpth, log)
+
+    log.debug("resizing root filesystem (type=%s, maj=%i, min=%i, val=%s)" %
+        (str(fstype).rstrip("\n"), os.major(st_dev), os.minor(st_dev),
+         resize_root))
+
+    return
+
+
+def do_resize(resize_cmd, devpth, log):
     try:
+        start = time.time()
         util.subp(resize_cmd)
     except subprocess.CalledProcessError as e:
         log.warn("Failed to resize filesystem (%s)" % resize_cmd)
@@ -86,4 +105,4 @@ def handle(_name, cfg, _cloud, log, args):
         raise
 
     os.unlink(devpth)
-    return
+    log.debug("resize took %s seconds" % (time.time() - start))
diff --git a/doc/examples/cloud-config.txt b/doc/examples/cloud-config.txt
@@ -351,6 +351,8 @@ rsyslog:
 # this allows you to launch an instance with a larger disk / partition
 # and have the instance automatically grow / to accomoddate it
 # set to 'False' to disable
+# by default, the resizefs is done early in boot, and blocks
+# if resize_rootfs is set to 'noblock', then it will be run in parallel
 resize_rootfs: True
 
 ## hostname and /etc/hosts management
