This is an automated email from the ASF dual-hosted git repository.

dahn pushed a commit to branch 4.20
in repository https://gitbox.apache.org/repos/asf/cloudstack.git

commit be08fff32b79f548ab62fd5a217b5ac1f7ae6976
Merge: 1961aea7706 4b1a605e597
Author: Daan Hoogland <d...@apache.org>
AuthorDate: Tue Jul 29 15:29:59 2025 +0200

    Merge branch '4.19' into 4.20

 server/src/main/java/com/cloud/resource/ResourceManagerImpl.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --cc server/src/main/java/com/cloud/resource/ResourceManagerImpl.java
index 1d924a782fa,e0cefc7b4bf..87d8c20d3cb
--- a/server/src/main/java/com/cloud/resource/ResourceManagerImpl.java
+++ b/server/src/main/java/com/cloud/resource/ResourceManagerImpl.java
@@@ -1240,9 -1217,9 +1240,9 @@@ public class ResourceManagerImpl extend
                      for (int i = 0; i < retry; i++) {
                          lsuccess = true;
                          try {
-                             Thread.currentThread().wait(5 * 1000);
+                             Thread.sleep(5 * 1000);
                          } catch (final InterruptedException e) {
 -                            s_logger.debug("thread unexpectedly interrupted 
during wait, while updating cluster");
 +                            logger.debug("thread unexpectedly interrupted 
during wait, while updating cluster");
                          }
                          hosts = listAllUpAndEnabledHosts(Host.Type.Routing, 
cluster.getId(), cluster.getPodId(), cluster.getDataCenterId());
                          for (final HostVO host : hosts) {

Reply via email to