Merge branch 'feature/SLIDER-86-windows' into feature/SLIDER-149_Support_a_YARN_service_registry
Conflicts: slider-core/src/main/java/org/apache/slider/client/SliderClient.java Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/f6bbb8b8 Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/f6bbb8b8 Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/f6bbb8b8 Branch: refs/heads/feature/SLIDER-149_Support_a_YARN_service_registry Commit: f6bbb8b8574c111acda2cc51918b00ed85440d60 Parents: 5784c4a 4a0b783 Author: Steve Loughran <ste...@apache.org> Authored: Wed Sep 10 16:43:51 2014 +0100 Committer: Steve Loughran <ste...@apache.org> Committed: Wed Sep 10 16:43:51 2014 +0100 ---------------------------------------------------------------------- app-packages/accumulo/README.txt | 17 +- app-packages/accumulo/pom.xml | 90 +++++- app-packages/accumulo/src/assembly/accumulo.xml | 2 +- .../funtest/accumulo/AccumuloBasicIT.groovy | 7 + .../accumulo/AccumuloMonitorSSLIT.groovy | 7 +- .../funtest/accumulo/AccumuloSSLTestBase.groovy | 7 +- .../accumulo/src/test/resources/appConfig.json | 55 ++++ .../src/test/resources/appConfig_kerberos.json | 8 +- .../test/resources/appConfig_monitor_ssl.json | 4 +- .../appConfig_monitor_ssl_kerberos.json | 57 ++++ .../src/test/resources/appConfig_ssl.json | 4 +- .../test/resources/appConfig_ssl_kerberos.json | 59 ++++ .../command-logger/application-pkg/pom.xml | 38 ++- app-packages/command-logger/slider-pkg/pom.xml | 38 ++- app-packages/hbase/README.txt | 43 ++- app-packages/hbase/appConfig.json | 4 +- app-packages/hbase/metainfo.xml | 4 +- app-packages/hbase/pom.xml | 317 +++++++++++-------- app-packages/hbase/src/assembly/hbase.xml | 16 +- app-packages/storm/README.txt | 9 +- app-packages/storm/appConfig.json | 8 +- app-packages/storm/metainfo.xml | 2 +- app-packages/storm/package/scripts/params.py | 8 +- app-packages/storm/package/scripts/service.py | 47 ++- app-packages/storm/package/scripts/storm.py | 9 +- .../storm/package/scripts/yaml_config.py | 10 +- .../storm/package/templates/storm_jaas.conf.j2 | 11 +- app-packages/storm/resources.json | 2 +- pom.xml | 78 ++--- slider-agent/pom.xml | 62 ++-- slider-assembly/pom.xml | 23 +- slider-assembly/src/main/scripts/slider | 2 + slider-assembly/src/main/scripts/slider.py | 119 ++++--- slider-core/pom.xml | 102 ++---- .../org/apache/slider/client/SliderClient.java | 92 +++++- .../org/apache/slider/common/SliderKeys.java | 2 + .../common/params/AbstractActionArgs.java | 3 +- .../common/params/ActionInstallPackageArgs.java | 58 ++++ .../apache/slider/common/params/Arguments.java | 1 + .../apache/slider/common/params/ClientArgs.java | 12 +- .../slider/common/params/SliderActions.java | 2 + .../slider/common/tools/CoreFileSystem.java | 12 + .../conf/TemplateInputPropertiesValidator.java | 2 +- .../slider/core/launch/AppMasterLauncher.java | 6 +- .../providers/agent/AgentProviderService.java | 15 +- .../security/FsDelegationTokenManager.java | 38 ++- .../actions/TestActionInstallPackage.groovy | 157 +++++++++ .../TestFsDelegationTokenManager.groovy | 3 +- .../agent/TestAgentProviderService.java | 10 +- slider-funtest/pom.xml | 48 +-- .../framework/AgentCommandTestBase.groovy | 2 +- .../funtest/framework/CommandTestBase.groovy | 7 +- .../funtest/framework/FileUploader.groovy | 1 + .../funtest/framework/FuntestProperties.groovy | 1 + .../slider/funtest/framework/SliderShell.groovy | 85 ++++- .../slider/funtest/basic/SyspropsIT.groovy | 50 +++ .../hbase/slider-hbase-provider/pom.xml | 49 +-- src/test/clusters/script.md | 2 +- 58 files changed, 1394 insertions(+), 533 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/f6bbb8b8/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/f6bbb8b8/slider-core/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/f6bbb8b8/slider-core/src/main/java/org/apache/slider/client/SliderClient.java ---------------------------------------------------------------------- diff --cc slider-core/src/main/java/org/apache/slider/client/SliderClient.java index ed3bc0e,ef0e63c..350d20d --- a/slider-core/src/main/java/org/apache/slider/client/SliderClient.java +++ b/slider-core/src/main/java/org/apache/slider/client/SliderClient.java @@@ -213,16 -196,10 +214,13 @@@ public class SliderClient extends Abstr SliderUtils.forceLogin(); SliderUtils.initProcessSecurity(conf); } - //create the YARN client - yarnClient = new SliderYarnClientImpl(); - addService(yarnClient); - super.serviceInit(conf); - + + //here the superclass is inited; getConfig returns a non-null value + sliderFileSystem = new SliderFileSystem(getConfig()); + YarnAppListClient = + new YarnAppListClient(yarnClient, getUsername(), getConfig()); } /** @@@ -370,6 -345,31 +366,34 @@@ return exitCode; } + + /** + * Perform everything needed to init the hadoop binding. + * This assumes that the service is already in inited or started state + * @throws IOException + * @throws SliderException + */ + protected void initHadoopBinding() throws IOException, SliderException { + // validate the client + SliderUtils.validateSliderClientEnvironment(null); + //create the YARN client + yarnClient = new SliderYarnClientImpl(); + yarnClient.init(getConfig()); + if (getServiceState() == STATE.STARTED) { + yarnClient.start(); + } + addService(yarnClient); + // create the filesystem + sliderFileSystem = new SliderFileSystem(getConfig()); + + // and the registry ++/* + YARNRegistryClient = + new YARNRegistryClient(yarnClient, getUsername(), getConfig()); ++*/ ++ + } + /** * Delete the zookeeper node associated with the calling user and the cluster **/ http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/f6bbb8b8/slider-core/src/main/java/org/apache/slider/providers/agent/AgentProviderService.java ----------------------------------------------------------------------