[4.8.38][ZSTAC-85992] cherry-pick ZSTAC-65793

header/src/main/java/org/zstack/header/host/CompareCpuFunctionOnHostReply.java

@@ -6,4 +6,22 @@
  * Created by LiangHanYu on 2021/8/13 16:32
  */
 public class CompareCpuFunctionOnHostReply extends MessageReply {
+    private boolean match;
+    private String compareError;
+
+    public boolean isMatch() {
+        return match;
+    }
+
+    public void setMatch(boolean match) {
+        this.match = match;
+    }
+
+    public String getCompareError() {
+        return compareError;
+    }
+
+    public void setCompareError(String compareError) {
+        this.compareError = compareError;
+    }
 }

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

@@ -3770,6 +3770,24 @@ public void setCpuXml(String cpuXml) {
     }
 
     public static class VmCompareCpuFunctionResponse extends AgentResponse {
+        private boolean match = true;
+        private String compareError;
+
+        public boolean isMatch() {
+            return match;
+        }
+
+        public void setMatch(boolean match) {
+            this.match = match;
+        }
+
+        public String getCompareError() {
+            return compareError;
+        }
+
+        public void setCompareError(String compareError) {
+            this.compareError = compareError;
+        }
     }
 
     public static class MergeSnapshotRsp extends AgentResponse {

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

@@ -1492,14 +1492,12 @@ public void fail(ErrorCode errorCode) {
     }
 
     private void handle(CompareCpuFunctionOnHostMsg msg) {
-        CompareCpuFunctionOnHostReply reply = new CompareCpuFunctionOnHostReply();
-
         thdf.singleFlightSubmit(new SingleFlightTask(msg)
                 .setSyncSignature(String.format("compare-host-%s-cpu-function-xml-on-host-%s", msg.getSrcHostUuid(), msg.getDstHostUuid()))
-                .run((com) -> compareCpuFunctionOnHost(msg, new ReturnValueCompletion<CompareCpuFunctionOnHostReply>(com) {
+                .run((com) -> compareCpuFunctionOnHost(msg, new ReturnValueCompletion<VmCompareCpuFunctionResponse>(com) {
                     @Override
-                    public void success(CompareCpuFunctionOnHostReply returnValue) {
-                        com.success(returnValue);
+                    public void success(VmCompareCpuFunctionResponse resp) {
+                        com.success(resp);
                     }
 
                     @Override
@@ -1508,14 +1506,20 @@ public void fail(ErrorCode errorCode) {
                     }
                 }))
                 .done(((result) -> {
+                    CompareCpuFunctionOnHostReply reply = new CompareCpuFunctionOnHostReply();
                     if (!result.isSuccess()) {
                         reply.setError(result.getErrorCode());
+                        bus.reply(msg, reply);
+                        return;
                     }
+                    VmCompareCpuFunctionResponse resp = (VmCompareCpuFunctionResponse)result.getResult();
+                    reply.setMatch(resp.isMatch());
+                    reply.setCompareError(resp.getCompareError());
                     bus.reply(msg, reply);
                 })));
     }
 
-    private void compareCpuFunctionOnHost(final CompareCpuFunctionOnHostMsg msg, ReturnValueCompletion<CompareCpuFunctionOnHostReply> completion) {
+    private void compareCpuFunctionOnHost(final CompareCpuFunctionOnHostMsg msg, ReturnValueCompletion<VmCompareCpuFunctionResponse> completion) {
         VmCompareCpuFunctionCmd cmd = new VmCompareCpuFunctionCmd();
         cmd.setCpuXml(msg.getCpuXml());
         restf.asyncJsonPost(compareCpuFunctionPath, cmd, new JsonAsyncRESTCallback<VmCompareCpuFunctionResponse>(completion) {
@@ -1525,7 +1529,7 @@ public void success(VmCompareCpuFunctionResponse ret) {
                     completion.fail(operr(ret.getError()));
                     return;
                 }
-                completion.success(new CompareCpuFunctionOnHostReply());
+                completion.success(ret);
             }
 
             @Override