From b9f15fd15999944b3f3befdb51d308a74e060e18 Mon Sep 17 00:00:00 2001 From: Rakesh Date: Wed, 28 Oct 2020 09:41:14 +0100 Subject: [PATCH] Remove cpu core from op_host_capacity when host is deleted (#4367) When a host is put into maintenance mode or its deleted from cloudstack then delete its entries from op_host_capacity table --- .../src/main/java/com/cloud/capacity/CapacityManagerImpl.java | 1 + .../src/main/java/com/cloud/resource/ResourceManagerImpl.java | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/server/src/main/java/com/cloud/capacity/CapacityManagerImpl.java b/server/src/main/java/com/cloud/capacity/CapacityManagerImpl.java index b3f3a625f67..5530e53fdc4 100644 --- a/server/src/main/java/com/cloud/capacity/CapacityManagerImpl.java +++ b/server/src/main/java/com/cloud/capacity/CapacityManagerImpl.java @@ -1179,6 +1179,7 @@ public class CapacityManagerImpl extends ManagerBase implements CapacityManager, public void processPrepareMaintenaceEventAfter(Long hostId) { _capacityDao.removeBy(Capacity.CAPACITY_TYPE_MEMORY, null, null, null, hostId); _capacityDao.removeBy(Capacity.CAPACITY_TYPE_CPU, null, null, null, hostId); + _capacityDao.removeBy(Capacity.CAPACITY_TYPE_CPU_CORE, null, null, null, hostId); } @Override diff --git a/server/src/main/java/com/cloud/resource/ResourceManagerImpl.java b/server/src/main/java/com/cloud/resource/ResourceManagerImpl.java index c1c221b4f7e..6945d6f4368 100755 --- a/server/src/main/java/com/cloud/resource/ResourceManagerImpl.java +++ b/server/src/main/java/com/cloud/resource/ResourceManagerImpl.java @@ -929,7 +929,7 @@ public class ResourceManagerImpl extends ManagerBase implements ResourceManager, } // delete the op_host_capacity entry - final Object[] capacityTypes = {Capacity.CAPACITY_TYPE_CPU, Capacity.CAPACITY_TYPE_MEMORY}; + final Object[] capacityTypes = {Capacity.CAPACITY_TYPE_CPU, Capacity.CAPACITY_TYPE_MEMORY, Capacity.CAPACITY_TYPE_CPU_CORE}; final SearchCriteria hostCapacitySC = _capacityDao.createSearchCriteria(); hostCapacitySC.addAnd("hostOrPoolId", SearchCriteria.Op.EQ, hostId); hostCapacitySC.addAnd("capacityType", SearchCriteria.Op.IN, capacityTypes);