skip instance with delete protection during account cleanup

Author: sudo87

server/src/main/java/com/cloud/user/AccountManagerImpl.java

@@ -1000,6 +1000,12 @@ protected boolean cleanupAccount(AccountVO account, long callerUserId, Account c
             }
 
             for (UserVmVO vm : vms) {
+                if (vm.isDeleteProtection()) {
+                    logger.warn("Instance [id = {}, name = {}] has delete protection enabled and cannot be deleted.",
+                            vm.getUuid(), vm.getName());
+                    continue;
+                }
+
                 if (vm.getState() != VirtualMachine.State.Destroyed && vm.getState() != VirtualMachine.State.Expunging) {
                     try {
                         _vmMgr.destroyVm(vm.getId(), false);

tools/marvin/setup.py

@@ -27,7 +27,7 @@
         raise RuntimeError("python setuptools is required to build Marvin")
 
 
-VERSION = "4.22.1.0-SNAPSHOT"
+VERSION = "4.22.1.0"
 
 setup(name="Marvin",
       version=VERSION,