Merge pull request #2375 from alena1108/missingagentstate

missing valid states for active hosts
rancher · Jan 12, 2017 · 6b26a4c · 6b26a4c
2 parents 50f2bc6 + 22b797d
commit 6b26a4c
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/code/iaas/model/src/main/java/io/cattle/platform/core/dao/impl/HostDaoImpl.java b/code/iaas/model/src/main/java/io/cattle/platform/core/dao/impl/HostDaoImpl.java
@@ -67,8 +67,10 @@ public boolean hasActiveHosts(Long accountId) {
             .join(AGENT)
                 .on(AGENT.ID.eq(HOST.AGENT_ID))
             .where(HOST.ACCOUNT_ID.eq(accountId)
-            .and(HOST.STATE.in(CommonStatesConstants.ACTIVATING, CommonStatesConstants.ACTIVE)
-                    .and(AGENT.STATE.in(CommonStatesConstants.ACTIVATING, CommonStatesConstants.ACTIVE, AgentConstants.STATE_FINISHING_RECONNECT))))
+                        .and(HOST.STATE.in(CommonStatesConstants.ACTIVATING, CommonStatesConstants.ACTIVE,
+                                CommonStatesConstants.UPDATING_ACTIVE)
+                                .and(AGENT.STATE.in(CommonStatesConstants.ACTIVATING, CommonStatesConstants.ACTIVE,
+                                        AgentConstants.STATE_FINISHING_RECONNECT, AgentConstants.STATE_RECONNECTED))))
             .fetchOneInto(Integer.class) > 0;
     }