fix devcloud reboot issue: should not start heartbeat for devcloud

sudison · Anthony Xu · commit 578d2f62f1e6 · 2014-03-28T16:24:36.000-07:00
Conflicts:

	plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
diff --git a/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java b/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
@@ -4700,6 +4700,16 @@ private void cleanupTemplateSR(Connection conn) {
         }
     }
 
+    protected boolean launchHeartBeat(Connection conn) {
+        String result = callHostPluginPremium(conn, "heartbeat", "host", _host.uuid, "interval", Integer
+                .toString(_heartbeatInterval));
+        if (result == null || !result.contains("> DONE <")) {
+            s_logger.warn("Unable to launch the heartbeat process on " + _host.ip);
+            return false;
+        }
+        return true;
+    }
+
     protected SetupAnswer execute(SetupCommand cmd) {
         Connection conn = getConnection();
         setupServer(conn);
@@ -4720,9 +4730,9 @@ protected SetupAnswer execute(SetupCommand cmd) {
 
             }
 
-            String result = callHostPluginPremium(conn, "heartbeat", "host", _host.uuid, "interval", Integer.toString(_heartbeatInterval));
-            if (result == null || !result.contains("> DONE <")) {
-                s_logger.warn("Unable to launch the heartbeat process on " + _host.ip);
+
+            boolean r = launchHeartBeat(conn);
+            if (!r) {
                 return null;
             }
             cleanupTemplateSR(conn);
@@ -4737,8 +4747,10 @@ protected SetupAnswer execute(SetupCommand cmd) {
             } catch (Types.MapDuplicateKey e) {
                 s_logger.debug("multipath is already set");
             }
-            if (cmd.needSetup()) {
-                result = callHostPlugin(conn, "vmops", "setup_iscsi", "uuid", _host.uuid);
+
+            if (cmd.needSetup() ) {
+                String result = callHostPlugin(conn, "vmops", "setup_iscsi", "uuid", _host.uuid);
+
                 if (!result.contains("> DONE <")) {
                     s_logger.warn("Unable to setup iscsi: " + result);
                     return new SetupAnswer(cmd, result);
diff --git a/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/XcpOssResource.java b/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/XcpOssResource.java
@@ -79,6 +79,11 @@ protected void fillHostInfo(Connection conn, StartupRoutingCommand cmd) {
         cmd.setCaps(cmd.getCapabilities() + " , hvm");
     }
 
+    @Override
+    protected boolean launchHeartBeat(Connection conn) {
+        return true;
+    }
+
     protected StartupStorageCommand initializeLocalSR(Connection conn) {
         SR extsr = getLocalEXTSR(conn);
         if (extsr != null) {
