etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

bug 7612: fixed a bug where if start when through all retries, we throw an exception

This commit is contained in:
Alex Huang 2011-02-07 17:17:25 -08:00
parent cb5b1e60f3
commit 5d796c718b
3 changed files with 1 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
server/src/com/cloud/vm/UserVmManager.java
View File

@ -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);
/**

5
server/src/com/cloud/vm/UserVmManagerImpl.java
View File

@ -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();

1
server/src/com/cloud/vm/VirtualMachineManagerImpl.java
View File

@ -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);
}
}