Merge branch 'develop' into feature/SLIDER-153_add_slider_py_command
Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/e519fbcc Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/e519fbcc Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/e519fbcc Branch: refs/heads/feature/SLIDER-151_Implement_full_slider_API_in_REST_and_switch_client_to_it Commit: e519fbcc645894541bdf93d1fef9ceba36ded847 Parents: 19d313d 537d87c Author: Steve Loughran <ste...@apache.org> Authored: Mon Jun 23 13:33:20 2014 -0700 Committer: Steve Loughran <ste...@apache.org> Committed: Mon Jun 23 13:33:20 2014 -0700 ---------------------------------------------------------------------- app-packages/hbase-v0_96/README.txt | 33 -- app-packages/hbase-v0_96/appConfig.json | 67 ---- .../hbase-v0_96/configuration/global.xml | 160 -------- .../hbase-v0_96/configuration/hbase-log4j.xml | 142 -------- .../hbase-v0_96/configuration/hbase-policy.xml | 53 --- .../hbase-v0_96/configuration/hbase-site.xml | 365 ------------------- app-packages/hbase-v0_96/ganglia_metrics.json | 38 -- app-packages/hbase-v0_96/jmx_metrics.json | 56 --- app-packages/hbase-v0_96/metainfo.xml | 109 ------ .../hbase-0.96.1-hadoop2-bin.tar.gz.REPLACE | 16 - .../hbase-v0_96/package/scripts/__init__.py | 19 - .../hbase-v0_96/package/scripts/functions.py | 40 -- .../hbase-v0_96/package/scripts/hbase.py | 125 ------- .../hbase-v0_96/package/scripts/hbase_client.py | 43 --- .../hbase-v0_96/package/scripts/hbase_master.py | 63 ---- .../package/scripts/hbase_regionserver.py | 66 ---- .../package/scripts/hbase_service.py | 45 --- .../hbase-v0_96/package/scripts/params.py | 109 ------ .../package/scripts/status_params.py | 26 -- ...-metrics2-hbase.properties-GANGLIA-MASTER.j2 | 62 ---- ...doop-metrics2-hbase.properties-GANGLIA-RS.j2 | 62 ---- .../package/templates/hbase-env.sh.j2 | 81 ---- .../package/templates/hbase_client_jaas.conf.j2 | 22 -- .../package/templates/hbase_master_jaas.conf.j2 | 25 -- .../templates/hbase_regionserver_jaas.conf.j2 | 25 -- .../package/templates/regionservers.j2 | 20 - app-packages/hbase-v0_96/resources.json | 19 - app-packages/hbase/README.txt | 8 +- slider-agent/conf/agent.ini | 2 + .../src/main/python/agent/AgentConfig.py | 21 ++ slider-agent/src/main/python/agent/Constants.py | 3 + .../src/main/python/agent/Controller.py | 23 +- slider-agent/src/main/python/agent/main.py | 4 + .../src/test/python/agent/TestController.py | 30 ++ slider-agent/src/test/python/agent/TestMain.py | 5 +- .../providers/AbstractProviderService.java | 15 +- .../slider/providers/ProviderService.java | 5 +- .../slider/providers/agent/AgentKeys.java | 3 + .../providers/agent/AgentLaunchParameter.java | 130 +++++++ .../providers/agent/AgentProviderService.java | 179 +++++++-- .../slider/providers/agent/AgentRoles.java | 18 +- .../apache/slider/providers/agent/Command.java | 13 +- .../slider/providers/agent/CommandResult.java | 16 +- .../providers/agent/ComponentInstanceState.java | 24 ++ .../slider/providers/agent/ContainerState.java | 41 +++ .../providers/agent/HeartbeatMonitor.java | 116 ++++++ .../server/appmaster/AMViewForProviders.java | 27 ++ .../server/appmaster/SliderAppMaster.java | 32 +- .../slider/server/appmaster/state/AppState.java | 20 + .../services/workflow/ForkedProcessService.java | 25 +- .../services/workflow/LongLivedProcess.java | 13 + .../test_command_log/appConfig_fast_no_reg.json | 29 ++ .../test_command_log/appConfig_no_hb.json | 29 ++ .../model/mock/MockProviderService.groovy | 4 +- .../agent/TestAgentLaunchParameter.java | 76 ++++ .../providers/agent/TestHeartbeatMonitor.java | 136 +++++++ .../publisher/TestAgentProviderService.java | 5 +- .../TestWorkflowForkedProcessService.java | 3 +- .../lifecycle/AgentCommandTestBase.groovy | 100 +++-- .../lifecycle/TestAgentClusterLifecycle.groovy | 2 +- .../funtest/lifecycle/TestAgentFailures.groovy | 103 ++++++ .../funtest/lifecycle/TestAgentFailures2.groovy | 103 ++++++ .../lifecycle/TestAppsThroughAgent.groovy | 90 ++--- .../providers/hbase/HBaseProviderService.java | 13 +- .../slider_specs/creating_app_definitions.md | 80 ++-- 65 files changed, 1349 insertions(+), 2088 deletions(-) ----------------------------------------------------------------------