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

bug 8452: forcing vm stop whilst disabling account 

status 8452: resolved fixed
This commit is contained in:
abhishek 2011-02-17 13:56:27 -08:00
parent c62d983c3f
commit 3d7c61bf8b
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
server/src/com/cloud/user/AccountManagerImpl.java
View File

@ -64,6 +64,7 @@ import com.cloud.event.dao.UsageEventDao;
import com.cloud.exception.AgentUnavailableException;
import com.cloud.exception.ConcurrentOperationException;
import com.cloud.exception.InvalidParameterValueException;
import com.cloud.exception.OperationTimedoutException;
import com.cloud.exception.PermissionDeniedException;
import com.cloud.exception.ResourceUnavailableException;
import com.cloud.network.NetworkManager;
@ -938,9 +939,14 @@ public class AccountManagerImpl implements AccountManager, AccountService, Manag
boolean success = true;
for (VMInstanceVO vm : vms) {
try {
success = (success && _itMgr.stop(vm, getSystemUser(), getSystemAccount()));
try {
success = (success && _itMgr.advanceStop(vm, true, getSystemUser(), getSystemAccount()));
} catch (OperationTimedoutException ote) {
s_logger.warn("Operation for stopping vm timed out, unable to stop vm " + vm.getName(),ote);
success = false;
}
} catch (AgentUnavailableException aue) {
s_logger.warn("Agent running on host " + vm.getHostId() + " is unavailable, unable to stop vm " + vm.getName());
s_logger.warn("Agent running on host " + vm.getHostId() + " is unavailable, unable to stop vm " + vm.getName(),aue);
success = false;
}
}