From 169ac1ce5763a38ad4ca84067ff07fbc45ad1166 Mon Sep 17 00:00:00 2001 From: Edison Su Date: Tue, 8 Feb 2011 10:28:20 -0500 Subject: [PATCH] bug 8464,8404: allocator is not move reserved resource to used resource, in some case status 8464: resolved fixed status 8404: resolved fixed --- server/src/com/cloud/capacity/CapacityManagerImpl.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/server/src/com/cloud/capacity/CapacityManagerImpl.java b/server/src/com/cloud/capacity/CapacityManagerImpl.java index 99de6ea878c..0b540dc81b0 100644 --- a/server/src/com/cloud/capacity/CapacityManagerImpl.java +++ b/server/src/com/cloud/capacity/CapacityManagerImpl.java @@ -193,10 +193,10 @@ public class CapacityManagerImpl implements CapacityManager { if (reservedCpu >= cpu && reservedMem >= ram) { capacityCpu.setReservedCapacity(reservedCpu - cpu); capacityMem.setReservedCapacity(reservedMem - ram); - if ((usedCpu + reservedCpu + cpu <= totalCpu) && (reservedMem + usedMem + ram <= totalMem)) { - capacityCpu.setUsedCapacity(usedCpu + cpu); - capacityMem.setUsedCapacity(usedMem + ram); - } + + capacityCpu.setUsedCapacity(usedCpu + cpu); + capacityMem.setUsedCapacity(usedMem + ram); + success = true; } } else {