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.

devdeep · devdeep · commit 904a2a87f799 · 2013-05-21T13:33:07.000+05:30
Signed-off-by: Devdeep Singh &lt;devdeep@gmail.com&gt;
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
@@ -315,6 +315,7 @@ public Map<? extends ServerResource, Map<String, String>> find(long dcId, Long p
                 details.put("wait", Integer.toString(_wait));
                 params.put("migratewait", _configDao.getValue(Config.MigrateWait.toString()));
                 params.put(Config.XenMaxNics.toString().toLowerCase(), _configDao.getValue(Config.XenMaxNics.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 {
diff --git a/server/src/com/cloud/resource/DiscovererBase.java b/server/src/com/cloud/resource/DiscovererBase.java
@@ -129,6 +129,7 @@ protected HashMap<String, Object> buildConfigParams(HostVO host){
         params.put("max.template.iso.size", _configDao.getValue(Config.MaxTemplateAndIsoSize.toString()));
         params.put("migratewait", _configDao.getValue(Config.MigrateWait.toString()));
         params.put(Config.XenMaxNics.toString().toLowerCase(), _configDao.getValue(Config.XenMaxNics.toString()));
+        params.put(Config.XenHeartBeatInterval.toString().toLowerCase(), _configDao.getValue(Config.XenHeartBeatInterval.toString()));
         return params;
 
     }

Original file line number	Diff line number	Diff line change
`@@ -129,6 +129,7 @@ protected HashMap<String, Object> buildConfigParams(HostVO host){`
`129`	`129`	`params.put("max.template.iso.size", _configDao.getValue(Config.MaxTemplateAndIsoSize.toString()));`
`130`	`130`	`params.put("migratewait", _configDao.getValue(Config.MigrateWait.toString()));`
`131`	`131`	`params.put(Config.XenMaxNics.toString().toLowerCase(), _configDao.getValue(Config.XenMaxNics.toString()));`
	`132`	`+ params.put(Config.XenHeartBeatInterval.toString().toLowerCase(), _configDao.getValue(Config.XenHeartBeatInterval.toString()));`
`132`	`133`	`return params;`
`133`	`134`
`134`	`135`	`}`