Merge branch 'feature/SLIDER-647-placement' 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/b8636026 Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/b8636026 Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/b8636026 Branch: refs/heads/develop Commit: b86360263c99fc9d1f140460c96cba6afb3f7ae9 Parents: 67346de f6abb46 Author: Steve Loughran <[email protected]> Authored: Thu Nov 13 22:51:18 2014 +0000 Committer: Steve Loughran <[email protected]> Committed: Thu Nov 13 22:51:18 2014 +0000 ---------------------------------------------------------------------- .../slider/providers/PlacementPolicy.java | 22 ++- .../slider/server/appmaster/state/AppState.java | 22 ++- .../appmaster/state/OutstandingRequest.java | 2 +- .../server/appmaster/state/RoleHistory.java | 6 +- .../server/appmaster/state/RoleStatus.java | 4 + .../TestMockAppStateDynamicHistory.groovy | 3 +- .../TestMockAppStateDynamicRoles.groovy | 172 ++++++++++++++++++- .../TestMockAppStateRolePlacement.groovy | 5 + .../model/mock/BaseMockAppStateTest.groovy | 2 + .../appmaster/model/mock/MockYarnCluster.groovy | 10 +- .../appmaster/model/mock/MockYarnEngine.groovy | 6 + 11 files changed, 229 insertions(+), 25 deletions(-) ----------------------------------------------------------------------
