SLIDER-812 Making component configurations in appConfig available on the SliderAgent side (Thomas Liu via gourksaha)
Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/96177ed0 Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/96177ed0 Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/96177ed0 Branch: refs/heads/feature/package_simplification_II Commit: 96177ed0c3822a96944d5c2296788937fdbcf51b Parents: 601ac13 Author: Gour Saha <[email protected]> Authored: Tue Mar 17 15:34:59 2015 -0700 Committer: Gour Saha <[email protected]> Committed: Tue Mar 17 15:34:59 2015 -0700 ---------------------------------------------------------------------- .../providers/agent/AgentProviderService.java | 17 ++++++++++++++++- .../appmaster/web/rest/agent/ExecutionCommand.java | 10 ++++++++++ 2 files changed, 26 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/96177ed0/slider-core/src/main/java/org/apache/slider/providers/agent/AgentProviderService.java ---------------------------------------------------------------------- diff --git a/slider-core/src/main/java/org/apache/slider/providers/agent/AgentProviderService.java b/slider-core/src/main/java/org/apache/slider/providers/agent/AgentProviderService.java index bdf168e..8f6f3bf 100644 --- a/slider-core/src/main/java/org/apache/slider/providers/agent/AgentProviderService.java +++ b/slider-core/src/main/java/org/apache/slider/providers/agent/AgentProviderService.java @@ -20,6 +20,7 @@ package org.apache.slider.providers.agent; import com.google.common.annotations.VisibleForTesting; import com.google.common.base.Preconditions; + import org.apache.commons.io.FileUtils; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.FSDataOutputStream; @@ -1659,10 +1660,20 @@ public class AgentProviderService extends AbstractProviderService implements Map<String, Map<String, String>> configurations = buildCommandConfigurations(appConf, containerId, componentName); cmd.setConfigurations(configurations); + Map<String, Map<String, String>> componentConfigurations = buildComponentConfigurations(appConf); + cmd.setComponentConfigurations(componentConfigurations); + cmd.setCommandParams(setCommandParameters(scriptPath, timeout, false)); cmd.setHostname(getClusterInfoPropertyValue(StatusKeys.INFO_AM_HOSTNAME)); response.addExecutionCommand(cmd); + + log.debug("command looks like: " + cmd.toString()); + } + + private Map<String, Map<String, String>> buildComponentConfigurations( + ConfTreeOperations appConf) { + return appConf.getComponents(); } protected static String getPackageListFromApplication(Application application) { @@ -1795,11 +1806,15 @@ public class AgentProviderService extends AbstractProviderService implements cmd.setCommandParams(setCommandParameters(scriptPath, timeout, true)); + Map<String, Map<String, String>> componentConfigurations = buildComponentConfigurations(appConf); + cmd.setComponentConfigurations(componentConfigurations); + Map<String, Map<String, String>> configurations = buildCommandConfigurations(appConf, containerId, componentName); cmd.setConfigurations(configurations); response.addExecutionCommand(cmd); - + + log.debug("command looks like: " + cmd.toString()); // With start command, the corresponding command for graceful stop needs to // be sent. This will be used when a particular container is lost as per RM, // but then the agent is still running and heart-beating to the Slider AM. http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/96177ed0/slider-core/src/main/java/org/apache/slider/server/appmaster/web/rest/agent/ExecutionCommand.java ---------------------------------------------------------------------- diff --git a/slider-core/src/main/java/org/apache/slider/server/appmaster/web/rest/agent/ExecutionCommand.java b/slider-core/src/main/java/org/apache/slider/server/appmaster/web/rest/agent/ExecutionCommand.java index 5fb3b5e..6144227 100644 --- a/slider-core/src/main/java/org/apache/slider/server/appmaster/web/rest/agent/ExecutionCommand.java +++ b/slider-core/src/main/java/org/apache/slider/server/appmaster/web/rest/agent/ExecutionCommand.java @@ -43,6 +43,7 @@ public class ExecutionCommand { private Map<String, String> roleParams = null; private String roleCommand; private Map<String, Map<String, String>> configurations; + private Map<String, Map<String, String>> componentConfigurations; private Map<String, String> commandParams; private String serviceName; private String componentName; @@ -181,6 +182,15 @@ public class ExecutionCommand { this.componentName = componentName; } + public Map<String, Map<String, String>> getComponentConfigurations() { + return componentConfigurations; + } + + public void setComponentConfigurations( + Map<String, Map<String, String>> componentConfigurations) { + this.componentConfigurations = componentConfigurations; + } + @Override public String toString() { StringBuilder builder = new StringBuilder();
