[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

[master] Increment the time we wait for all the block devices to initialize and empty the udev queue (#533047).



This is because a case with LVM devices on ATA disks was found where it took up
to 35 seconds for udev to settle.
---
 baseudev.py     |    2 +-
 storage/udev.py |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/baseudev.py b/baseudev.py
index d88d7fc..bf8cd0f 100644
--- a/baseudev.py
+++ b/baseudev.py
@@ -86,7 +86,7 @@ def udev_parse_uevent_file(dev):
 
 def udev_settle(timeout=None):
     argv = ["settle"]
-    if timeout:
+    if timeout is not None:
         argv.append("--timeout=%d" % int(timeout))
 
     iutil.execWithRedirect("udevadm", argv, stderr="/dev/null", searchPath=1)
diff --git a/storage/udev.py b/storage/udev.py
index 5d4c778..142e20b 100644
--- a/storage/udev.py
+++ b/storage/udev.py
@@ -77,7 +77,7 @@ def udev_resolve_glob(glob):
     return ret
 
 def udev_get_block_devices():
-    udev_settle(timeout=30)
+    udev_settle(timeout=40)
     entries = []
     for path in udev_enumerate_block_devices():
         entry = udev_get_block_device(path)
-- 
1.6.2.5


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]