From f52701090495d1a428197563a99dcd70b7ca1fd6 Mon Sep 17 00:00:00 2001 From: "dongyi.zhang" Date: Sun, 17 Dec 2017 17:25:54 +0800 Subject: [PATCH] fix the hosts that are not enabled or connected should not be included when calculating reserved capacity by cluster or zone. --- .../compute/allocator/HostCapacityReserveManagerImpl.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/compute/src/main/java/org/zstack/compute/allocator/HostCapacityReserveManagerImpl.java b/compute/src/main/java/org/zstack/compute/allocator/HostCapacityReserveManagerImpl.java index 39134b9992e..eeec05e44eb 100755 --- a/compute/src/main/java/org/zstack/compute/allocator/HostCapacityReserveManagerImpl.java +++ b/compute/src/main/java/org/zstack/compute/allocator/HostCapacityReserveManagerImpl.java @@ -335,6 +335,8 @@ public ReservedHostCapacity getReservedHostCapacityByZones(List zoneUuid SimpleQuery q = dbf.createQuery(HostVO.class); q.select(HostVO_.uuid); q.add(HostVO_.zoneUuid, Op.IN, zoneUuids); + q.add(HostVO_.state, Op.EQ, HostState.Enabled); + q.add(HostVO_.status, Op.EQ, HostStatus.Connected); List huuids = q.listValue(); if (huuids.isEmpty()) { return ret; @@ -360,6 +362,8 @@ public ReservedHostCapacity getReservedHostCapacityByClusters(List clust SimpleQuery q = dbf.createQuery(HostVO.class); q.select(HostVO_.uuid); q.add(HostVO_.clusterUuid, Op.IN, clusterUuids); + q.add(HostVO_.state, Op.EQ, HostState.Enabled); + q.add(HostVO_.status, Op.EQ, HostStatus.Connected); List huuids = q.listValue(); if (huuids.isEmpty()) { return ret;