From 2f5adb0baf6516b82fa9314522d595d8e05ca0ab Mon Sep 17 00:00:00 2001
From: Abhinandan Prateek <aprateek@cloud.com>
Date: Wed, 19 Oct 2011 13:44:05 +0530
Subject: [PATCH] bug 11701: cleanup of spurious message

---
 api/src/com/cloud/agent/api/ClusterSyncAnswer.java     | 10 +++++++++-
 .../hypervisor/xen/resource/CitrixResourceBase.java    |  4 ++--
 server/src/com/cloud/vm/VirtualMachineManagerImpl.java |  2 +-
 3 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/api/src/com/cloud/agent/api/ClusterSyncAnswer.java b/api/src/com/cloud/agent/api/ClusterSyncAnswer.java
index 858acb46439..ac4434d3152 100644
--- a/api/src/com/cloud/agent/api/ClusterSyncAnswer.java
+++ b/api/src/com/cloud/agent/api/ClusterSyncAnswer.java
@@ -30,7 +30,11 @@ public class ClusterSyncAnswer extends Answer {
     public static final int FULL_SYNC=0;
     public static final int DELTA_SYNC=1;
     
-    public ClusterSyncAnswer() {
+    public ClusterSyncAnswer(long clusterId) {
+        _clusterId = clusterId;
+        result = false;
+        this.details = "Ignore sync as this is not a pool master";
+        _type = -1;
     }
     
     public ClusterSyncAnswer(long clusterId, HashMap<String, Pair<String, State>> newStates, int type){
@@ -51,4 +55,8 @@ public class ClusterSyncAnswer extends Answer {
     public boolean isFull(){
         return _type==0;
     }
+
+    public boolean isDelta(){
+        return _type==1;
+    }
 }
\ No newline at end of file
diff --git a/core/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java b/core/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
index d1ed69295ef..6046678e380 100755
--- a/core/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
+++ b/core/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
@@ -6476,11 +6476,11 @@ public abstract class CitrixResourceBase implements ServerResource, HypervisorRe
           Host.Record hostr = poolr.master.getRecord(conn);
           if (!_host.uuid.equals(hostr.uuid)) {
               s_logger.debug("Not the master node so just return ok: " + _host.ip); 
-              return new Answer(cmd, false, "Not a pool master");
+              return new ClusterSyncAnswer(cmd.getClusterId());
           }
       } catch (Exception e) {
           s_logger.warn("Check for master failed, failing the Cluster sync command");
-          return new Answer(cmd, false, "Not a pool master");
+          return new ClusterSyncAnswer(cmd.getClusterId());
       } 
       HashMap<String, Pair<String, State>> newStates;
       int sync_type;
diff --git a/server/src/com/cloud/vm/VirtualMachineManagerImpl.java b/server/src/com/cloud/vm/VirtualMachineManagerImpl.java
index 6c0ab2ed013..f9a143e023c 100755
--- a/server/src/com/cloud/vm/VirtualMachineManagerImpl.java
+++ b/server/src/com/cloud/vm/VirtualMachineManagerImpl.java
@@ -1862,7 +1862,7 @@ public class VirtualMachineManagerImpl implements VirtualMachineManager, Listene
                 ClusterSyncAnswer hs = (ClusterSyncAnswer) answer;
                 if (hs.isFull()) {
                     fullSync(hs.getClusterId(), hs.getNewStates());
-                } else {
+                } else if (hs.isDelta()) {
                     deltaSync(hs.getNewStates());
                 }
             } else if (!answer.getResult()) {