From 4382a33ab6e8bee4ed769cfeaaf20131851c682e Mon Sep 17 00:00:00 2001 From: Wei Zhou Date: Fri, 27 Jan 2023 11:16:33 +0100 Subject: [PATCH] server: allow expunging VMs in Expunging state (#219) --- server/src/main/java/com/cloud/vm/UserVmManagerImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/src/main/java/com/cloud/vm/UserVmManagerImpl.java b/server/src/main/java/com/cloud/vm/UserVmManagerImpl.java index f4bd018a21e..3f590a1d46a 100644 --- a/server/src/main/java/com/cloud/vm/UserVmManagerImpl.java +++ b/server/src/main/java/com/cloud/vm/UserVmManagerImpl.java @@ -3276,7 +3276,7 @@ public class UserVmManagerImpl extends ManagerBase implements UserVmManager, Vir throw new InvalidParameterValueException("unable to find a virtual machine with id " + vmId); } - if ((vm.getState() == State.Destroyed && !expunge) || vm.getState() == State.Expunging) { + if (Arrays.asList(State.Destroyed, State.Expunging).contains(vm.getState()) && !expunge) { s_logger.debug("Vm id=" + vmId + " is already destroyed"); return vm; }