Merge branch 'feature/SLIDER-768_API_to_indicate_when_all_component_instances_are_launched' 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/bcda3c24 Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/bcda3c24 Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/bcda3c24 Branch: refs/heads/develop Commit: bcda3c24c802b190255729b937ab5f3bbff6cece Parents: 39e04e3 0d0b089 Author: Steve Loughran <[email protected]> Authored: Mon Feb 2 15:32:04 2015 +0000 Committer: Steve Loughran <[email protected]> Committed: Mon Feb 2 15:32:04 2015 +0000 ---------------------------------------------------------------------- .../apache/slider/api/ClusterDescription.java | 8 +- .../types/ApplicationLivenessInformation.java | 47 +++ .../slider/api/types/ComponentInformation.java | 63 ++++ .../slider/api/types/ContainerInformation.java | 57 ++++ .../apache/slider/api/types/PingResource.java | 47 +++ .../types/SerializedComponentInformation.java | 41 --- .../types/SerializedContainerInformation.java | 57 ---- .../slider/client/rest/BaseRestClient.java | 38 +-- .../slider/client/rest/RestClientFactory.java | 29 +- .../client/rest/SliderApplicationAPI.java | 274 ---------------- .../client/rest/SliderApplicationAPIImpl.java | 254 +++++++++++++++ .../client/rest/SliderApplicationApi.java | 145 +++++++++ .../common/SliderXMLConfKeysForTesting.java | 1 + .../apache/slider/common/SliderXmlConfKeys.java | 16 +- .../core/exceptions/ExceptionConverter.java | 26 ++ .../server/appmaster/SliderAppMaster.java | 13 +- .../appmaster/management/MeterAndCounter.java | 8 + .../appmaster/management/MetricsConstants.java | 27 ++ .../slider/server/appmaster/state/AppState.java | 166 ++++++++-- .../appmaster/state/ProviderAppState.java | 17 + .../server/appmaster/state/RoleInstance.java | 13 +- .../server/appmaster/state/RoleStatus.java | 23 +- .../state/StateAccessForProviders.java | 38 +++ .../server/appmaster/web/rest/RestPaths.java | 3 + .../rest/application/ApplicationResource.java | 94 +++++- .../application/actions/RestActionPing.java | 3 +- .../application/actions/RestActionStop.java | 4 +- .../resources/LiveComponentsRefresher.java | 22 +- .../resources/LiveContainersRefresher.java | 10 +- .../resources/LiveStatisticsRefresher.java | 39 +++ .../application/resources/PingResource.java | 44 --- .../agent/rest/AbstractRestTestDelegate.groovy | 48 +++ .../agent/rest/JerseyTestDelegates.groovy | 45 +-- .../agent/rest/LowLevelRestTestDelegates.groovy | 321 ++++++++++++++++++ .../rest/RestAPIClientTestDelegates.groovy | 253 ++++++++++++++ .../slider/agent/rest/RestTestDelegates.groovy | 326 ------------------- .../rest/SliderRestClientTestDelegates.groovy | 251 -------------- .../slider/agent/rest/TestStandaloneREST.groovy | 81 ++--- .../standalone/TestBuildStandaloneAM.groovy | 4 + .../TestMockAppStateAppRestIntegration.groovy | 6 +- .../appstate/TestMockAppStateFlexing.groovy | 30 +- .../funtest/lifecycle/AgentWebPagesIT.groovy | 77 ++--- .../AppsThroughAgentQueueAndLabelsIT.groovy | 9 +- 43 files changed, 1846 insertions(+), 1232 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/bcda3c24/slider-core/src/main/java/org/apache/slider/server/appmaster/SliderAppMaster.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/bcda3c24/slider-core/src/main/java/org/apache/slider/server/appmaster/state/AppState.java ---------------------------------------------------------------------- diff --cc slider-core/src/main/java/org/apache/slider/server/appmaster/state/AppState.java index 61b0cd6,5a8b38b..8c461e4 --- a/slider-core/src/main/java/org/apache/slider/server/appmaster/state/AppState.java +++ b/slider-core/src/main/java/org/apache/slider/server/appmaster/state/AppState.java @@@ -276,10 -283,12 +283,13 @@@ public class AppState private long startTimeThreshold; private int failureThreshold = 10; + private int nodeFailureThreshold = 3; private String logServerURL = ""; - + + /** + * Selector of containers to release; application wide. + */ private ContainerReleaseSelector containerReleaseSelector; /** http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/bcda3c24/slider-core/src/main/java/org/apache/slider/server/appmaster/state/RoleStatus.java ----------------------------------------------------------------------
