You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by bo...@apache.org on 2016/03/01 20:17:19 UTC
[2/3] storm git commit: Merge branch 'Storm-1574-1.x-branch' of
https://github.com/zhuoliu/storm into STORM-1574
Merge branch 'Storm-1574-1.x-branch' of https://github.com/zhuoliu/storm into STORM-1574
STORM-1574: Better handle backpressure exception etc.
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/5c69d47a
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/5c69d47a
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/5c69d47a
Branch: refs/heads/1.x-branch
Commit: 5c69d47aa4916db31b4e7f97d17419cb19fedd7e
Parents: f665cf2 32721e8
Author: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Authored: Tue Mar 1 12:56:13 2016 -0600
Committer: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Committed: Tue Mar 1 12:56:13 2016 -0600
----------------------------------------------------------------------
storm-core/src/clj/org/apache/storm/cluster.clj | 7 ++-
.../src/clj/org/apache/storm/daemon/nimbus.clj | 6 ++-
.../src/clj/org/apache/storm/daemon/worker.clj | 8 ++--
.../storm/utils/WorkerBackpressureCallback.java | 3 +-
.../storm/utils/WorkerBackpressureThread.java | 38 +++++++++++----
.../utils/WorkerBackpressureThreadTest.java | 50 ++++++++++++++++++++
6 files changed, 96 insertions(+), 16 deletions(-)
----------------------------------------------------------------------