From 8d052d105a5a03cb417a666cb367250640cdd91a Mon Sep 17 00:00:00 2001
From: anthony <anthony@cloud.com>
Date: Thu, 14 Apr 2011 19:07:58 -0700
Subject: [PATCH] don't need to remove heartbeat tag when reconnect, it breaks
 HA , because when host reconnects, it tries to create heartbeat, but at this
 time, master may be able to access storage pool

---
 .../xen/resource/XenServer56Resource.java     | 20 +------------------
 1 file changed, 1 insertion(+), 19 deletions(-)

diff --git a/core/src/com/cloud/hypervisor/xen/resource/XenServer56Resource.java b/core/src/com/cloud/hypervisor/xen/resource/XenServer56Resource.java
index 9acaa5f4ed7..3280252647f 100644
--- a/core/src/com/cloud/hypervisor/xen/resource/XenServer56Resource.java
+++ b/core/src/com/cloud/hypervisor/xen/resource/XenServer56Resource.java
@@ -509,25 +509,7 @@ public class XenServer56Resource extends CitrixResourceBase {
     public StartupCommand[] initialize() {
         pingxenserver();
         StartupCommand[] cmds = super.initialize();
-        Connection conn = getConnection();
-        try {
-            Host host = Host.getByUuid(conn, _host.uuid);
-            Set<String> tags = host.getTags(conn);
-            Iterator<String> it = tags.iterator();
-            while (it.hasNext()) {
-                String heartbeatTag = it.next();
-                if (heartbeatTag.contains("cloud-heartbeat-")) {
-                    s_logger.debug("Removing heatbeat tag: " + heartbeatTag);
-                    it.remove();
-                }
-            }
-            host.setTags(conn, tags);
-        } catch (XenAPIException e) {
-            throw new CloudRuntimeException("Unable to remove heartbeat tag", e);
-        } catch (Exception e) {
-            throw new CloudRuntimeException("Unable to remove heartbeat tag", e);
-        }
-        
+        Connection conn = getConnection();       
         if (!setIptables(conn)) {
             s_logger.warn("set xenserver Iptable failed");
             return null;