Merge branch 'supervisor' of https://github.com/hustfxj/storm into STORM-1279
STORM-1279: port backtype.storm.daemon.supervisor to java Project: http://git-wip-us.apache.org/repos/asf/storm/repo Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/20d05e30 Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/20d05e30 Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/20d05e30 Branch: refs/heads/master Commit: 20d05e30f956b2905a0816d5dc6aad79dfc2d75f Parents: b743204 ac9942c Author: Robert (Bobby) Evans <[email protected]> Authored: Fri Apr 1 08:18:52 2016 -0500 Committer: Robert (Bobby) Evans <[email protected]> Committed: Fri Apr 1 08:18:52 2016 -0500 ---------------------------------------------------------------------- bin/storm.cmd | 2 +- bin/storm.py | 2 +- conf/defaults.yaml | 4 + .../org/apache/storm/command/kill_workers.clj | 20 +- .../apache/storm/daemon/local_supervisor.clj | 64 + .../clj/org/apache/storm/daemon/logviewer.clj | 6 +- .../clj/org/apache/storm/daemon/supervisor.clj | 1391 ------------------ storm-core/src/clj/org/apache/storm/testing.clj | 64 +- storm-core/src/jvm/org/apache/storm/Config.java | 7 + .../DefaultUncaughtExceptionHandler.java | 31 + .../supervisor/EventManagerPushCallback.java | 37 + .../daemon/supervisor/StandaloneSupervisor.java | 83 ++ .../apache/storm/daemon/supervisor/State.java | 22 + .../storm/daemon/supervisor/StateHeartbeat.java | 45 + .../storm/daemon/supervisor/Supervisor.java | 177 +++ .../daemon/supervisor/SupervisorDaemon.java | 28 + .../storm/daemon/supervisor/SupervisorData.java | 234 +++ .../daemon/supervisor/SupervisorManager.java | 92 ++ .../daemon/supervisor/SupervisorUtils.java | 286 ++++ .../daemon/supervisor/SyncProcessEvent.java | 427 ++++++ .../daemon/supervisor/SyncSupervisorEvent.java | 633 ++++++++ .../supervisor/timer/RunProfilerActions.java | 211 +++ .../supervisor/timer/SupervisorHealthCheck.java | 52 + .../supervisor/timer/SupervisorHeartbeat.java | 87 ++ .../daemon/supervisor/timer/UpdateBlobs.java | 105 ++ .../workermanager/DefaultWorkerManager.java | 401 +++++ .../workermanager/IWorkerManager.java | 35 + .../storm/metric/StormMetricsRegistry.java | 2 +- .../staticmocking/MockedSupervisorUtils.java | 31 + .../src/jvm/org/apache/storm/utils/Utils.java | 4 +- .../clj/org/apache/storm/logviewer_test.clj | 36 +- .../clj/org/apache/storm/supervisor_test.clj | 327 ++-- 32 files changed, 3359 insertions(+), 1587 deletions(-) ----------------------------------------------------------------------
