Merge branch 'feature/SLIDER-77-failure-window' 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/a8cdabc7 Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/a8cdabc7 Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/a8cdabc7 Branch: refs/heads/develop Commit: a8cdabc755f9f6853736f73c123a6489e282c716 Parents: cebde98 4bb2372 Author: Steve Loughran <ste...@apache.org> Authored: Tue Aug 12 14:12:31 2014 +0100 Committer: Steve Loughran <ste...@apache.org> Committed: Tue Aug 12 14:12:31 2014 +0100 ---------------------------------------------------------------------- .../java/org/apache/slider/api/OptionKeys.java | 23 --- .../org/apache/slider/api/ResourceKeys.java | 82 ++++++++++ .../org/apache/slider/client/SliderClient.java | 10 +- .../apache/slider/common/SliderExitCodes.java | 2 +- .../apache/slider/common/SliderXmlConfKeys.java | 13 -- .../server/appmaster/SliderAppMaster.java | 91 ++++++++--- .../server/appmaster/actions/ActionHalt.java | 7 +- .../appmaster/actions/ActionStartContainer.java | 15 +- .../appmaster/actions/ActionStopQueue.java | 15 +- .../appmaster/actions/ActionStopSlider.java | 15 +- .../server/appmaster/actions/AsyncAction.java | 16 +- .../actions/ProviderReportedContainerLoss.java | 7 +- .../actions/ProviderStartupCompleted.java | 7 +- .../server/appmaster/actions/QueueAccess.java | 31 +++- .../server/appmaster/actions/QueueExecutor.java | 2 +- .../server/appmaster/actions/QueueService.java | 107 ++++++++++-- .../appmaster/actions/RenewingAction.java | 35 ++-- .../appmaster/actions/ResetFailureWindow.java | 39 +++++ .../slider/server/appmaster/state/AppState.java | 82 ++++++---- .../server/appmaster/state/RoleHistory.java | 2 +- .../server/appmaster/state/RoleInstance.java | 4 +- .../server/appmaster/state/RoleStatus.java | 24 ++- .../workflow/WorkflowExecutorService.java | 2 +- .../standalone/TestBuildStandaloneAM.groovy | 18 +- .../server/appmaster/actions/TestActions.groovy | 40 ++++- .../TestMockAppStateContainerFailure.groovy | 44 ++++- .../model/mock/BaseMockAppStateTest.groovy | 14 +- .../apache/slider/test/SliderTestUtils.groovy | 4 + slider-core/src/test/resources/log4j.properties | 2 +- .../failures/TestFailureThreshold.groovy | 150 ----------------- .../TestRegionServerFailureThreshold.groovy | 163 +++++++++++++++++++ .../src/test/resources/log4j.properties | 1 + 32 files changed, 753 insertions(+), 314 deletions(-) ----------------------------------------------------------------------
