From ccdfe240bd7f9b8f87e41b1cdab3b6e58cbfb024 Mon Sep 17 00:00:00 2001
From: Edison Su <edison@cloud.com>
Date: Thu, 4 Aug 2011 11:53:49 -0700
Subject: [PATCH] don't put cpu/mem into reserved capacity if failed to
 start/stop vm

---
 server/src/com/cloud/capacity/CapacityManagerImpl.java | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/server/src/com/cloud/capacity/CapacityManagerImpl.java b/server/src/com/cloud/capacity/CapacityManagerImpl.java
index d9582f7588c..8273e77509b 100755
--- a/server/src/com/cloud/capacity/CapacityManagerImpl.java
+++ b/server/src/com/cloud/capacity/CapacityManagerImpl.java
@@ -622,7 +622,7 @@ public class CapacityManagerImpl implements CapacityManager, StateListener<State
             } else if (event == Event.OperationRetry) {
                 releaseVmCapacity(vm, false, false, oldHostId);
             } else if (event == Event.AgentReportStopped) {
-                releaseVmCapacity(vm, false, true, oldHostId);
+                releaseVmCapacity(vm, false, false, oldHostId);
             } else if(event == Event.AgentReportMigrated) {
             	releaseVmCapacity(vm, false, false, oldHostId);
             }
@@ -636,7 +636,7 @@ public class CapacityManagerImpl implements CapacityManager, StateListener<State
             if (event == Event.AgentReportStopped) {
                 /* Release capacity from original host */
                 releaseVmCapacity(vm, false, false, vm.getLastHostId());
-                releaseVmCapacity(vm, false, true, oldHostId);
+                releaseVmCapacity(vm, false, false, oldHostId);
             } else if (event == Event.OperationFailed) {
                 /* Release from dest host */
                 releaseVmCapacity(vm, false, false, oldHostId);
@@ -644,8 +644,10 @@ public class CapacityManagerImpl implements CapacityManager, StateListener<State
                 releaseVmCapacity(vm, false, false, vm.getLastHostId());
             }
         } else if (oldState == State.Stopping) {
-            if (event == Event.AgentReportStopped || event == Event.OperationSucceeded) {
+            if (event == Event.OperationSucceeded) {
                 releaseVmCapacity(vm, false, true, oldHostId);
+            } else if (event == Event.AgentReportStopped) {
+                releaseVmCapacity(vm, false, false, oldHostId);
             } else if(event == Event.AgentReportMigrated) {
                 releaseVmCapacity(vm, false, false, oldHostId);
             }