From 82196754c2f5411be137f7f08e833b81427f4830 Mon Sep 17 00:00:00 2001 From: abhishek Date: Mon, 6 Dec 2010 11:03:19 -0800 Subject: [PATCH] adding the check for error state whilst stopping a vm; if stop is called on a vm in error state, just return --- server/src/com/cloud/vm/MauriceMoss.java | 2 +- server/src/com/cloud/vm/UserVmManagerImpl.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/server/src/com/cloud/vm/MauriceMoss.java b/server/src/com/cloud/vm/MauriceMoss.java index d08a5145f3a..6faed9b5f6c 100644 --- a/server/src/com/cloud/vm/MauriceMoss.java +++ b/server/src/com/cloud/vm/MauriceMoss.java @@ -433,7 +433,7 @@ public class MauriceMoss implements VmManager, ClusterManagerListener { return true; } - if (state == State.Creating || state == State.Destroyed || state == State.Expunging) { + if (state == State.Creating || state == State.Destroyed || state == State.Expunging || state == State.Error) { s_logger.warn("Stopped called on " + vm.toString() + " but the state is " + state.toString()); return true; } diff --git a/server/src/com/cloud/vm/UserVmManagerImpl.java b/server/src/com/cloud/vm/UserVmManagerImpl.java index f178fbb1c7e..8613ad4ee17 100755 --- a/server/src/com/cloud/vm/UserVmManagerImpl.java +++ b/server/src/com/cloud/vm/UserVmManagerImpl.java @@ -2112,7 +2112,7 @@ public class UserVmManagerImpl implements UserVmManager, UserVmService, VirtualM return true; } - if (state == State.Creating || state == State.Destroyed || state == State.Expunging) { + if (state == State.Creating || state == State.Destroyed || state == State.Expunging || state == State.Error) { s_logger.warn("Stopped called on " + vm.toString() + " but the state is " + state.toString()); return true; }