Merge branch 'feature/SLIDER-856-pre-emption' 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/f61dc2be Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/f61dc2be Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/f61dc2be Branch: refs/heads/develop Commit: f61dc2be54e2b30704308bc26806475573bc9e62 Parents: 585fc4c 0a50c48 Author: Steve Loughran <[email protected]> Authored: Mon May 4 23:08:43 2015 +0100 Committer: Steve Loughran <[email protected]> Committed: Mon May 4 23:08:43 2015 +0100 ---------------------------------------------------------------------- .../apache/slider/api/ClusterDescription.java | 28 +- .../java/org/apache/slider/api/RoleKeys.java | 17 +- .../java/org/apache/slider/api/StatusKeys.java | 3 + .../org/apache/slider/api/proto/Messages.java | 342 +++++++++++++++++-- .../slider/api/proto/RestTypeMarshalling.java | 9 +- .../slider/api/types/ComponentInformation.java | 14 +- .../server/appmaster/SliderAppMaster.java | 2 - .../slider/server/appmaster/state/AppState.java | 55 ++- .../appmaster/state/ContainerOutcome.java | 61 ++++ .../server/appmaster/state/NodeEntry.java | 36 +- .../server/appmaster/state/RoleHistory.java | 19 +- .../server/appmaster/state/RoleStatus.java | 74 +++- .../appmaster/web/view/ContainerStatsBlock.java | 18 +- .../src/main/proto/SliderClusterMessages.proto | 5 +- .../TestMockAppStateContainerFailure.groovy | 132 ++++++- .../TestRoleHistoryContainerEvents.groovy | 10 +- ...stRoleHistoryFindNodesForNewInstances.groovy | 10 +- .../model/mock/BaseMockAppStateTest.groovy | 5 +- .../appmaster/web/view/TestIndexBlock.groovy | 6 +- 19 files changed, 732 insertions(+), 114 deletions(-) ----------------------------------------------------------------------
