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 2018/02/01 20:53:39 UTC
[4/4] storm git commit: Merge branch 'STORM-2910' of
https://github.com/revans2/incubator-storm into STORM-2910
Merge branch 'STORM-2910' of https://github.com/revans2/incubator-storm into STORM-2910
STORM-2910: Fix metrics reporting from supervisor
This closes #2534
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/abf0f8a2
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/abf0f8a2
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/abf0f8a2
Branch: refs/heads/master
Commit: abf0f8a22b665117c88e2b2dccdc588d72f12403
Parents: d68416b 77be31b
Author: Robert Evans <ev...@yahoo-inc.com>
Authored: Thu Feb 1 12:44:06 2018 -0600
Committer: Robert Evans <ev...@yahoo-inc.com>
Committed: Thu Feb 1 12:44:06 2018 -0600
----------------------------------------------------------------------
.../java/org/apache/storm/LocalCluster.java | 13 ++++-
.../storm/daemon/supervisor/Container.java | 18 +++---
.../daemon/supervisor/OnlyLatestExecutor.java | 60 ++++++++++++++++++++
.../daemon/supervisor/ReadClusterState.java | 6 +-
.../apache/storm/daemon/supervisor/Slot.java | 33 ++++++-----
.../storm/daemon/supervisor/Supervisor.java | 16 +++++-
.../storm/daemon/supervisor/SlotTest.java | 15 +++--
7 files changed, 129 insertions(+), 32 deletions(-)
----------------------------------------------------------------------