apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-10-26 08:42:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

call setIptable before launch heartbeat

Browse Source
This commit is contained in:
anthony 2011-02-16 17:16:19 -08:00
parent 8d1f650a9e
commit b85ecec646
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
core/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
View File

@ -3751,7 +3751,7 @@ public abstract class CitrixResourceBase implements ServerResource {
String tag = it.next(); String tag = it.next();
if (tag.startsWith("vmops-version-")) { if (tag.startsWith("vmops-version-")) {
if (tag.contains(version)) { if (tag.contains(version)) {
s_logger.info(logX(host, "Host " + hr.address + " is already setup.")); s_logger.info(logX(host, "Host " + hr.address + " is already setup."));
return; return;
} else { } else {
it.remove(); it.remove();
@ -3824,11 +3824,6 @@ public abstract class CitrixResourceBase implements ServerResource {
} finally { } finally {
sshConnection.close(); sshConnection.close();
} }
if (!setIptables(conn)) {
s_logger.warn("set xenserver Iptable failed");
}
hr.tags.add("vmops-version-" + version); hr.tags.add("vmops-version-" + version);
host.setTags(conn, hr.tags); host.setTags(conn, hr.tags);
} catch (XenAPIException e) { } catch (XenAPIException e) {

6
core/src/com/cloud/hypervisor/xen/resource/XenServer56Resource.java
View File

@ -583,6 +583,11 @@ public class XenServer56Resource extends CitrixResourceBase {
} catch (Exception e) { } catch (Exception e) {
throw new CloudRuntimeException("Unable to remove heartbeat tag", e); throw new CloudRuntimeException("Unable to remove heartbeat tag", e);
} }
if (!setIptables(conn)) {
s_logger.warn("set xenserver Iptable failed");
return null;
}
String result = callHostPluginPremium(conn, "heartbeat", "host", _host.uuid, "interval", Integer String result = callHostPluginPremium(conn, "heartbeat", "host", _host.uuid, "interval", Integer
.toString(_heartbeatInterval)); .toString(_heartbeatInterval));
@ -590,7 +595,6 @@ public class XenServer56Resource extends CitrixResourceBase {
s_logger.warn("Unable to launch the heartbeat process on " + _host.ip); s_logger.warn("Unable to launch the heartbeat process on " + _host.ip);
return null; return null;
} }
return cmds; return cmds;
} }