Add using the keepalived as a configurable value
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/efe1c8c0 Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/efe1c8c0 Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/efe1c8c0 Branch: refs/heads/master Commit: efe1c8c0f8c206a4b3ff716972b161b039413464 Parents: f202516 Author: Gayan Gunarathne <[email protected]> Authored: Sun Jul 26 19:35:24 2015 +0530 Committer: Gayan Gunarathne <[email protected]> Committed: Mon Jul 27 15:02:19 2015 +0530 ---------------------------------------------------------------------- .../org/apache/stratos/lvs/extension/LVS.java | 22 +++++++++++++------- .../stratos/lvs/extension/LVSConfigWriter.java | 4 ++-- 2 files changed, 16 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/efe1c8c0/extensions/load-balancer/lvs-extension/src/main/java/org/apache/stratos/lvs/extension/LVS.java ---------------------------------------------------------------------- diff --git a/extensions/load-balancer/lvs-extension/src/main/java/org/apache/stratos/lvs/extension/LVS.java b/extensions/load-balancer/lvs-extension/src/main/java/org/apache/stratos/lvs/extension/LVS.java index 1d3c7e7..9494510 100644 --- a/extensions/load-balancer/lvs-extension/src/main/java/org/apache/stratos/lvs/extension/LVS.java +++ b/extensions/load-balancer/lvs-extension/src/main/java/org/apache/stratos/lvs/extension/LVS.java @@ -96,8 +96,10 @@ public class LVS implements LoadBalancer { // Start nginx and write pid to processIdFilePath try { - String command = keepAlivedStartCommand; - CommandUtils.executeCommand(command); + if(isKeepAlivedUsed) { + String command = keepAlivedStartCommand; + CommandUtils.executeCommand(command); + } log.info("lvs instance started"); } catch (Exception e) { log.error("Could not start lvs instance"); @@ -113,9 +115,11 @@ public class LVS implements LoadBalancer { try { log.info("Reloading configuration..."); - // Execute hot configuration deployment - String command = "service keepalived restart"; - CommandUtils.executeCommand(command); + if(isKeepAlivedUsed) { + // Execute hot configuration deployment + String command = "service keepalived restart"; + CommandUtils.executeCommand(command); + } if (log.isInfoEnabled()) { log.info("Configuration done"); } @@ -136,9 +140,11 @@ public class LVS implements LoadBalancer { try { log.info("Stopping lvs..."); - // Execute hot configuration deployment - String command = "service keepalived stop"; - CommandUtils.executeCommand(command); + if(isKeepAlivedUsed) { + // Execute hot configuration deployment + String command = "service keepalived stop"; + CommandUtils.executeCommand(command); + } if (log.isInfoEnabled()) { log.info("LVS stopped"); } http://git-wip-us.apache.org/repos/asf/stratos/blob/efe1c8c0/extensions/load-balancer/lvs-extension/src/main/java/org/apache/stratos/lvs/extension/LVSConfigWriter.java ---------------------------------------------------------------------- diff --git a/extensions/load-balancer/lvs-extension/src/main/java/org/apache/stratos/lvs/extension/LVSConfigWriter.java b/extensions/load-balancer/lvs-extension/src/main/java/org/apache/stratos/lvs/extension/LVSConfigWriter.java index bd72a4c..c3beb30 100644 --- a/extensions/load-balancer/lvs-extension/src/main/java/org/apache/stratos/lvs/extension/LVSConfigWriter.java +++ b/extensions/load-balancer/lvs-extension/src/main/java/org/apache/stratos/lvs/extension/LVSConfigWriter.java @@ -208,8 +208,8 @@ public class LVSConfigWriter { text.append(TAB).append(TAB).append("}").append(NEW_LINE); text.append(TAB).append("}").append(NEW_LINE); String commandMember = - "ipvsadm -a -t " + virtualIpForService[1] + ":" + port.getValue() + " -r " + - member.getHostName() + " -m"; + "ipvsadm -a -t " + virtualIpForService[1] + ":" + port.getProxy() + " -r " + + member.getHostName() + ":" + port.getValue() + " -m"; try { CommandUtils.executeCommand(commandMember);
