Repository: incubator-stratos Updated Branches: refs/heads/master 7ec92b8e9 -> 9ac4fe8be
get persistance mapping from launch-params file instead of launch.params source file Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/9ac4fe8b Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/9ac4fe8b Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/9ac4fe8b Branch: refs/heads/master Commit: 9ac4fe8bea469afe062d9f48bd3a6069df8fe15d Parents: 7ec92b8 Author: Udara Liyanage <[email protected]> Authored: Wed Feb 26 06:59:40 2014 -0500 Committer: Udara Liyanage <[email protected]> Committed: Wed Feb 26 06:59:40 2014 -0500 ---------------------------------------------------------------------- .../apache/stratos/cartridge/agent/CartridgeAgent.java | 4 +++- .../agent/config/CartridgeAgentConfiguration.java | 13 +++++++++++-- .../stratos/cartridge/agent/util/ExtensionUtils.java | 8 ++++---- .../distribution/src/main/extensions/mount_volumes.sh | 5 ++--- 4 files changed, 20 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/9ac4fe8b/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/CartridgeAgent.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/CartridgeAgent.java b/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/CartridgeAgent.java index 5c009e9..c735355 100644 --- a/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/CartridgeAgent.java +++ b/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/CartridgeAgent.java @@ -131,7 +131,9 @@ public class CartridgeAgent implements Runnable { CartridgeAgentEventPublisher.publishInstanceActivatedEvent(); } - ExtensionUtils.executeVolumeMountExtension(); + String persistanceMappingsPayload = CartridgeAgentConfiguration.getInstance().getPersistanceMappings(); + if(persistanceMappingsPayload != null) + ExtensionUtils.executeVolumeMountExtension(persistanceMappingsPayload); // TODO: Start this thread only if this node is configured as a commit true node // Start periodical file checker task // ScheduledExecutorService scheduler = Executors.newScheduledThreadPool(1); http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/9ac4fe8b/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/config/CartridgeAgentConfiguration.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/config/CartridgeAgentConfiguration.java b/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/config/CartridgeAgentConfiguration.java index db3d3cd..305106c 100644 --- a/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/config/CartridgeAgentConfiguration.java +++ b/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/config/CartridgeAgentConfiguration.java @@ -29,6 +29,7 @@ public class CartridgeAgentConfiguration { private final List<Integer> ports; private final List<String> logFilePaths; private boolean isMultitenant; + private String persistanceMappings; private CartridgeAgentConfiguration() { serviceName = readParameterValue(CartridgeAgentConstants.SERVICE_NAME); @@ -83,6 +84,10 @@ public class CartridgeAgentConfiguration { private String readParameterValue(String parameterName) { try { + + if(System.getProperty(parameterName) != null){ + return System.getProperty(parameterName); + } // read launch params File file = new File(System.getProperty(CartridgeAgentConstants.PARAM_FILE_PATH)); if(!file.exists()) { @@ -167,6 +172,10 @@ public class CartridgeAgentConfiguration { public boolean isMultitenant() { return isMultitenant; - } - + } + + public String getPersistanceMappings() { + String persistence_mapping_payload = readParameterValue("PERSISTENCE_MAPPING"); + return persistence_mapping_payload; + } } http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/9ac4fe8b/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/util/ExtensionUtils.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/util/ExtensionUtils.java b/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/util/ExtensionUtils.java index d45ff2b..2a11103 100644 --- a/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/util/ExtensionUtils.java +++ b/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/util/ExtensionUtils.java @@ -22,6 +22,7 @@ package org.apache.stratos.cartridge.agent.util; import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.apache.stratos.cartridge.agent.config.CartridgeAgentConfiguration; import org.apache.stratos.common.util.CommandUtils; import java.io.File; @@ -116,17 +117,16 @@ public class ExtensionUtils { This will execute the volume mounting script which format and mount the persistance volumes. */ - public static void executeVolumeMountExtension() { + public static void executeVolumeMountExtension(String persistanceMappingsPayload) { try { if(log.isDebugEnabled()) { log.debug("Executing volume mounting extension"); } String command = prepareCommand(CartridgeAgentConstants.MOUNT_VOLUMES_SH); - String payloadPath = System.getProperty(CartridgeAgentConstants.PARAM_FILE_PATH); - + //String payloadPath = System.getProperty(CartridgeAgentConstants.PARAM_FILE_PATH); // add payload file path as argument so inside the script we can source // it to get the env variables set by the startup script - CommandUtils.executeCommand(command + " " + payloadPath); + CommandUtils.executeCommand(command + " " + persistanceMappingsPayload); } catch (Exception e) { log.error("Could not execute volume mounting extension", e); http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/9ac4fe8b/products/cartridge-agent/modules/distribution/src/main/extensions/mount_volumes.sh ---------------------------------------------------------------------- diff --git a/products/cartridge-agent/modules/distribution/src/main/extensions/mount_volumes.sh b/products/cartridge-agent/modules/distribution/src/main/extensions/mount_volumes.sh index bf04d01..48f3ceb 100755 --- a/products/cartridge-agent/modules/distribution/src/main/extensions/mount_volumes.sh +++ b/products/cartridge-agent/modules/distribution/src/main/extensions/mount_volumes.sh @@ -29,7 +29,8 @@ echo -e "Starting mounting volumes" 2>&1 | tee -a $log # $1 is passed from Cartridge Agent code. echo -e "launh param file location $1" | tee -a $log -source /opt/apache-stratos-cartridge-agent/launch.params +#source /opt/apache-stratos-cartridge-agent/launch.params +PERSISTENCE_MAPPING=$1 echo -e "Persistance mappings : $PERSISTENCE_MAPPING" 2>&1 | tee -a $log mount_volume(){ @@ -71,8 +72,6 @@ mount_volume(){ } - -#PERSISTENCE_MAPPING="ayyo|alli|eka|deka" IFS='|' read -ra ADDR <<< "${PERSISTENCE_MAPPING}" echo "${ADDR[@]}" | tee -a $log
