daemon-common/vm.py

@@ -1997,14 +1997,11 @@ def vm_worker_flush_locks(zkhandler, celery, domain, force_unlock=False):
         )
 
         if lock_remove_retcode != 0:
-            if force_unlock and "No such file or directory" in lock_remove_stderr:
+            fail(
-                continue
+                celery,
-            else:
+                f"Failed to free RBD lock {lock['id']} on volume {rbd}: {lock_remove_stderr}",
-                fail(
+            )
-                    celery,
+            return False
-                    f"Failed to free RBD lock {lock['id']} on volume {rbd}: {lock_remove_stderr}",
-                )
-                return False
 
     current_stage += 1
     return finish(

node-daemon/pvcnoded/util/fencing.py

@@ -247,7 +247,7 @@ def migrateFromFencedNode(zkhandler, node_name, config, logger):
             )
             zkhandler.write(
                 {
-                    (("domain.state", dom_uuid), "stop"),
+                    (("domain.state", dom_uuid), "stopped"),
                     (("domain.meta.autostart", dom_uuid), "True"),
                 }
             )

node-daemon/pvcnoded/util/services.py

@@ -102,5 +102,5 @@ def start_system_services(logger, config):
     start_workerd(logger, config)
     start_healthd(logger, config)
 
-    logger.out("Waiting 10 seconds for daemons to start", state="s")
+    logger.out("Waiting 5 seconds for daemons to start", state="s")
-    sleep(10)
+    sleep(5)

node-daemon/pvcnoded/util/zookeeper.py

@@ -188,6 +188,3 @@ def setup_node(logger, config, zkhandler):
                 (("node.count.networks", config["node_hostname"]), "0"),
             ]
         )
-
-    logger.out("Waiting 5 seconds for Zookeeper to synchronize", state="s")
-    time.sleep(5)