Merge branch 'develop' into feature/SLIDER-320-endpoints-in-roleinstances
Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/95dcbc9c Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/95dcbc9c Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/95dcbc9c Branch: refs/heads/feature/SLIDER-151_REST_API Commit: 95dcbc9c670bf919016a5266d3100b4f2b14f2fa Parents: 74cca8a 4ea66fa Author: Steve Loughran <ste...@apache.org> Authored: Fri Aug 15 14:05:41 2014 +0100 Committer: Steve Loughran <ste...@apache.org> Committed: Fri Aug 15 14:05:41 2014 +0100 ---------------------------------------------------------------------- app-packages/hbase/get-hbase-site.py | 48 ++++++ app-packages/memcached-win/appConfig.json | 2 +- .../memcached-win/package/scripts/memcached.py | 5 +- .../memcached-win/package/scripts/params.py | 1 + app-packages/memcached/appConfig.json | 1 + .../memcached/package/scripts/memcached.py | 5 +- .../memcached/package/scripts/params.py | 2 + app-packages/storm/appConfig.json | 6 +- app-packages/storm/metainfo.xml | 12 ++ app-packages/storm/package/scripts/service.py | 24 +-- .../storm/package/scripts/status_params.py | 1 + pom.xml | 10 +- .../src/main/python/agent/ActionQueue.py | 26 ++- .../src/main/python/agent/CommandStatusDict.py | 5 + slider-agent/src/main/python/agent/Constants.py | 1 + .../src/main/python/agent/Controller.py | 50 +++++- .../python/agent/CustomServiceOrchestrator.py | 81 +++++++--- slider-agent/src/main/python/agent/Heartbeat.py | 15 +- slider-agent/src/main/python/agent/Register.py | 7 +- .../core/providers/system.py | 3 +- .../core/providers/windows/system.py | 11 +- .../core/resources/system.py | 4 + .../python/resource_management/core/shell.py | 14 +- .../src/test/python/agent/TestActionQueue.py | 10 +- .../test/python/agent/TestCommandStatusDict.py | 94 +++++++++++ .../src/test/python/agent/TestController.py | 137 +++++++++++++++- .../agent/TestCustomServiceOrchestrator.py | 18 ++- .../src/test/python/agent/TestHeartbeat.py | 107 ++++++++++++- .../src/test/python/agent/TestRegistration.py | 8 +- .../src/main/java/org/apache/slider/Slider.java | 2 +- .../apache/slider/api/ClusterDescription.java | 14 +- .../java/org/apache/slider/api/OptionKeys.java | 1 - .../org/apache/slider/client/SliderClient.java | 100 +++++++++++- .../slider/client/SliderYarnClientImpl.java | 8 +- .../common/params/AbstractActionArgs.java | 6 +- .../params/AppAndResouceOptionArgsDelegate.java | 8 +- .../org/apache/slider/common/params/ArgOps.java | 8 +- .../apache/slider/common/params/CommonArgs.java | 4 +- .../common/params/DontSplitArguments.java | 2 +- .../slider/common/tools/ConfigHelper.java | 60 +++++-- .../slider/common/tools/CoreFileSystem.java | 4 +- .../apache/slider/common/tools/SliderUtils.java | 10 +- .../org/apache/slider/core/conf/ConfTree.java | 6 +- .../slider/core/conf/ConfTreeOperations.java | 4 +- .../apache/slider/core/conf/MapOperations.java | 2 +- .../slider/core/launch/AbstractLauncher.java | 10 +- .../core/launch/ClasspathConstructor.java | 2 +- .../slider/core/launch/CommandLineBuilder.java | 2 +- .../slider/core/main/ServiceLauncher.java | 2 +- .../slider/core/persist/JsonSerDeser.java | 27 +++- .../registry/docstore/PublishedConfigSet.java | 2 +- .../docstore/PublishedConfiguration.java | 4 +- .../PublishedConfigurationOutputter.java | 12 ++ .../slider/core/registry/docstore/UriMap.java | 2 +- .../slider/core/registry/info/RegistryView.java | 3 +- .../core/registry/info/ServiceInstanceData.java | 4 +- .../apache/slider/core/zk/ZKIntegration.java | 2 +- .../apache/slider/core/zk/ZookeeperUtils.java | 6 +- .../providers/AbstractProviderService.java | 4 +- .../apache/slider/providers/ProviderUtils.java | 2 +- .../providers/agent/AgentClientProvider.java | 8 +- .../providers/agent/AgentLaunchParameter.java | 2 +- .../providers/agent/AgentProviderService.java | 159 +++++++++++++------ .../providers/agent/ComponentCommandOrder.java | 9 +- .../agent/application/metadata/Application.java | 8 +- .../agent/application/metadata/Component.java | 15 +- .../application/metadata/MetainfoParser.java | 1 + .../slideram/SliderAMClientProvider.java | 32 ++-- .../slideram/SliderAMProviderService.java | 2 +- .../server/appmaster/SliderAppMaster.java | 37 +++-- .../appmaster/actions/ActionKillContainer.java | 2 +- .../server/appmaster/actions/QueueService.java | 6 +- .../appmaster/monkey/ChaosMonkeyService.java | 2 +- .../slider/server/appmaster/state/AppState.java | 56 +++---- .../MostRecentContainerReleaseSelector.java | 2 +- .../server/appmaster/state/NodeInstance.java | 2 +- .../slider/server/appmaster/state/NodeMap.java | 2 +- .../state/OutstandingRequestTracker.java | 6 +- .../appmaster/state/ProviderAppState.java | 4 +- .../server/appmaster/state/RoleHistory.java | 15 +- .../server/appmaster/state/RoleStatus.java | 2 +- .../server/appmaster/web/SliderAMWebApp.java | 2 +- .../web/SliderAmFilterInitializer.java | 2 +- .../server/appmaster/web/SliderAmIpFilter.java | 8 +- .../server/appmaster/web/WebAppApiImpl.java | 2 +- .../appmaster/web/rest/agent/HeartBeat.java | 10 -- .../web/rest/agent/HeartBeatResponse.java | 11 ++ .../appmaster/web/rest/agent/Register.java | 58 +++++-- .../web/rest/publisher/PublisherResource.java | 4 +- .../slider/server/avro/RoleHistoryWriter.java | 6 +- .../server/servicemonitor/MonitorUtils.java | 2 +- .../services/curator/RegistryBinderService.java | 6 +- .../registry/RegistryRestResources.java | 3 +- .../registry/SliderRegistryService.java | 2 +- .../agent/TestAgentProviderService.java | 96 +++++++---- .../agent/TestComponentInstanceState.java | 11 +- .../providers/agent/TestHeartbeatMonitor.java | 4 +- .../management/TestAMManagementWebServices.java | 9 +- .../publisher/TestAgentProviderService.java | 2 +- .../workflow/ProcessCommandFactory.java | 6 +- .../slider/test/MiniZooKeeperCluster.java | 6 +- .../funtest/framework/CommandTestBase.groovy | 16 +- .../lifecycle/AgentClusterLifecycleIT.groovy | 11 +- .../accumulo/AccumuloProviderService.java | 19 ++- .../funtest/HBaseClusterLifecycleIT.groovy | 16 +- .../hbase/funtest/HBaseIntegrationIT.groovy | 5 +- .../providers/hbase/funtest/HBaseLoadIT.groovy | 7 + .../providers/hbase/HBaseClientProvider.java | 6 +- .../providers/hbase/HBaseProviderService.java | 31 +++- .../clusters/sandbox/slider/slider-client.xml | 2 +- 110 files changed, 1350 insertions(+), 416 deletions(-) ----------------------------------------------------------------------
