Merge branch 'fix/ZSTAC-80898' into '5.5.12'

fix(vm): handle NoState + Expunging safety net [ZSTAC-80898]

See merge request zstackio/zstack!9275

Author: gitlab

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

@@ -1603,6 +1603,11 @@ public void handle(Map data) {
                     changeVmStateInDb(VmInstanceStateEvent.paused, () -> self.setHostUuid(currentHostUuid));
                 } else if (currentState == VmInstanceState.Stopped) {
                     changeVmStateInDb(VmInstanceStateEvent.stopped);
+                } else if (currentState == VmInstanceState.NoState) {
+                    // ZSTAC-80898: When host reports NoState (e.g. QEMU crashed, libvirtd restarted),
+                    // update DB to reflect actual state. Without this, VMs in intermediate states
+                    // (Migrating, Starting, etc.) remain stuck in DB forever.
+                    changeVmStateInDb(VmInstanceStateEvent.noState, () -> self.setHostUuid(currentHostUuid));
                 }
 
                 fireEvent.run();

header/src/main/java/org/zstack/header/vm/VmInstanceState.java

@@ -171,6 +171,13 @@ public enum VmInstanceState {
                 new Transaction(VmInstanceStateEvent.stopped, VmInstanceState.Stopped),
                 new Transaction(VmInstanceStateEvent.expunging, VmInstanceState.Expunging)
         );
+        // ZSTAC-80898: Expunging safety net — if expunge fails, allow recovery
+        // instead of leaving VM permanently stuck.
+        Expunging.transactions(
+                new Transaction(VmInstanceStateEvent.destroyed, VmInstanceState.Destroyed),
+                new Transaction(VmInstanceStateEvent.stopped, VmInstanceState.Stopped),
+                new Transaction(VmInstanceStateEvent.unknown, VmInstanceState.Unknown)
+        );
         Destroyed.transactions(
                 new Transaction(VmInstanceStateEvent.stopped, VmInstanceState.Stopped)
         );