From b87d32b2f44e9dae87eccca80573d986ec86b353 Mon Sep 17 00:00:00 2001
From: Toni Zamparetti <toni.zamparetti@scclouds.com.br>
Date: Thu, 18 Dec 2025 12:29:28 -0300
Subject: [PATCH 1/2] fix the validation of CPVMs states in multiple zones

---
 .../com/cloud/consoleproxy/ConsoleProxyManagerImpl.java  | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/server/src/main/java/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java b/server/src/main/java/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java
index 3d834af7a862..134ac2e7653c 100644
--- a/server/src/main/java/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java
+++ b/server/src/main/java/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java
@@ -1525,12 +1525,9 @@ public boolean isPoolReadyForScan(Long dataCenterId) {
             return false;
         }
 
-        List<ConsoleProxyVO> l = consoleProxyDao.getProxyListInStates(State.Starting, State.Stopping);
-        if (l.size() > 0) {
-            if (logger.isDebugEnabled()) {
-                logger.debug("Zone {} has {} console proxy VM(s) in transition state", zone, l.size());
-            }
-
+        List<ConsoleProxyVO> l = consoleProxyDao.getProxyListInStates(dataCenterId, State.Starting, State.Stopping);
+        if (!l.isEmpty()) {
+            logger.debug("Zone {} has {} console proxy VM(s) in transition state.", zone, l.size());
             return false;
         }
 

From fd4db5ac690f7e926757755d1c118d113093805d Mon Sep 17 00:00:00 2001
From: Tonitzpp <134986282+Tonitzpp@users.noreply.github.com>
Date: Fri, 17 Apr 2026 07:40:46 -0300
Subject: [PATCH 2/2] Update
 server/src/main/java/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Bernardo De Marco Gonçalves <bernardomg2004@gmail.com>
---
 .../com/cloud/consoleproxy/ConsoleProxyManagerImpl.java     | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/server/src/main/java/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java b/server/src/main/java/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java
index 134ac2e7653c..f1e422ec36cb 100644
--- a/server/src/main/java/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java
+++ b/server/src/main/java/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java
@@ -1525,9 +1525,9 @@ public boolean isPoolReadyForScan(Long dataCenterId) {
             return false;
         }
 
-        List<ConsoleProxyVO> l = consoleProxyDao.getProxyListInStates(dataCenterId, State.Starting, State.Stopping);
-        if (!l.isEmpty()) {
-            logger.debug("Zone {} has {} console proxy VM(s) in transition state.", zone, l.size());
+        List<ConsoleProxyVO> consoleProxiesInTransitionStates = consoleProxyDao.getProxyListInStates(dataCenterId, State.Starting, State.Stopping);
+        if (!consoleProxiesInTransitionStates.isEmpty()) {
+            logger.debug("Zone {} has {} console proxy VM(s) in transition state.", zone, consoleProxiesInTransitionStates.size());
             return false;
         }