CLOUDSTACK-6595: allow to expunge the vm when its in Error state, in addition to Expunging/Destroyed states

Alena Prokharchyk · Alena Prokharchyk · commit 4f0640dac403 · 2014-07-14T14:40:11.000-07:00
diff --git a/server/src/com/cloud/vm/UserVmManagerImpl.java b/server/src/com/cloud/vm/UserVmManagerImpl.java
@@ -3683,7 +3683,7 @@ public UserVm expungeVm(long vmId) throws ResourceUnavailableException, Concurre
             return vm;
         }
 
-        if ((vm.getState() != State.Destroyed) && (vm.getState() != State.Expunging)) {
+        if (!(vm.getState() == State.Destroyed || vm.getState() == State.Expunging || vm.getState() == State.Error)) {
             CloudRuntimeException ex = new CloudRuntimeException("Please destroy vm with specified vmId before expunge");
             ex.addProxyObject(String.valueOf(vmId), "vmId");
             throw ex;

Original file line number	Diff line number	Diff line change
`@@ -3683,7 +3683,7 @@ public UserVm expungeVm(long vmId) throws ResourceUnavailableException, Concurre`
`3683`	`3683`	`return vm;`
`3684`	`3684`	`}`
`3685`	`3685`
`3686`		`- if ((vm.getState() != State.Destroyed) && (vm.getState() != State.Expunging)) {`
	`3686`	`+ if (!(vm.getState() == State.Destroyed \|\| vm.getState() == State.Expunging \|\| vm.getState() == State.Error)) {`
`3687`	`3687`	`CloudRuntimeException ex = new CloudRuntimeException("Please destroy vm with specified vmId before expunge");`
`3688`	`3688`	`ex.addProxyObject(String.valueOf(vmId), "vmId");`
`3689`	`3689`	`throw ex;`