Merge branch 'STORM-2744' of https://github.com/Ethanlm/storm into STORM-2744
STORM-2744: add in restart timeout for backpressure This closes #2338 Project: http://git-wip-us.apache.org/repos/asf/storm/repo Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/db510ae5 Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/db510ae5 Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/db510ae5 Branch: refs/heads/master Commit: db510ae588f6cf2547c8c4c4b220b53f9db912d0 Parents: d2e221a de0118d Author: Robert Evans <[email protected]> Authored: Fri Sep 22 12:10:07 2017 -0500 Committer: Robert Evans <[email protected]> Committed: Fri Sep 22 12:10:07 2017 -0500 ---------------------------------------------------------------------- conf/defaults.yaml | 2 + .../src/jvm/org/apache/storm/Config.java | 17 ++++++ .../org/apache/storm/cluster/ClusterUtils.java | 10 ++++ .../storm/cluster/IStormClusterState.java | 4 +- .../storm/cluster/StormClusterStateImpl.java | 60 ++++++++++++-------- .../org/apache/storm/daemon/worker/Worker.java | 58 ++++++++++++------- .../apache/storm/daemon/worker/WorkerState.java | 10 +++- 7 files changed, 111 insertions(+), 50 deletions(-) ----------------------------------------------------------------------
