Merge branch 'develop' into feature/SLIDER-149_Support_a_YARN_service_registry
Conflicts: slider-core/src/test/groovy/org/apache/slider/test/YarnMiniClusterTestBase.groovy Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/901a6738 Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/901a6738 Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/901a6738 Branch: refs/heads/develop Commit: 901a67385d6c7bce6cf8e47c58590282985b684c Parents: 6e883bf f14d32c Author: Steve Loughran <ste...@apache.org> Authored: Fri Sep 5 14:17:04 2014 +0100 Committer: Steve Loughran <ste...@apache.org> Committed: Fri Sep 5 14:17:04 2014 +0100 ---------------------------------------------------------------------- app-packages/accumulo/appConfig.json | 7 +- .../src/test/resources/appConfig_kerberos.json | 57 ++ .../test/resources/appConfig_monitor_ssl.json | 7 +- .../src/test/resources/appConfig_ssl.json | 7 +- app-packages/hbase/appConfig.json | 8 +- app-packages/storm/README.txt | 19 +- app-packages/storm/appConfig.json | 16 +- app-packages/storm/configuration/storm-env.xml | 25 + app-packages/storm/metainfo.xml | 26 +- ...pache-storm-0.9.1.2.1.1.0-237.tar.gz.REPLACE | 16 - app-packages/storm/package/scripts/params.py | 15 +- app-packages/storm/package/scripts/service.py | 8 + .../storm/package/scripts/status_params.py | 4 +- .../storm/package/templates/config.yaml.j2 | 9 - .../storm/package/templates/storm_jaas.conf.j2 | 27 +- app-packages/storm/pom.xml | 90 +++ app-packages/storm/resources.json | 10 +- app-packages/storm/src/assembly/storm.xml | 68 +++ pom.xml | 42 +- slider-agent/pom.xml | 4 +- slider-agent/src/main/python/setup.py | 2 +- slider-agent/src/test/python/python-wrap | 40 -- slider-agent/src/test/python/python-wrap.sh | 42 ++ slider-agent/src/test/python/unitTests.py | 36 +- slider-core/pom.xml | 4 +- .../org/apache/slider/api/InternalKeys.java | 11 + .../org/apache/slider/api/ResourceKeys.java | 13 - .../org/apache/slider/client/SliderClient.java | 33 +- .../common/params/AbstractActionArgs.java | 11 + .../slider/common/params/ActionHelpArgs.java | 14 +- .../slider/common/params/ActionVersionArgs.java | 12 +- .../apache/slider/common/tools/SliderUtils.java | 571 ++++++++++++++----- .../slider/core/build/InstanceBuilder.java | 5 +- .../apache/slider/core/zk/ZookeeperUtils.java | 3 +- .../slider/providers/agent/AgentKeys.java | 1 + .../providers/agent/AgentProviderService.java | 38 +- .../server/appmaster/RoleLaunchService.java | 8 +- .../server/appmaster/SliderAppMaster.java | 68 ++- .../server/appmaster/actions/ActionHalt.java | 6 +- .../appmaster/actions/ActionKillContainer.java | 20 +- .../appmaster/actions/ActionStartContainer.java | 8 +- .../appmaster/actions/ActionStopSlider.java | 6 +- .../server/appmaster/actions/AsyncAction.java | 47 +- .../actions/ProviderReportedContainerLoss.java | 13 +- .../actions/ProviderStartupCompleted.java | 4 - .../server/appmaster/actions/QueueAccess.java | 5 + .../server/appmaster/actions/QueueService.java | 11 +- .../actions/RegisterComponentInstance.java | 5 + .../actions/ReviewAndFlexApplicationSize.java | 43 ++ .../actions/UnregisterComponentInstance.java | 7 +- .../server/appmaster/monkey/ChaosEntry.java | 2 +- .../slider/server/appmaster/state/AppState.java | 11 +- .../services/utility/EndOfServiceWaiter.java | 84 +++ .../services/workflow/ForkedProcessService.java | 21 +- .../services/workflow/LongLivedProcess.java | 57 +- .../agent/AgentMiniClusterTestBase.groovy | 9 + .../agent/actions/TestActionVersion.groovy | 5 +- .../standalone/TestStandaloneAMKill.groovy | 2 +- .../TestStandaloneAMMonkeyRestart.groovy | 8 +- .../tools/TestClientResourceRegistration.groovy | 3 + .../common/tools/TestConfigHelperHDFS.groovy | 3 + .../tools/TestExecutionEnvironment.groovy | 42 ++ .../common/tools/TestMiscSliderUtils.groovy | 3 + .../common/tools/TestWindowsSupport.groovy | 76 ++- .../common/tools/TestZKIntegration.groovy | 54 +- .../slider/providers/agent/AgentTestBase.groovy | 10 + .../apache/slider/test/SliderTestUtils.groovy | 2 +- .../slider/test/YarnMiniClusterTestBase.groovy | 31 +- .../test/YarnZKMiniClusterTestBase.groovy | 2 +- .../agent/TestAgentProviderService.java | 29 + .../services/workflow/EndOfServiceWaiter.java | 56 -- .../TestWorkflowForkedProcessService.java | 4 +- .../providers/accumulo/AccumuloTestBase.groovy | 4 +- .../minicluster/HBaseMiniClusterTestBase.groovy | 1 - .../flexing/TestClusterFlex1To1.groovy | 2 +- 75 files changed, 1509 insertions(+), 564 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/901a6738/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/901a6738/slider-core/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/901a6738/slider-core/src/main/java/org/apache/slider/client/SliderClient.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/901a6738/slider-core/src/main/java/org/apache/slider/providers/agent/AgentProviderService.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/901a6738/slider-core/src/main/java/org/apache/slider/server/appmaster/SliderAppMaster.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/901a6738/slider-core/src/main/java/org/apache/slider/server/appmaster/actions/RegisterComponentInstance.java ---------------------------------------------------------------------- diff --cc slider-core/src/main/java/org/apache/slider/server/appmaster/actions/RegisterComponentInstance.java index 61bf5dd,543c1a8..3145ecb --- a/slider-core/src/main/java/org/apache/slider/server/appmaster/actions/RegisterComponentInstance.java +++ b/slider-core/src/main/java/org/apache/slider/server/appmaster/actions/RegisterComponentInstance.java @@@ -25,14 -25,17 +25,19 @@@ import org.apache.slider.server.appmast import java.util.concurrent.TimeUnit; + /** + * Notify the app master that it should register a component instance + * in the registry + * {@link SliderAppMaster#registerComponent(ContainerId)} + */ public class RegisterComponentInstance extends AsyncAction { - public final ContainerId containerId; + public final String description; - public RegisterComponentInstance(ContainerId containerId, long delay, + public RegisterComponentInstance(ContainerId containerId, + String description, + long delay, TimeUnit timeUnit) { super("RegisterComponentInstance :" + containerId, delay, timeUnit); http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/901a6738/slider-core/src/test/groovy/org/apache/slider/test/SliderTestUtils.groovy ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/901a6738/slider-core/src/test/groovy/org/apache/slider/test/YarnMiniClusterTestBase.groovy ---------------------------------------------------------------------- diff --cc slider-core/src/test/groovy/org/apache/slider/test/YarnMiniClusterTestBase.groovy index 3dc1d6d,97cc853..d80ee62 --- a/slider-core/src/test/groovy/org/apache/slider/test/YarnMiniClusterTestBase.groovy +++ b/slider-core/src/test/groovy/org/apache/slider/test/YarnMiniClusterTestBase.groovy @@@ -246,9 -244,12 +243,11 @@@ public abstract class YarnMiniClusterTe conf.set(YarnConfiguration.RM_SCHEDULER, FIFO_SCHEDULER); SliderUtils.patchConfiguration(conf) name = buildClustername(name) - miniCluster = - new MiniYARNCluster(name, noOfNodeManagers, numLocalDirs, numLogDirs, 1, false, false) - miniCluster.init(conf) + miniCluster = new MiniYARNCluster( + name, + noOfNodeManagers, + numLocalDirs, + numLogDirs) - miniCluster.init(conf) miniCluster.start(); if (startHDFS) { createMiniHDFSCluster(name, conf) http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/901a6738/slider-core/src/test/groovy/org/apache/slider/test/YarnZKMiniClusterTestBase.groovy ----------------------------------------------------------------------