From 3d7c61bf8bf97c60f2e8e013e00881d0ce6754f8 Mon Sep 17 00:00:00 2001 From: abhishek Date: Thu, 17 Feb 2011 13:56:27 -0800 Subject: [PATCH] bug 8452: forcing vm stop whilst disabling account status 8452: resolved fixed --- server/src/com/cloud/user/AccountManagerImpl.java | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/server/src/com/cloud/user/AccountManagerImpl.java b/server/src/com/cloud/user/AccountManagerImpl.java index 0564d102ba7..b0cc89cb8fd 100755 --- a/server/src/com/cloud/user/AccountManagerImpl.java +++ b/server/src/com/cloud/user/AccountManagerImpl.java @@ -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; } }