From 1815c6d801933c47a01f1a94a8e689824f6797b4 Mon Sep 17 00:00:00 2001
From: Scott Moser <smoser@brickies.net>
Date: Thu, 25 May 2017 13:06:08 -0400
Subject: disk_setup: udev settle before attempting partitioning or fs
 creation.

This attempts to use udevadm settle to wait until devices have been
fully "realized".  If a device exists, there may still be events in
the udev queue that would create its partition table entries.
We need to wait until those have been processed also.

LP: #1692093
---
 cloudinit/config/cc_disk_setup.py                  | 26 +++++++++++++++++++---
 .../test_handler/test_handler_disk_setup.py        |  2 ++
 2 files changed, 25 insertions(+), 3 deletions(-)

diff --git a/cloudinit/config/cc_disk_setup.py b/cloudinit/config/cc_disk_setup.py
index e1505b39..c2b83aea 100644
--- a/cloudinit/config/cc_disk_setup.py
+++ b/cloudinit/config/cc_disk_setup.py
@@ -680,14 +680,14 @@ def read_parttbl(device):
     reliable way to probe the partition table.
     """
     blkdev_cmd = [BLKDEV_CMD, '--rereadpt', device]
-    udev_cmd = [UDEVADM_CMD, 'settle']
+    udevadm_settle()
     try:
-        util.subp(udev_cmd)
         util.subp(blkdev_cmd)
-        util.subp(udev_cmd)
     except Exception as e:
         util.logexc(LOG, "Failed reading the partition table %s" % e)
 
+    udevadm_settle()
+
 
 def exec_mkpart_mbr(device, layout):
     """
@@ -737,6 +737,24 @@ def exec_mkpart(table_type, device, layout):
     return get_dyn_func("exec_mkpart_%s", table_type, device, layout)
 
 
+def udevadm_settle():
+    util.subp(['udevadm', 'settle'])
+
+
+def assert_and_settle_device(device):
+    """Assert that device exists and settle so it is fully recognized."""
+    if not os.path.exists(device):
+        udevadm_settle()
+        if not os.path.exists(device):
+            raise RuntimeError("Device %s did not exist and was not created "
+                               "with a udevamd settle." % device)
+
+    # Whether or not the device existed above, it is possible that udev
+    # events that would populate udev database (for reading by lsdname) have
+    # not yet finished. So settle again.
+    udevadm_settle()
+
+
 def mkpart(device, definition):
     """
     Creates the partition table.
@@ -752,6 +770,7 @@ def mkpart(device, definition):
                 device: the device to work on.
     """
     # ensure that we get a real device rather than a symbolic link
+    assert_and_settle_device(device)
     device = os.path.realpath(device)
 
     LOG.debug("Checking values for %s definition", device)
@@ -852,6 +871,7 @@ def mkfs(fs_cfg):
     overwrite = fs_cfg.get('overwrite', False)
 
     # ensure that we get a real device rather than a symbolic link
+    assert_and_settle_device(device)
     device = os.path.realpath(device)
 
     # This allows you to define the default ephemeral or swap
diff --git a/tests/unittests/test_handler/test_handler_disk_setup.py b/tests/unittests/test_handler/test_handler_disk_setup.py
index e3226978..916a0d7a 100644
--- a/tests/unittests/test_handler/test_handler_disk_setup.py
+++ b/tests/unittests/test_handler/test_handler_disk_setup.py
@@ -168,6 +168,8 @@ class TestUpdateFsSetupDevices(TestCase):
         }, fs_setup)
 
 
+@mock.patch('cloudinit.config.cc_disk_setup.assert_and_settle_device',
+            return_value=None)
 @mock.patch('cloudinit.config.cc_disk_setup.find_device_node',
             return_value=('/dev/xdb1', False))
 @mock.patch('cloudinit.config.cc_disk_setup.device_type', return_value=None)
-- 
cgit v1.2.3