Merge branch '4.19' into 4.20

Daan Hoogland · Daan Hoogland · commit be08fff32b79 · 2025-07-29T15:29:59.000+02:00
diff --git a/server/src/main/java/com/cloud/resource/ResourceManagerImpl.java b/server/src/main/java/com/cloud/resource/ResourceManagerImpl.java
@@ -1240,7 +1240,7 @@ public Cluster updateCluster(UpdateClusterCmd cmd) {
                     for (int i = 0; i < retry; i++) {
                         lsuccess = true;
                         try {
-                            Thread.currentThread().wait(5 * 1000);
+                            Thread.sleep(5 * 1000);
                         } catch (final InterruptedException e) {
                             logger.debug("thread unexpectedly interrupted during wait, while updating cluster");
                         }

Original file line number	Diff line number	Diff line change
`@@ -1240,7 +1240,7 @@ public Cluster updateCluster(UpdateClusterCmd cmd) {`
`1240`	`1240`	`for (int i = 0; i < retry; i++) {`
`1241`	`1241`	`lsuccess = true;`
`1242`	`1242`	`try {`
`1243`		`- Thread.currentThread().wait(5 * 1000);`
	`1243`	`+ Thread.sleep(5 * 1000);`
`1244`	`1244`	`} catch (final InterruptedException e) {`
`1245`	`1245`	`logger.debug("thread unexpectedly interrupted during wait, while updating cluster");`
`1246`	`1246`	`}`