You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@slider.apache.org by st...@apache.org on 2014/08/06 12:50:57 UTC
[17/18] git commit: Merge branch
'feature/SLIDER-270_Calling_flex_(down)_the_second_time_does_not_work' into
develop
Merge branch 'feature/SLIDER-270_Calling_flex_(down)_the_second_time_does_not_work' 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/d68be5aa
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/d68be5aa
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/d68be5aa
Branch: refs/heads/feature/SLIDER-284-hadoop2.5
Commit: d68be5aa5eaa8c2e5a2d71097eb2907968c512bd
Parents: 405aa51 8d6c3fa
Author: Steve Loughran <st...@apache.org>
Authored: Wed Aug 6 09:33:34 2014 +0100
Committer: Steve Loughran <st...@apache.org>
Committed: Wed Aug 6 09:33:34 2014 +0100
----------------------------------------------------------------------
pom.xml | 2 +-
.../server/appmaster/SliderAppMaster.java | 16 +-
.../slider/server/appmaster/state/AppState.java | 142 +++++++++++-------
.../server/appmaster/state/RoleHistory.java | 6 +-
.../server/appmaster/state/RoleStatus.java | 4 +-
.../appstate/TestAppStateDynamicRoles.groovy | 4 +-
.../TestAppStateRebuildOnAMRestart.groovy | 4 +-
.../model/appstate/TestFlexDynamicRoles.groovy | 2 +
.../model/appstate/TestMockFlexing.groovy | 128 ++++++++++++++++
.../model/appstate/TestMockRMOperations.groovy | 37 -----
.../TestRoleHistoryContainerEvents.groovy | 2 +-
.../model/mock/BaseMockAppStateTest.groovy | 57 ++++++-
.../appmaster/model/mock/MockYarnEngine.groovy | 6 +-
.../slider/test/YarnMiniClusterTestBase.groovy | 7 +-
.../web/rest/agent/TestAMAgentWebServices.java | 3 +-
.../management/TestAMManagementWebServices.java | 1 +
.../minicluster/HBaseMiniClusterTestBase.groovy | 150 ++++++++++++-------
.../flexing/TestClusterFlex2To5.groovy | 2 +-
.../flexing/TestClusterFlexDownMultiple.groovy | 58 +++++++
.../TestClusterFlexHMasterFlex1To2.groovy | 45 ++++++
.../flexing/TestHMasterFlex1To2.groovy | 45 ------
.../src/test/resources/log4j.properties | 1 +
22 files changed, 497 insertions(+), 225 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/d68be5aa/slider-core/src/main/java/org/apache/slider/server/appmaster/SliderAppMaster.java
----------------------------------------------------------------------