Merge branch 'feature/SLIDER-82-anti-affinity-attempt-2' 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/c8fb17e0 Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/c8fb17e0 Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/c8fb17e0 Branch: refs/heads/develop Commit: c8fb17e051553c3fff737dc65eaa6b3ad0f8563c Parents: 5fea3df 002a88a Author: Steve Loughran <[email protected]> Authored: Sun Nov 1 11:48:53 2015 +0000 Committer: Steve Loughran <[email protected]> Committed: Sun Nov 1 11:48:53 2015 +0000 ---------------------------------------------------------------------- pom.xml | 14 +- slider-core/pom.xml | 6 +- .../apache/slider/api/SliderApplicationApi.java | 28 +- .../slider/api/SliderClusterProtocol.java | 25 +- .../java/org/apache/slider/api/StatusKeys.java | 1 + .../org/apache/slider/api/proto/Messages.java | 12920 ++++++++++++----- .../slider/api/proto/RestTypeMarshalling.java | 97 +- .../slider/api/proto/SliderClusterAPI.java | 274 +- .../slider/api/types/ComponentInformation.java | 42 +- .../slider/api/types/NodeEntryInformation.java | 61 + .../slider/api/types/NodeInformation.java | 42 + .../org/apache/slider/client/SliderClient.java | 32 +- .../apache/slider/client/SliderClientAPI.java | 4 +- .../client/ipc/SliderApplicationIpcClient.java | 22 +- .../client/ipc/SliderClusterOperations.java | 118 +- .../rest/SliderApplicationApiRestClient.java | 16 +- .../apache/slider/common/tools/SliderUtils.java | 9 +- .../registry/docstore/PublishedConfigSet.java | 4 +- .../docstore/PublishedConfiguration.java | 2 +- .../registry/docstore/PublishedExports.java | 9 +- .../registry/docstore/PublishedExportsSet.java | 8 +- .../slider/core/registry/docstore/UriMap.java | 2 +- .../slideram/SliderAMClientProvider.java | 3 +- .../apache/slider/server/appmaster/AMUtils.java | 46 - .../appmaster/ProtobufClusterServices.java | 30 + .../server/appmaster/ProtobufRecordFactory.java | 29 - .../server/appmaster/SliderAppMaster.java | 72 +- .../server/appmaster/management/BoolMetric.java | 87 + .../server/appmaster/management/LongGauge.java | 92 + .../appmaster/management/MeterAndCounter.java | 5 + .../management/MetricsAndMonitoring.java | 55 +- .../management/RangeLimitedCounter.java | 85 + .../appmaster/management/RecordedEvent.java | 58 + .../server/appmaster/management/Timestamp.java | 33 + .../operations/RMOperationHandlerActions.java | 7 +- .../rpc/SliderClusterProtocolPBImpl.java | 20 + .../rpc/SliderClusterProtocolProxy.java | 20 + .../server/appmaster/rpc/SliderIPCService.java | 78 +- .../security/SecurityConfiguration.java | 20 +- .../state/AbstractClusterServices.java | 33 + .../appmaster/state/AbstractRecordFactory.java | 30 - .../slider/server/appmaster/state/AppState.java | 104 +- .../server/appmaster/state/NodeEntry.java | 77 +- .../server/appmaster/state/NodeInstance.java | 59 +- .../slider/server/appmaster/state/NodeMap.java | 35 +- .../appmaster/state/ProviderAppState.java | 27 +- .../server/appmaster/state/RoleHistory.java | 162 +- .../server/appmaster/state/RoleStatus.java | 13 + .../state/StateAccessForProviders.java | 40 +- .../slider/server/appmaster/web/WebAppApi.java | 8 + .../server/appmaster/web/WebAppApiImpl.java | 3 +- .../server/appmaster/web/rest/RestPaths.java | 3 +- .../ApplicationResouceContentCacheFactory.java | 54 +- .../rest/application/ApplicationResource.java | 36 +- .../resources/LiveNodesRefresher.java | 42 + .../src/main/proto/SliderClusterMessages.proto | 150 +- .../src/main/proto/SliderClusterProtocol.proto | 12 +- .../rest/AbstractAppApiTestDelegates.groovy | 17 +- .../agent/rest/IpcApiClientTestDelegates.java | 2 +- .../agent/rest/JerseyTestDelegates.groovy | 11 +- .../agent/rest/LowLevelRestTestDelegates.groovy | 21 +- .../slider/agent/rest/TestStandaloneREST.groovy | 83 +- .../TestMockAppStateAppRestIntegration.groovy | 5 +- .../appmaster/model/mock/MockAppState.groovy | 6 +- .../model/mock/MockClusterServices.groovy | 30 + .../model/mock/MockRecordFactory.groovy | 30 - .../model/monkey/TestMockMonkey.groovy | 2 +- .../publisher/TestPublisherRestResources.groovy | 2 +- .../view/TestClusterSpecificationBlock.groovy | 9 +- .../apache/slider/test/SliderTestUtils.groovy | 123 +- .../web/rest/agent/TestAMAgentWebServices.java | 4 +- .../management/TestAMManagementWebServices.java | 4 +- .../funtest/lifecycle/AgentRegistryIT.groovy | 2 +- 73 files changed, 10966 insertions(+), 4749 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/c8fb17e0/slider-core/src/main/java/org/apache/slider/client/SliderClient.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/c8fb17e0/slider-core/src/main/java/org/apache/slider/client/SliderClientAPI.java ----------------------------------------------------------------------
