sig_cloud/diskimage-builder
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix mkfs failure when loop device is not ready

Browse Source 
There was a race in diskimage-builder where the mkfs call after a
kpartx -avs for the loop device would fail because the device was
not yet ready.  This adds a udevadm settle call after the kpartx
to make sure the udev event queue has cleared.

Change-Id: I90103b59357edebbac7a641e8980cb282d37561b
Closes-Bug: #1698337
This commit is contained in:
Michael Johnson 2017-06-16 09:26:06 -07:00 committed by Ian Wienand
parent 1324f5b7db
commit 250aeb5d21
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
diskimage_builder/block_device/level1/partitioning.py
View File

@ -147,6 +147,12 @@ class Partitioning(PluginBase):
# mount them # mount them
if not os.path.exists("/.dockerenv"): if not os.path.exists("/.dockerenv"):
exec_sudo(["kpartx", "-avs", device_path]) exec_sudo(["kpartx", "-avs", device_path])
# We need to make sure udev finishes creating the device
# before continuting, so "udevadm settle". Otherwise later
# commands can fail with "file does not exist".
# XXX: "-s" (synchronous) to kpartx should avoid this,
# but experience shows it does not.
exec_sudo(["udevadm", "settle"])
else: else:
# If running inside Docker, make our nodes manually, # If running inside Docker, make our nodes manually,
# because udev will not be working. kpartx cannot run in # because udev will not be working. kpartx cannot run in