Merge branch 'feature/SLIDER_126_handle_heartbeat_failures' 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/45f5d796 Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/45f5d796 Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/45f5d796 Branch: refs/heads/feature/SLIDER-153_add_slider_py_command Commit: 45f5d7968d03f24c9d6f1af03f9afb4c1925e8c7 Parents: 1a8062e 3aca57d Author: Sumit Mohanty <smoha...@hortonworks.com> Authored: Sat Jun 21 18:22:00 2014 -0700 Committer: Sumit Mohanty <smoha...@hortonworks.com> Committed: Sat Jun 21 18:22:00 2014 -0700 ---------------------------------------------------------------------- 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 +++ .../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 +- .../lifecycle/AgentCommandTestBase.groovy | 100 ++++++++--- .../lifecycle/TestAgentClusterLifecycle.groovy | 2 +- .../funtest/lifecycle/TestAgentFailures.groovy | 103 +++++++++++ .../funtest/lifecycle/TestAgentFailures2.groovy | 103 +++++++++++ .../lifecycle/TestAppsThroughAgent.groovy | 90 ++++------ 32 files changed, 1253 insertions(+), 151 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/45f5d796/slider-core/src/main/java/org/apache/slider/providers/AbstractProviderService.java ----------------------------------------------------------------------