vfio/ccw: increase wait time for CRW operations

With 1 seconds the observed behavior still reproduces; try with 2.

Signed-off-by: Sebastian Mitterle <[email protected]>

Author: smitterl

libvirt/tests/src/virtual_disks/virtual_disks_dasd.py

@@ -50,12 +50,12 @@ def try_enable_disk(disk_id):
 
     cmd = "lszdev --online %s" % disk_id
     err, _ = cmd_status_output(cmd, shell=True)
-    if err: # device not online
+    if err:  # device not online
         logging.debug(cmd_status_output("lscss -t 3390")[1])
         cmd = "chzdev -e %s" % disk_id
         err, out = cmd_status_output(cmd, shell=True)
-        logging.debug("Sleep for 1 sec accounting for delayed CRW.")
-        time.sleep(1)
+        logging.debug("Wait to account for delayed CRW.")
+        time.sleep(2)
         logging.debug(cmd_status_output("lscss -t 3390")[1])
         if err:
             raise TestError(f"Couldn't set device online: {out}")
@@ -73,8 +73,8 @@ def disable_disk(disk_id):
     logging.debug(cmd_status_output("lscss -t 3390")[1])
     cmd = "chzdev -d %s" % disk_id
     err, out = cmd_status_output(cmd, shell=True)
-    logging.debug("Sleep for 1 sec accounting for delayed CRW.")
-    time.sleep(1)
+    logging.debug("Wait to account for delayed CRW.")
+    time.sleep(2)
     logging.debug(cmd_status_output("lscss -t 3390")[1])
     if err:
         raise TestError("Couldn't disable dasd '%s'. %s" % (disk_id, out))

provider/vfio/ccw.py

@@ -161,8 +161,8 @@ def set_device_offline(device_id, session=None):
     logging.debug(cmd_status_output("lscss -t 3390")[1])
     cmd = "chccwdev -d %s" % device_id
     err, out = cmd_status_output(cmd, shell=True, session=session)
-    logging.debug("Wait for 1 second to account for delayed CRW.")
-    time.sleep(1)
+    logging.debug("Wait to account for delayed CRW.")
+    time.sleep(2)
     logging.debug(cmd_status_output("lscss -t 3390")[1])
     if err:
         raise TestError("Could not set device offline. %s" % out)
@@ -180,8 +180,8 @@ def set_device_online(device_id, session=None):
     logging.debug(cmd_status_output("lscss -t 3390")[1])
     cmd = "chccwdev -e %s" % device_id
     err, out = cmd_status_output(cmd, shell=True, session=session)
-    logging.debug("Wait for 1 second to account for delayed CRW.")
-    time.sleep(1)
+    logging.debug("Wait to account for delayed CRW.")
+    time.sleep(2)
     logging.debug(cmd_status_output("lscss -t 3390")[1])
     if err:
         raise TestError("Could not set device online. %s" % out)
@@ -246,8 +246,8 @@ def set_override(schid):
     logging.debug(cmd_status_output("lscss -t 3390")[1])
     cmd = "driverctl -b css set-override %s vfio_ccw" % schid
     err, out = cmd_status_output(cmd, shell=True)
-    logging.debug("Wait for 1 second to account for delayed CRW.")
-    time.sleep(1)
+    logging.debug("Wait to account for delayed CRW.")
+    time.sleep(2)
     logging.debug(cmd_status_output("lscss -t 3390")[1])
     if err:
         raise TestError("Can't set driver override. %s" % out)
@@ -264,8 +264,8 @@ def unset_override(schid):
     logging.debug(cmd_status_output("lscss -t 3390")[1])
     cmd = "driverctl -b css unset-override %s" % schid
     err, out = cmd_status_output(cmd, shell=True)
-    logging.debug("Wait for 1 second to account for delayed CRW.")
-    time.sleep(1)
+    logging.debug("Wait to account for delayed CRW.")
+    time.sleep(2)
     logging.debug(cmd_status_output("lscss -t 3390")[1])
     if err:
         raise TestError("Can't unset driver override. %s" % out)