Merge branch 'feature/SLIDER-570-failure-text-in-funtests' into develop
Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/2ac84287 Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/2ac84287 Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/2ac84287 Branch: refs/heads/feature/SLIDER-531-registry-enhancements Commit: 2ac84287c44b9190ef7e5979a406a125df424f0c Parents: e23e680 1f98074 Author: Steve Loughran <[email protected]> Authored: Fri Oct 31 14:24:54 2014 +0000 Committer: Steve Loughran <[email protected]> Committed: Fri Oct 31 14:24:54 2014 +0000 ---------------------------------------------------------------------- .../org/apache/slider/api/InternalKeys.java | 27 +- .../org/apache/slider/client/SliderClient.java | 166 ++++++--- .../slider/client/SliderYarnClientImpl.java | 18 +- .../org/apache/slider/common/Constants.java | 1 - .../slider/common/params/ActionCreateArgs.java | 7 + .../slider/common/params/ActionDestroyArgs.java | 1 + .../slider/common/params/ActionExistsArgs.java | 8 +- .../slider/common/params/ActionLookupArgs.java | 76 ++++ .../slider/common/params/ActionThawArgs.java | 8 + .../apache/slider/common/params/Arguments.java | 10 +- .../apache/slider/common/params/ClientArgs.java | 21 +- .../common/params/LaunchArgsAccessor.java | 4 + .../common/params/LaunchArgsDelegate.java | 11 + .../common/params/SliderAMCreateAction.java | 7 + .../slider/common/params/SliderActions.java | 3 + .../apache/slider/common/tools/SliderUtils.java | 128 +++++-- .../apache/slider/core/conf/MapOperations.java | 16 +- .../slider/core/exceptions/ErrorStrings.java | 2 +- .../slider/core/launch/AppMasterLauncher.java | 49 ++- .../slider/core/launch/LaunchedApplication.java | 6 + .../launch/SerializedApplicationReport.java | 92 +++++ .../core/persist/ApplicationReportSerDeser.java | 57 +++ .../slider/core/persist/JsonSerDeser.java | 25 +- .../server/appmaster/SliderAppMaster.java | 46 ++- .../server/appmaster/monkey/ChaosEntry.java | 9 +- .../appmaster/monkey/ChaosMonkeyService.java | 47 ++- .../TestFreezeThawFlexStandaloneAM.groovy | 52 ++- .../slider/core/conf/TestConfTreeResolve.groovy | 22 +- .../model/monkey/TestMockMonkey.groovy | 13 +- .../slider/core/conf/examples/internal.json | 5 +- .../framework/AgentCommandTestBase.groovy | 16 +- .../funtest/framework/CommandTestBase.groovy | 344 ++++++++++++++++--- .../slider/funtest/framework/SliderShell.groovy | 5 +- .../funtest/lifecycle/AMFailuresIT.groovy | 19 +- .../lifecycle/AgentClusterLifecycleIT.groovy | 39 ++- .../funtest/lifecycle/AgentFailures2IT.groovy | 24 +- .../funtest/lifecycle/AgentFailuresIT.groovy | 22 +- .../lifecycle/AgentLaunchFailureIT.groovy | 98 ++++++ .../funtest/lifecycle/AgentRegistryIT.groovy | 22 +- .../lifecycle/AppsThroughAgentDemo.groovy | 167 +++++++++ .../funtest/lifecycle/AppsThroughAgentIT.groovy | 35 +- .../AppsThroughAgentQueueAndLabelsIT.groovy | 28 +- .../lifecycle/ClusterBuildDestroyIT.groovy | 1 - 43 files changed, 1448 insertions(+), 309 deletions(-) ----------------------------------------------------------------------
