Repository: storm Updated Branches: refs/heads/master d5b80fcca -> 955b44552
STORM-1663: Stats couldn't handle null worker HB. Project: http://git-wip-us.apache.org/repos/asf/storm/repo Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/ecf4586b Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/ecf4586b Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/ecf4586b Branch: refs/heads/master Commit: ecf4586bc8f32b2c253c134ed0e7380b0a3f917a Parents: e14f429 Author: Robert (Bobby) Evans <[email protected]> Authored: Wed Mar 30 14:01:08 2016 -0500 Committer: Robert (Bobby) Evans <[email protected]> Committed: Wed Mar 30 14:23:31 2016 -0500 ---------------------------------------------------------------------- .../jvm/org/apache/storm/stats/StatsUtil.java | 23 +++++++++++--------- 1 file changed, 13 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/storm/blob/ecf4586b/storm-core/src/jvm/org/apache/storm/stats/StatsUtil.java ---------------------------------------------------------------------- diff --git a/storm-core/src/jvm/org/apache/storm/stats/StatsUtil.java b/storm-core/src/jvm/org/apache/storm/stats/StatsUtil.java index 253ce2f..b6b7b6f 100644 --- a/storm-core/src/jvm/org/apache/storm/stats/StatsUtil.java +++ b/storm-core/src/jvm/org/apache/storm/stats/StatsUtil.java @@ -1505,17 +1505,20 @@ public class StatsUtil { putKV(m, HOST, host); putKV(m, PORT, port); - Map stats = getMapByKey(getMapByKey(beat, (HEARTBEAT)), STATS); - putKV(m, UPTIME, getMapByKey(beat, HEARTBEAT).get(UPTIME)); - putKV(m, STATS, stats); - - String type = componentType(topology, compId); - if (type != null) { - putKV(m, TYPE, type); - } else { - putKV(m, TYPE, stats.get(TYPE)); + Map hb = getMapByKey(beat, HEARTBEAT); + if (hb != null) { + Map stats = getMapByKey(hb, STATS); + putKV(m, UPTIME, hb.get(UPTIME)); + putKV(m, STATS, stats); + + String type = componentType(topology, compId); + if (type != null) { + putKV(m, TYPE, type); + } else { + putKV(m, TYPE, stats.get(TYPE)); + } + ret.add(m); } - ret.add(m); } } return ret;
