Merge branch 'feature/SLIDER-149_Support_a_YARN_service_registry' 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/2553f157 Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/2553f157 Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/2553f157 Branch: refs/heads/develop Commit: 2553f15737e8ce55903896a7a49c20658080f2cf Parents: 3b32b8f 851f447 Author: Steve Loughran <ste...@apache.org> Authored: Wed Oct 8 15:52:16 2014 -0700 Committer: Steve Loughran <ste...@apache.org> Committed: Wed Oct 8 15:52:16 2014 -0700 ---------------------------------------------------------------------- .../funtest/accumulo/AccumuloBasicIT.groovy | 17 +- pom.xml | 6 + slider-core/pom.xml | 16 +- .../org/apache/slider/client/SliderClient.java | 624 ++++++++++--------- .../apache/slider/client/SliderClientAPI.java | 249 ++++++++ .../slider/client/SliderClusterOperations.java | 1 - .../common/params/ActionRegistryArgs.java | 9 +- .../slider/common/params/ActionResolveArgs.java | 87 +++ .../org/apache/slider/common/params/ArgOps.java | 2 +- .../apache/slider/common/params/Arguments.java | 1 + .../apache/slider/common/params/ClientArgs.java | 67 +- .../slider/common/params/SliderActions.java | 1 + .../slider/common/tools/CoreFileSystem.java | 31 +- .../apache/slider/common/tools/SliderUtils.java | 44 +- .../core/exceptions/ExceptionConverter.java | 16 +- .../slider/core/launch/AbstractLauncher.java | 7 +- .../core/launch/JavaCommandLineBuilder.java | 4 +- .../slider/core/persist/JsonSerDeser.java | 12 +- .../core/registry/YARNRegistryClient.java | 85 --- .../slider/core/registry/YarnAppListClient.java | 93 +++ .../docstore/PublishedConfiguration.java | 4 +- .../registry/info/CommonRegistryConstants.java | 25 - .../registry/info/CustomRegistryConstants.java | 8 + .../core/registry/info/RegisteredDocument.java | 33 - .../core/registry/info/RegisteredEndpoint.java | 206 ------ .../core/registry/info/RegistryFields.java | 34 - .../core/registry/info/RegistryNaming.java | 51 -- .../slider/core/registry/info/RegistryView.java | 41 -- .../core/registry/info/ServiceInstanceData.java | 139 ----- .../registry/retrieve/RegistryRetriever.java | 83 ++- .../providers/AbstractProviderService.java | 59 +- .../slider/providers/ProviderService.java | 21 +- .../providers/agent/AgentProviderService.java | 46 +- .../providers/agent/ComponentInstanceState.java | 1 - .../slideram/SliderAMClientProvider.java | 6 - .../slideram/SliderAMProviderService.java | 80 ++- .../server/appmaster/SliderAppMaster.java | 208 ++++--- .../actions/RegisterComponentInstance.java | 9 +- .../server/appmaster/state/RoleInstance.java | 29 +- .../server/appmaster/web/SliderAMWebApp.java | 23 +- .../slider/server/appmaster/web/WebAppApi.java | 4 + .../server/appmaster/web/WebAppApiImpl.java | 17 +- .../appmaster/web/rest/AMWebServices.java | 9 + .../server/appmaster/web/rest/RestPaths.java | 4 +- .../web/rest/registry/PathEntryResource.java | 45 ++ .../web/rest/registry/RegistryResource.java | 157 +++++ .../server/services/curator/CuratorHelper.java | 138 ---- .../server/services/curator/CuratorService.java | 98 --- .../curator/CuratorServiceInstance.java | 77 --- .../curator/CuratorServiceInstances.java | 41 -- .../server/services/curator/CuratorUriSpec.java | 57 -- .../services/curator/RegistryBinderService.java | 315 ---------- .../registry/RegistryDiscoveryContext.java | 36 -- .../registry/RegistryRestResources.java | 178 ------ .../registry/RegistryServiceConstants.java | 26 - .../registry/RegistryViewForProviders.java | 48 -- .../registry/SliderRegistryService.java | 99 --- .../utility/AbstractSliderLaunchedService.java | 84 +-- .../YarnRegistryViewForProviders.java | 196 ++++++ .../slider/agent/actions/TestActionList.groovy | 2 +- .../standalone/TestBuildStandaloneAM.groovy | 6 +- .../standalone/TestStandaloneAgentAM.groovy | 24 +- .../standalone/TestStandaloneRegistryAM.groovy | 362 ----------- .../TestStandaloneYarnRegistryAM.groovy | 431 +++++++++++++ .../registry/curator/TestLocalRegistry.groovy | 164 ----- .../curator/TestRegistryRestResources.groovy | 195 ------ .../curator/TestServiceInstanceSerDeser.groovy | 122 ---- .../model/mock/MockProviderService.groovy | 18 +- .../rest/registry/PathEntryMarshalling.groovy | 28 + .../registry/TestRegistryRestMarshalling.groovy | 48 ++ .../registry/TestRegistryRestResources.groovy | 215 +++++++ .../view/TestClusterSpecificationBlock.groovy | 7 +- .../web/view/TestContainerStatsBlock.groovy | 7 +- .../appmaster/web/view/TestIndexBlock.groovy | 8 +- .../apache/slider/test/MicroZKCluster.groovy | 29 +- .../apache/slider/test/SliderTestUtils.groovy | 31 +- .../slider/test/YarnMiniClusterTestBase.groovy | 1 - .../test/YarnZKMiniClusterTestBase.groovy | 23 +- .../web/rest/agent/TestAMAgentWebServices.java | 3 +- .../management/TestAMManagementWebServices.java | 2 +- .../publisher/TestAgentProviderService.java | 4 +- slider-core/src/test/resources/log4j.properties | 3 +- .../appmaster/web/rest/registry/sample.json | 75 +++ .../funtest/FunctionalHBaseClusterIT.groovy | 7 +- .../slider/providers/hbase/HBaseKeys.java | 2 +- .../providers/hbase/HBaseProviderService.java | 53 +- .../build/TestBuildThawClusterM1W1.groovy | 2 +- .../minicluster/live/TestHBaseMaster.groovy | 36 +- .../minicluster/live/TestTwoLiveClusters.groovy | 45 +- 89 files changed, 2663 insertions(+), 3397 deletions(-) ----------------------------------------------------------------------
