Merge branch 'zsv-ldap-4' into 'feature-zsv-5.0.0-vm-support-vtpm-and-secuceboot'

<refactor>[kvm]: move VM host file cleanup to new extension point

See merge request zstackio/zstack!9470

Author: gitlab

conf/springConfigXml/Kvm.xml

@@ -270,7 +270,7 @@
         <zstack:plugin>
             <zstack:extension interface="org.zstack.kvm.KVMStartVmExtensionPoint" />
             <zstack:extension interface="org.zstack.header.vm.PreVmInstantiateResourceExtensionPoint" />
-            <zstack:extension interface="org.zstack.header.vm.VmInstanceDestroyExtensionPoint" />
+            <zstack:extension interface="org.zstack.header.vm.VmJustBeforeDeleteFromDbExtensionPoint" />
             <zstack:extension interface="org.zstack.header.vm.VmPreMigrationExtensionPoint" />
             <zstack:extension interface="org.zstack.header.vm.AfterReimageVmInstanceExtensionPoint" />
             <zstack:extension interface="org.zstack.header.vm.VmReleaseResourceExtensionPoint" />

plugin/kvm/src/main/java/org/zstack/kvm/efi/KvmSecureBootExtensions.java

@@ -11,6 +11,7 @@
 import org.zstack.core.db.DatabaseFacade;
 import org.zstack.core.db.Q;
 import org.zstack.core.db.SQL;
+import org.zstack.core.db.SQLBatch;
 import org.zstack.core.workflow.SimpleFlowChain;
 import org.zstack.header.core.Completion;
 import org.zstack.header.core.NoErrorCompletion;
@@ -37,6 +38,7 @@
 import org.zstack.header.vm.VmInstanceMigrateExtensionPoint;
 import org.zstack.header.vm.VmInstanceSpec;
 import org.zstack.header.vm.VmInstantiateResourceException;
+import org.zstack.header.vm.VmJustBeforeDeleteFromDbExtensionPoint;
 import org.zstack.header.vm.VmMigrationType;
 import org.zstack.header.vm.VmPreMigrationExtensionPoint;
 import org.zstack.header.vm.VmReleaseResourceExtensionPoint;
@@ -93,7 +95,7 @@
 
 public class KvmSecureBootExtensions implements KVMStartVmExtensionPoint,
         PreVmInstantiateResourceExtensionPoint,
-        VmInstanceDestroyExtensionPoint,
+        VmJustBeforeDeleteFromDbExtensionPoint,
         VmPreMigrationExtensionPoint,
         AfterReimageVmInstanceExtensionPoint,
         VmReleaseResourceExtensionPoint,
@@ -701,29 +703,19 @@ public void run(MessageReply reply) {
     }
 
     @Override
-    public String preDestroyVm(VmInstanceInventory inv) {
-        return null;
-    }
-
-    @Override
-    public void beforeDestroyVm(VmInstanceInventory inv) {
-        // do-nothing
-    }
-
-    @Override
-    public void afterDestroyVm(VmInstanceInventory inv) {
+    public void vmJustBeforeDeleteFromDb(VmInstanceInventory inv) {
         String vmUuid = inv.getUuid();
-        SQL.New(VmHostFileVO.class)
-                .eq(VmHostFileVO_.vmInstanceUuid, vmUuid)
-                .delete();
-        SQL.New(VmHostBackupFileVO.class)
-                .eq(VmHostBackupFileVO_.resourceUuid, vmUuid)
-                .delete();
-    }
-
-    @Override
-    public void failedToDestroyVm(VmInstanceInventory inv, ErrorCode reason) {
-        // do-nothing
+        new SQLBatch() {
+            @Override
+            protected void scripts() {
+                sql(VmHostFileVO.class)
+                        .eq(VmHostFileVO_.vmInstanceUuid, vmUuid)
+                        .delete();
+                sql(VmHostBackupFileVO.class)
+                        .eq(VmHostBackupFileVO_.resourceUuid, vmUuid)
+                        .delete();
+            }
+        }.execute();
     }
 
     @Override

test/src/test/resources/springConfigXml/Kvm.xml

@@ -269,7 +269,7 @@
         <zstack:plugin>
             <zstack:extension interface="org.zstack.kvm.KVMStartVmExtensionPoint" />
             <zstack:extension interface="org.zstack.header.vm.PreVmInstantiateResourceExtensionPoint" />
-            <zstack:extension interface="org.zstack.header.vm.VmInstanceDestroyExtensionPoint" />
+            <zstack:extension interface="org.zstack.header.vm.VmJustBeforeDeleteFromDbExtensionPoint" />
             <zstack:extension interface="org.zstack.header.vm.VmPreMigrationExtensionPoint" />
             <zstack:extension interface="org.zstack.header.vm.AfterReimageVmInstanceExtensionPoint" />
             <zstack:extension interface="org.zstack.header.vm.VmReleaseResourceExtensionPoint" />