Merge branch 'develop' 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/3ed6b2df
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/3ed6b2df
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/3ed6b2df
Branch: refs/heads/develop
Commit: 3ed6b2dfa6f7e0db8e09824cb87febd1ff1fb8f9
Parents: b0eac88 e7c008a
Author: Steve Loughran <[email protected]>
Authored: Tue Sep 16 14:32:22 2014 +0100
Committer: Steve Loughran <[email protected]>
Committed: Tue Sep 16 14:32:22 2014 +0100
----------------------------------------------------------------------
.../org/apache/slider/client/SliderClient.java | 5 ++-
.../common/params/AbstractActionArgs.java | 3 +-
.../common/params/ActionRegistryArgs.java | 33 ++++++++++-------
.../apache/slider/common/params/CommonArgs.java | 5 +--
.../slider/core/exceptions/UsageException.java | 34 ++++++++++++++++++
.../slider/core/launch/AbstractLauncher.java | 36 ++++++++++++++++---
.../server/appmaster/SliderAppMaster.java | 4 ++-
.../appmaster/monkey/ChaosKillContainer.java | 13 ++++++-
.../slider/server/appmaster/state/AppState.java | 5 +--
.../standalone/TestStandaloneAgentAM.groovy | 10 +++++-
.../slider/client/TestClientBadArgs.groovy | 14 ++++++++
.../slider/client/TestClientBasicArgs.groovy | 3 +-
.../registry/curator/TestLocalRegistry.groovy | 17 ++++-----
.../model/mock/BaseMockAppStateTest.groovy | 19 ++++++++++
.../model/mock/MockApplicationAttemptId.groovy | 8 +++++
.../model/mock/MockApplicationId.groovy | 9 ++++-
.../appmaster/model/mock/MockContainerId.groovy | 38 +++++++++++---------
.../appmaster/model/mock/MockFactory.groovy | 2 +-
.../appmaster/model/mock/MockYarnCluster.groovy | 7 +++-
.../model/monkey/TestMockMonkey.groovy | 14 ++++++++
.../web/view/TestContainerStatsBlock.groovy | 21 +++++------
.../appmaster/web/view/TestIndexBlock.groovy | 11 +++---
.../apache/slider/test/SliderTestUtils.groovy | 2 ++
23 files changed, 242 insertions(+), 71 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/3ed6b2df/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 baa413e,3df5b18..8c07c5d
--- a/slider-core/src/main/java/org/apache/slider/client/SliderClient.java
+++ b/slider-core/src/main/java/org/apache/slider/client/SliderClient.java
@@@ -2379,11 -2328,9 +2379,10 @@@ public class SliderClient extends Abstr
outputConfig(publishedConfiguration, registryArgs);
} else {
// it's an unknown command
- throw new BadCommandArgumentsException(
- "Bad command arguments for " + ACTION_REGISTRY + " " +
- registryArgs);
+ log.info(ActionRegistryArgs.USAGE);
+ return EXIT_USAGE;
}
+// JDK7
} catch (FileNotFoundException e) {
log.info("{}", e.toString());
log.debug("{}", e, e);
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/3ed6b2df/slider-core/src/main/java/org/apache/slider/server/appmaster/SliderAppMaster.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/3ed6b2df/slider-core/src/test/groovy/org/apache/slider/agent/standalone/TestStandaloneAgentAM.groovy
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/3ed6b2df/slider-core/src/test/groovy/org/apache/slider/test/SliderTestUtils.groovy
----------------------------------------------------------------------
