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/09/17 20:29:52 UTC

[7/7] storm git commit: Merge branch 'STORM-3162' of https://github.com/revans2/incubator-storm into STORM-3162

Merge branch 'STORM-3162' of https://github.com/revans2/incubator-storm into STORM-3162

STORM-3162: Cleanup heartbeats cache and make it thread safe

This closes #2836


Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/83fea15d
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/83fea15d
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/83fea15d

Branch: refs/heads/master
Commit: 83fea15d7bf240453d35a18958bece29df5489c9
Parents: eaed3cb 4c1ba85
Author: Robert Evans <ev...@yahoo-inc.com>
Authored: Mon Sep 17 15:02:58 2018 -0500
Committer: Robert Evans <ev...@yahoo-inc.com>
Committed: Mon Sep 17 15:02:58 2018 -0500

----------------------------------------------------------------------
 storm-client/pom.xml                            |    2 +-
 .../org/apache/storm/daemon/worker/Worker.java  |   10 +-
 .../jvm/org/apache/storm/executor/Executor.java |    8 +-
 .../storm/executor/bolt/BoltExecutor.java       |    4 +-
 .../storm/executor/spout/SpoutExecutor.java     |    4 +-
 .../apache/storm/stats/BoltExecutorStats.java   |   10 +-
 .../org/apache/storm/stats/ClientStatsUtil.java |  202 ++
 .../jvm/org/apache/storm/stats/StatsUtil.java   | 2610 ------------------
 .../test/clj/org/apache/storm/nimbus_test.clj   |   24 +-
 storm-server/pom.xml                            |    2 +-
 .../storm/daemon/nimbus/HeartbeatCache.java     |  218 ++
 .../org/apache/storm/daemon/nimbus/Nimbus.java  |   83 +-
 .../java/org/apache/storm/stats/StatsUtil.java  | 2385 ++++++++++++++++
 13 files changed, 2851 insertions(+), 2711 deletions(-)
----------------------------------------------------------------------