You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ed...@apache.org on 2014/03/28 01:39:35 UTC
[26/28] git commit: updated refs/heads/4.4 to 392dc81
fix devcloud reboot issue: should not start heartbeat for devcloud
Conflicts:
plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/f1ff060b
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/f1ff060b
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/f1ff060b
Branch: refs/heads/4.4
Commit: f1ff060bb94c65431ae03bdc61ae36338af007ec
Parents: 11d11d8
Author: Edison Su <su...@gmail.com>
Authored: Thu Mar 27 16:14:33 2014 -0700
Committer: Edison Su <su...@gmail.com>
Committed: Thu Mar 27 17:38:41 2014 -0700
----------------------------------------------------------------------
.../xen/resource/CitrixResourceBase.java | 22 +++++++++++++++-----
.../hypervisor/xen/resource/XcpOssResource.java | 5 +++++
2 files changed, 22 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f1ff060b/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
index 372d337..bc25a94 100644
--- 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 @@ public abstract class CitrixResourceBase implements ServerResource, HypervisorRe
}
}
+ 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 @@ public abstract class CitrixResourceBase implements ServerResource, HypervisorRe
}
- 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 @@ public abstract class CitrixResourceBase implements ServerResource, HypervisorRe
} 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);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f1ff060b/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/XcpOssResource.java
----------------------------------------------------------------------
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
index 14b4bf3..ba706f2 100644
--- a/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/XcpOssResource.java
+++ b/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/XcpOssResource.java
@@ -74,6 +74,11 @@ public class XcpOssResource extends CitrixResourceBase {
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) {