<feature>[kvm]: clean VmHostFileVO after VM destroy

Resolves: ZSV-11439
Related: ZSV-11310

Change-Id: I68696b7776656f78677679686370707a70616665

Author: Zhang Wenhao

compute/src/main/java/org/zstack/compute/vm/VmCascadeExtension.java

@@ -472,9 +472,9 @@ public void done(ErrorCodeList errorCodeList) {
                                 .flatMap(List::stream).map(VmCdRomInventory::getUuid)
                                 .collect(Collectors.toList());
                         dbf.removeByPrimaryKeys(cdRomUuids, VmCdRomVO.class);
-                        dbf.removeByPrimaryKeys(vminvs.stream().map(p -> p.getInventory().getUuid())
-                                        .collect(Collectors.toList()),
-                                VmInstanceVO.class);
+
+                        List<String> vmUuidList = transform(vminvs, p -> p.getInventory().getUuid());
+                        dbf.removeByPrimaryKeys(vmUuidList, VmInstanceVO.class);
                     }
 
                     completion.success();

conf/springConfigXml/Kvm.xml

@@ -270,6 +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:plugin>
     </bean>
 

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

@@ -26,6 +26,8 @@
 import org.zstack.header.message.MessageReply;
 import org.zstack.header.vm.DiskAO;
 import org.zstack.header.vm.PreVmInstantiateResourceExtensionPoint;
+import org.zstack.header.vm.VmInstanceDestroyExtensionPoint;
+import org.zstack.header.vm.VmInstanceInventory;
 import org.zstack.header.vm.VmInstanceSpec;
 import org.zstack.header.vm.VmInstantiateResourceException;
 import org.zstack.header.vm.additions.VmHostBackupFileVO;
@@ -76,7 +78,8 @@
 import static org.zstack.utils.CollectionUtils.transform;
 
 public class KvmSecureBootExtensions implements KVMStartVmExtensionPoint,
-        PreVmInstantiateResourceExtensionPoint {
+        PreVmInstantiateResourceExtensionPoint,
+        VmInstanceDestroyExtensionPoint {
     private static final CLogger logger = Utils.getLogger(KvmSecureBootExtensions.class);
 
     @Autowired
@@ -746,4 +749,30 @@ 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) {
+        String vmUuid = inv.getUuid();
+        SQL.New(VmHostFileVO.class)
+                .eq(VmHostFileVO_.vmInstanceUuid, vmUuid)
+                .delete();
+        SQL.New(VmHostBackupFileVO.class)
+                .eq(VmHostBackupFileVO_.vmInstanceUuid, vmUuid)
+                .delete();
+    }
+
+    @Override
+    public void failedToDestroyVm(VmInstanceInventory inv, ErrorCode reason) {
+        // do-nothing
+    }
 }

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

@@ -269,6 +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:plugin>
     </bean>