Merge branch 'develop' into feature/SLIDER-82-anti-affinity-attempt-2
Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/65617d51 Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/65617d51 Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/65617d51 Branch: refs/heads/develop Commit: 65617d51be32f2e5c48143b2c5c71681cc946aca Parents: 5ff77d0 49bf0f1 Author: Steve Loughran <ste...@apache.org> Authored: Wed Oct 28 17:16:24 2015 +0000 Committer: Steve Loughran <ste...@apache.org> Committed: Wed Oct 28 17:16:24 2015 +0000 ---------------------------------------------------------------------- NOTICE | 2 +- app-packages/accumulo/pom.xml | 2 +- .../accumulo/src/license/THIRD-PARTY.properties | 9 +-- .../command-logger/application-pkg/pom.xml | 2 +- app-packages/command-logger/slider-pkg/pom.xml | 2 +- app-packages/hbase-win/pom.xml | 2 +- app-packages/hbase/pom.xml | 2 +- app-packages/pom.xml | 2 +- app-packages/storm-win/pom.xml | 2 +- app-packages/storm/pom.xml | 2 +- pom.xml | 33 +++++++++- slider-agent/pom.xml | 2 +- slider-agent/src/main/python/agent/main.py | 2 +- slider-assembly/pom.xml | 63 +++++++++++++++++--- slider-assembly/src/assembly/slider-bin.xml | 6 ++ .../src/assembly/slider-dependency.xml | 38 ++++++++++++ slider-core/pom.xml | 10 +++- slider-core/src/license/THIRD-PARTY.properties | 4 +- .../org/apache/slider/client/SliderClient.java | 11 ++-- .../apache/slider/common/SliderXmlConfKeys.java | 34 ++++++++++- .../apache/slider/common/tools/SliderUtils.java | 4 +- .../slider/core/build/InstanceBuilder.java | 6 +- .../server/appmaster/SliderAppMaster.java | 4 +- .../appmaster/monkey/ChaosMonkeyService.java | 3 +- .../security/FsDelegationTokenManager.java | 13 ++-- .../slider/client/TestCommonArgParsing.groovy | 5 +- .../model/mock/MockContainerStatus.groovy | 3 + .../TestFsDelegationTokenManager.groovy | 7 ++- .../slider/test/YarnMiniClusterTestBase.groovy | 3 +- slider-funtest/pom.xml | 2 +- .../src/license/THIRD-PARTY.properties | 4 +- .../funtest/framework/CommandTestBase.groovy | 2 - .../clusters/remote/slider/slider-client.xml | 7 ++- 33 files changed, 221 insertions(+), 72 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/65617d51/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/65617d51/slider-core/pom.xml ---------------------------------------------------------------------- diff --cc slider-core/pom.xml index 7e13b92,42b5f28..704fa06 --- a/slider-core/pom.xml +++ b/slider-core/pom.xml @@@ -258,13 -258,16 +258,21 @@@ <scope>compile</scope> </dependency> + <!-- if the move to hadoop-hdfs-client JAR causes problems insert this + <dependency> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-hdfs</artifactId> + <scope>compile</scope> + </dependency> + --> + <dependency> <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-hdfs</artifactId> + </dependency> + + <dependency> + <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-yarn-client</artifactId> <scope>compile</scope> </dependency> http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/65617d51/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 3404039,9a77c67..7a25629 --- a/slider-core/src/main/java/org/apache/slider/client/SliderClient.java +++ b/slider-core/src/main/java/org/apache/slider/client/SliderClient.java @@@ -2233,9 -2236,12 +2232,9 @@@ public class SliderClient extends Abstr if (clusterSecure) { // if the cluster is secure, make sure that // the relevant security settings go over -/* - addConfOptionToCLI(commandLine, config, KEY_SECURITY); -*/ addConfOptionToCLI(commandLine, config, - DFSConfigKeys.DFS_NAMENODE_KERBEROS_PRINCIPAL_KEY); + DFS_NAMENODE_KERBEROS_PRINCIPAL_KEY); } // write out the path output commandLine.addOutAndErrFiles(STDOUT_AM, STDERR_AM); http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/65617d51/slider-core/src/main/java/org/apache/slider/common/tools/SliderUtils.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/65617d51/slider-core/src/main/java/org/apache/slider/server/appmaster/SliderAppMaster.java ----------------------------------------------------------------------