Merge branch 'feature/SLIDER-202_chaos_monkey' 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/9b20e47b Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/9b20e47b Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/9b20e47b Branch: refs/heads/feature/SLIDER-149_Support_a_YARN_service_registry Commit: 9b20e47b50d6e3f51467c0517f3b0d21242f1f17 Parents: d38b31a 53028ea Author: Steve Loughran <ste...@apache.org> Authored: Wed Aug 13 18:10:32 2014 +0100 Committer: Steve Loughran <ste...@apache.org> Committed: Wed Aug 13 18:10:32 2014 +0100 ---------------------------------------------------------------------- pom.xml | 8 + slider-core/pom.xml | 46 +----- .../api/ClusterDescriptionOperations.java | 12 +- .../org/apache/slider/api/InternalKeys.java | 137 ++++++++++++++++ .../java/org/apache/slider/api/OptionKeys.java | 69 +------- .../org/apache/slider/api/ResourceKeys.java | 26 +-- .../org/apache/slider/client/SliderClient.java | 7 +- .../apache/slider/common/tools/SliderUtils.java | 8 +- .../slider/core/build/InstanceBuilder.java | 3 +- .../apache/slider/core/conf/MapOperations.java | 54 ++++++- .../apache/slider/providers/ProviderUtils.java | 9 +- .../providers/agent/AgentClientProvider.java | 8 +- .../providers/agent/AgentProviderService.java | 7 +- .../slideram/SliderAMClientProvider.java | 4 +- .../server/appmaster/SliderAppMaster.java | 157 ++++++++++++------ .../server/appmaster/actions/ActionHalt.java | 4 +- .../appmaster/actions/ActionKillContainer.java | 67 ++++++++ .../server/appmaster/actions/QueueService.java | 8 +- .../server/appmaster/monkey/ChaosEntry.java | 86 ++++++++++ .../server/appmaster/monkey/ChaosKillAM.java | 48 ++++++ .../appmaster/monkey/ChaosKillContainer.java | 75 +++++++++ .../appmaster/monkey/ChaosMonkeyService.java | 86 ++++++++++ .../server/appmaster/monkey/ChaosTarget.java | 24 +++ .../appmaster/monkey/MonkeyPlayAction.java | 48 ++++++ .../slider/server/appmaster/state/AppState.java | 14 +- .../TestStandaloneAMMonkeyRestart.groovy | 94 +++++++++++ .../standalone/TestStandaloneAgentAM.groovy | 2 +- .../TestMockAppStateContainerFailure.groovy | 2 +- .../TestMockAppStateDynamicRoles.groovy | 2 +- .../TestMockAppStateFlexDynamicRoles.groovy | 2 +- .../appstate/TestMockAppStateFlexing.groovy | 2 +- .../TestMockAppStateRMOperations.groovy | 2 +- .../TestMockAppStateRebuildOnAMRestart.groovy | 2 +- .../TestMockAppStateRolePlacement.groovy | 2 +- .../appstate/TestMockAppStateRoleRelease.groovy | 2 +- .../TestMockContainerResourceAllocations.groovy | 2 +- .../model/mock/BaseMockAppStateTest.groovy | 8 +- .../model/mock/MockRMOperationHandler.groovy | 7 +- .../model/monkey/TestMockMonkey.groovy | 160 +++++++++++++++++++ .../apache/slider/test/SliderTestBase.groovy | 7 +- .../agent/TestAgentProviderService.java | 9 +- .../accumulo/AccumuloClientProvider.java | 3 +- .../accumulo/AccumuloProviderService.java | 9 +- .../providers/hbase/HBaseClientProvider.java | 3 +- .../providers/hbase/HBaseProviderService.java | 4 +- .../TestRegionServerFailureThreshold.groovy | 5 +- ...reezeReconfigureThawLiveRegionService.groovy | 4 +- 47 files changed, 1097 insertions(+), 251 deletions(-) ----------------------------------------------------------------------
