<fix>[vm]: ZSTAC-84158 handle StopVmGC host mismatch

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

@@ -51,6 +51,7 @@ protected void triggerNow(GCCompletion completion) {
             public void run(FlowTrigger trigger, Map data) {
                 StopVmOnHypervisorMsg msg = new StopVmOnHypervisorMsg();
                 msg.setVmInventory(inventory);
+                msg.setIgnoreNotFoundError(true);
                 bus.makeTargetServiceIdByResourceUuid(msg, HostConstant.SERVICE_ID, hostUuid);
                 bus.send(msg, new CloudBusCallBack(trigger) {
                     @Override
@@ -66,6 +67,16 @@ public void run(MessageReply reply) {
         }).then(new NoRollbackFlow() {
             @Override
             public void run(FlowTrigger trigger, Map data) {
+                String vmHostUuid = Q.New(VmInstanceVO.class).select(VmInstanceVO_.hostUuid)
+                        .eq(VmInstanceVO_.uuid, inventory.getUuid()).findValue();
+                if (!hostUuid.equals(vmHostUuid)) {
+                    logger.debug(String.format("skip changing vm[uuid:%s] state to stopped after StopVmGC, " +
+                            "current host[uuid:%s] is not gc host[uuid:%s]", inventory.getUuid(),
+                            vmHostUuid, hostUuid));
+                    trigger.next();
+                    return;
+                }
+
                 ChangeVmStateMsg cmsg = new ChangeVmStateMsg();
                 cmsg.setVmInstanceUuid(inventory.getUuid());
                 cmsg.setStateEvent(VmInstanceStateEvent.stopped.toString());

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

@@ -7,6 +7,7 @@ public class StopVmOnHypervisorMsg extends NeedReplyMessage implements HostMessa
     private VmInstanceInventory vmInventory;
     private String type;
     private boolean debug;
+    private Boolean ignoreNotFoundError;
 
     public VmInstanceInventory getVmInventory() {
         return vmInventory;
@@ -36,4 +37,12 @@ public boolean isDebug() {
     public void setDebug(boolean debug) {
         this.debug = debug;
     }
+
+    public Boolean isIgnoreNotFoundError() {
+        return ignoreNotFoundError;
+    }
+
+    public void setIgnoreNotFoundError(Boolean ignoreNotFoundError) {
+        this.ignoreNotFoundError = ignoreNotFoundError;
+    }
 }

plugin/kvm/src/main/java/org/zstack/kvm/KVMAgentCommands.java

@@ -3328,6 +3328,8 @@ public static class StopVmCmd extends AgentCommand {
         private String type;
         @GrayVersion(value = "5.0.0")
         private long timeout;
+        @GrayVersion(value = "5.5.22")
+        private Boolean ignoreNotFoundError;
         private List<VmNicInventory> vmNics;
 
         public String getUuid() {
@@ -3354,6 +3356,14 @@ public void setType(String type) {
             this.type = type;
         }
 
+        public Boolean isIgnoreNotFoundError() {
+            return ignoreNotFoundError;
+        }
+
+        public void setIgnoreNotFoundError(Boolean ignoreNotFoundError) {
+            this.ignoreNotFoundError = ignoreNotFoundError;
+        }
+
         public List<VmNicInventory> getVmNics() {
             return vmNics;
         }

plugin/kvm/src/main/java/org/zstack/kvm/KVMHost.java

@@ -3872,6 +3872,7 @@ protected void stopVm(final StopVmOnHypervisorMsg msg, final NoErrorCompletion c
         cmd.setUuid(vminv.getUuid());
         cmd.setType(msg.getType());
         cmd.setTimeout(120);
+        cmd.setIgnoreNotFoundError(msg.isIgnoreNotFoundError());
         cmd.setVmNics(vminv.getVmNics());
 
         try {