cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From h...@apache.org
Subject [1/3] git commit: updated refs/heads/4.1.1-sbp to 45b691a
Date Mon, 01 Jul 2013 11:49:03 GMT
Updated Branches:
  refs/heads/4.1.1-sbp [created] 45b691a6c


CLOUDSTACK-2601 : xen.heartbeat.interval doesn't change the parameter passed to xenheartbeat.sh.
Made changes to read the parameter from config and to pass it to the resource.

Signed-off-by: Devdeep Singh <devdeep@gmail.com>

Conflicts:
	plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/discoverer/XcpServerDiscoverer.java
	server/src/com/cloud/resource/DiscovererBase.java


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/8f709813
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/8f709813
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/8f709813

Branch: refs/heads/4.1.1-sbp
Commit: 8f709813615e77d082653cae58e0085c12a28895
Parents: c1bdaf4
Author: Devdeep Singh <devdeep@gmail.com>
Authored: Tue May 21 13:32:09 2013 +0530
Committer: Hugo Trippaers <htrippaers@schubergphilis.com>
Committed: Mon Jul 1 10:45:45 2013 +0200

----------------------------------------------------------------------
 .../com/cloud/hypervisor/xen/discoverer/XcpServerDiscoverer.java    | 1 +
 server/src/com/cloud/resource/DiscovererBase.java                   | 1 +
 2 files changed, 2 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8f709813/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/discoverer/XcpServerDiscoverer.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/discoverer/XcpServerDiscoverer.java
b/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/discoverer/XcpServerDiscoverer.java
index 9417d57..e9d118b 100755
--- a/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/discoverer/XcpServerDiscoverer.java
+++ b/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/discoverer/XcpServerDiscoverer.java
@@ -314,6 +314,7 @@ public class XcpServerDiscoverer extends DiscovererBase implements Discoverer,
L
                 params.put("wait", Integer.toString(_wait));
                 details.put("wait", Integer.toString(_wait));
                 params.put("migratewait", _configDao.getValue(Config.MigrateWait.toString()));
+                params.put(Config.XenHeartBeatInterval.toString().toLowerCase(), _configDao.getValue(Config.XenHeartBeatInterval.toString()));
                 params.put(Config.InstanceName.toString().toLowerCase(), _instance);
                 details.put(Config.InstanceName.toString().toLowerCase(), _instance);
                 try {

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8f709813/server/src/com/cloud/resource/DiscovererBase.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/resource/DiscovererBase.java b/server/src/com/cloud/resource/DiscovererBase.java
index 940608c..8a586f4 100644
--- a/server/src/com/cloud/resource/DiscovererBase.java
+++ b/server/src/com/cloud/resource/DiscovererBase.java
@@ -128,6 +128,7 @@ public abstract class DiscovererBase extends AdapterBase implements Discoverer
{
         params.put("secondary.storage.vm", "false");
         params.put("max.template.iso.size", _configDao.getValue(Config.MaxTemplateAndIsoSize.toString()));
         params.put("migratewait", _configDao.getValue(Config.MigrateWait.toString()));
+        params.put(Config.XenHeartBeatInterval.toString().toLowerCase(), _configDao.getValue(Config.XenHeartBeatInterval.toString()));
         return params;
 
     }


Mime
View raw message