From 5d796c718b7bbfa7c933faba1fc13debad45fe55 Mon Sep 17 00:00:00 2001
From: Alex Huang <alex@cloud.com>
Date: Mon, 7 Feb 2011 17:17:25 -0800
Subject: [PATCH] bug 7612: fixed a bug where if start when through all
 retries, we throw an exception

---
 server/src/com/cloud/vm/UserVmManager.java             | 8 --------
 server/src/com/cloud/vm/UserVmManagerImpl.java         | 5 -----
 server/src/com/cloud/vm/VirtualMachineManagerImpl.java | 1 +
 3 files changed, 1 insertion(+), 13 deletions(-)

diff --git a/server/src/com/cloud/vm/UserVmManager.java b/server/src/com/cloud/vm/UserVmManager.java
index 805533974e7..e9a3e4d4e04 100644
--- a/server/src/com/cloud/vm/UserVmManager.java
+++ b/server/src/com/cloud/vm/UserVmManager.java
@@ -20,14 +20,9 @@ import java.util.HashMap;
 import java.util.List;
 
 import com.cloud.agent.api.VmStatsEntry;
-import com.cloud.exception.ConcurrentOperationException;
-import com.cloud.exception.InsufficientCapacityException;
-import com.cloud.exception.ResourceUnavailableException;
-import com.cloud.exception.StorageUnavailableException;
 import com.cloud.server.Criteria;
 import com.cloud.user.Account;
 import com.cloud.uservm.UserVm;
-import com.cloud.utils.exception.ExecutionException;
 
 /**
  *
@@ -83,9 +78,6 @@ public interface UserVmManager extends VirtualMachineGuru<UserVmVO>{
     
     void removeInstanceFromInstanceGroup(long vmId);
 
-	UserVm startUserVm(long vmId) throws StorageUnavailableException,
-			ConcurrentOperationException, ExecutionException, ResourceUnavailableException, InsufficientCapacityException;
-	
 	boolean expunge(UserVmVO vm, long callerUserId, Account caller);
 	
     /**
diff --git a/server/src/com/cloud/vm/UserVmManagerImpl.java b/server/src/com/cloud/vm/UserVmManagerImpl.java
index 3eedfa8e2d5..d1aab1c20ba 100755
--- a/server/src/com/cloud/vm/UserVmManagerImpl.java
+++ b/server/src/com/cloud/vm/UserVmManagerImpl.java
@@ -1104,11 +1104,6 @@ public class UserVmManagerImpl implements UserVmManager, UserVmService, Manager
         return VirtualMachineName.getVmId(vmName);
     }
 
-    @Override
-    public UserVm startUserVm(long vmId) throws ConcurrentOperationException, ExecutionException, ResourceUnavailableException, InsufficientCapacityException {
-        return startVirtualMachine(vmId); 
-    }
-
     @Override
     public boolean expunge(UserVmVO vm, long callerUserId, Account caller) {
         UserContext ctx = UserContext.current();
diff --git a/server/src/com/cloud/vm/VirtualMachineManagerImpl.java b/server/src/com/cloud/vm/VirtualMachineManagerImpl.java
index 3f616e4a0f5..5f9b525f106 100644
--- a/server/src/com/cloud/vm/VirtualMachineManagerImpl.java
+++ b/server/src/com/cloud/vm/VirtualMachineManagerImpl.java
@@ -704,6 +704,7 @@ public class VirtualMachineManagerImpl implements VirtualMachineManager, StateLi
         } finally {
             if (startedVm == null) {
                 changeState(vm, Event.OperationFailed, null, work, Step.Done);
+                throw new CloudRuntimeException("Unable to start " + vm);
             }
         }