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/31 20:21:52 UTC
[1/5] storm git commit: STORM-1663: Stats couldn't handle null worker
HB.
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 <ev...@yahoo-inc.com>
Authored: Wed Mar 30 14:01:08 2016 -0500
Committer: Robert (Bobby) Evans <ev...@yahoo-inc.com>
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;
[5/5] storm git commit: Added STORM-1663 STORM-1665 and STORM-1666 to
Changelog
Posted by bo...@apache.org.
Added STORM-1663 STORM-1665 and STORM-1666 to Changelog
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/955b4455
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/955b4455
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/955b4455
Branch: refs/heads/master
Commit: 955b44552e7351ac0171b661b8aa5136a158e05c
Parents: 3ef91b0
Author: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Authored: Thu Mar 31 12:56:32 2016 -0500
Committer: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Committed: Thu Mar 31 12:56:32 2016 -0500
----------------------------------------------------------------------
CHANGELOG.md | 3 +++
1 file changed, 3 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/955b4455/CHANGELOG.md
----------------------------------------------------------------------
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2a54b3b..3462d5d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,7 @@
## 2.0.0
+ * STORM-1663: Stats couldn't handle null worker HB.
+ * STORM-1665: Worker cannot instantiate kryo
+ * STORM-1666: Kill from the UI fails silently
* STORM-1610: port pacemaker_state_factory_test.clj to java
* STORM-1611: port org.apache.storm.pacemaker.pacemaker to java
* STORM-1268: port builtin-metrics to java
[4/5] storm git commit: Merge branch 'STORM-1663' of
https://github.com/revans2/incubator-storm into STORM-1663
Posted by bo...@apache.org.
Merge branch 'STORM-1663' of https://github.com/revans2/incubator-storm into STORM-1663
STORM-1663: Stats couldn't handle null worker HB.
STORM-1665: Worker cannot instantiate kryo
STORM-1666: Kill from the UI fails silently
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/3ef91b0c
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/3ef91b0c
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/3ef91b0c
Branch: refs/heads/master
Commit: 3ef91b0c2d9bba94e4bce8da9d55b4357f7697eb
Parents: d5b80fc f807c80
Author: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Authored: Thu Mar 31 12:55:25 2016 -0500
Committer: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Committed: Thu Mar 31 12:55:25 2016 -0500
----------------------------------------------------------------------
storm-core/pom.xml | 6 -----
.../src/clj/org/apache/storm/daemon/nimbus.clj | 3 ++-
.../jvm/org/apache/storm/stats/StatsUtil.java | 23 +++++++++++---------
3 files changed, 15 insertions(+), 17 deletions(-)
----------------------------------------------------------------------
[2/5] storm git commit: STORM-1665: Worker cannot instantiate kryo
Posted by bo...@apache.org.
STORM-1665: Worker cannot instantiate kryo
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/08eb49e8
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/08eb49e8
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/08eb49e8
Branch: refs/heads/master
Commit: 08eb49e8122f7df607716cc7ed054b368b5b9b50
Parents: ecf4586
Author: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Authored: Wed Mar 30 14:23:06 2016 -0500
Committer: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Committed: Wed Mar 30 14:24:35 2016 -0500
----------------------------------------------------------------------
storm-core/pom.xml | 6 ------
1 file changed, 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/08eb49e8/storm-core/pom.xml
----------------------------------------------------------------------
diff --git a/storm-core/pom.xml b/storm-core/pom.xml
index ddc9b36..a012172 100644
--- a/storm-core/pom.xml
+++ b/storm-core/pom.xml
@@ -54,12 +54,6 @@
<dependency>
<groupId>com.esotericsoftware</groupId>
<artifactId>kryo</artifactId>
- <exclusions>
- <exclusion>
- <groupId>org.objenesis</groupId>
- <artifactId>objenesis</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<!--clojure-->
<dependency>
[3/5] storm git commit: STORM-1666: Kill from the UI fails silently
Posted by bo...@apache.org.
STORM-1666: Kill from the UI fails silently
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/f807c80d
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/f807c80d
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/f807c80d
Branch: refs/heads/master
Commit: f807c80d9be1179e2d23cbc494aaa25fa57ff602
Parents: 08eb49e
Author: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Authored: Wed Mar 30 14:30:19 2016 -0500
Committer: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Committed: Wed Mar 30 14:30:19 2016 -0500
----------------------------------------------------------------------
storm-core/src/clj/org/apache/storm/daemon/nimbus.clj | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/f807c80d/storm-core/src/clj/org/apache/storm/daemon/nimbus.clj
----------------------------------------------------------------------
diff --git a/storm-core/src/clj/org/apache/storm/daemon/nimbus.clj b/storm-core/src/clj/org/apache/storm/daemon/nimbus.clj
index 8847d0d..743db77 100644
--- a/storm-core/src/clj/org/apache/storm/daemon/nimbus.clj
+++ b/storm-core/src/clj/org/apache/storm/daemon/nimbus.clj
@@ -1885,7 +1885,8 @@
executor-summaries (dofor [[executor [node port]] (:executor->node+port assignment)]
(let [host (-> assignment :node->host (get node))
heartbeat (.get beats (StatsUtil/convertExecutor executor))
- excutorstats (.get (.get heartbeat "heartbeat") "stats")
+ hb (if heartbeat (.get heartbeat "heartbeat"))
+ excutorstats (if hb (.get hb "stats"))
excutorstats (if excutorstats
(StatsUtil/thriftifyExecutorStats excutorstats))]
(doto