Repository: incubator-slider Updated Branches: refs/heads/feature/packaging_improvements 82dd48373 -> f3cab4445
Package simplification poc-III Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/f3cab444 Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/f3cab444 Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/f3cab444 Branch: refs/heads/feature/packaging_improvements Commit: f3cab444587dfaede819c4635ddccc9778410b7d Parents: 82dd483 Author: Sumit Mohanty <smoha...@hortonworks.com> Authored: Wed Feb 25 18:29:54 2015 -0800 Committer: Sumit Mohanty <smoha...@hortonworks.com> Committed: Wed Feb 25 18:29:54 2015 -0800 ---------------------------------------------------------------------- .../apache/slider/providers/agent/AgentProviderService.java | 2 -- .../providers/agent/application/metadata/json/MetaInfo.java | 1 + .../slider/providers/agent/TestAgentProviderService.java | 6 +++--- 3 files changed, 4 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/f3cab444/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 d4bb0f4..b98795a 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 @@ -1644,7 +1644,6 @@ public class AgentProviderService extends AbstractProviderService implements cmd.setHostname(getClusterInfoPropertyValue(StatusKeys.INFO_AM_HOSTNAME)); - cmd.addContainerDetails(componentName, getMetaInfo()); response.addExecutionCommand(cmd); } @@ -1827,7 +1826,6 @@ public class AgentProviderService extends AbstractProviderService implements Map<String, Map<String, String>> configurations = buildCommandConfigurations(appConf, containerId, componentName); cmd.setConfigurations(configurations); - cmd.addContainerDetails(componentName, getMetaInfo()); response.addExecutionCommand(cmd); // With start command, the corresponding command for graceful stop needs to http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/f3cab444/slider-core/src/main/java/org/apache/slider/providers/agent/application/metadata/json/MetaInfo.java ---------------------------------------------------------------------- diff --git a/slider-core/src/main/java/org/apache/slider/providers/agent/application/metadata/json/MetaInfo.java b/slider-core/src/main/java/org/apache/slider/providers/agent/application/metadata/json/MetaInfo.java index 8938ee0..ff81fb9 100644 --- a/slider-core/src/main/java/org/apache/slider/providers/agent/application/metadata/json/MetaInfo.java +++ b/slider-core/src/main/java/org/apache/slider/providers/agent/application/metadata/json/MetaInfo.java @@ -155,6 +155,7 @@ public class MetaInfo { commandScript.setTimeout(xmlComp.getCommandScript().getTimeout()); comp.setCommandScript(commandScript); } + app.getComponents().add(comp); } } http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/f3cab444/slider-core/src/test/java/org/apache/slider/providers/agent/TestAgentProviderService.java ---------------------------------------------------------------------- diff --git a/slider-core/src/test/java/org/apache/slider/providers/agent/TestAgentProviderService.java b/slider-core/src/test/java/org/apache/slider/providers/agent/TestAgentProviderService.java index 0324af4..7746867 100644 --- a/slider-core/src/test/java/org/apache/slider/providers/agent/TestAgentProviderService.java +++ b/slider-core/src/test/java/org/apache/slider/providers/agent/TestAgentProviderService.java @@ -993,10 +993,10 @@ public class TestAgentProviderService { int found = 0; for (Component component : components) { if (component.getName().equals("HBASE_MASTER")) { - Assert.assertEquals(component.getAutoStartOnFailure(), "true"); Assert.assertEquals(component.getAutoStartOnFailure(), Boolean.TRUE); - Assert.assertEquals(component.getMinInstanceCount(), "1"); - Assert.assertEquals(component.getMaxInstanceCount(), "2"); + Assert.assertEquals(component.getAutoStartOnFailure(), Boolean.TRUE); + Assert.assertEquals(component.getMinInstanceCount(), 1); + Assert.assertEquals(component.getMaxInstanceCount(), 2); Assert.assertEquals(component.getCommandScript().getScript(), "scripts/hbase_master.py"); Assert.assertEquals(component.getCategory(), "MASTER"); Assert.assertEquals(component.getAppExports(), "QuickLinks-JMX_Endpoint,QuickLinks-Master_Status");
