You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by ka...@apache.org on 2016/05/16 06:50:31 UTC
[1/3] storm git commit: Filter null executor stats from worker
heartbeat map
Repository: storm
Updated Branches:
refs/heads/master 255911ecb -> f803fc67e
Filter null executor stats from worker heartbeat map
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/3957be54
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/3957be54
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/3957be54
Branch: refs/heads/master
Commit: 3957be5495fbbc79f9c47c4dfa9a3670e7ddb36f
Parents: b743204
Author: Abhishek Agarwal <ab...@inmobi.com>
Authored: Fri Apr 1 16:54:29 2016 +0530
Committer: Abhishek Agarwal <ab...@inmobi.com>
Committed: Fri Apr 1 16:54:29 2016 +0530
----------------------------------------------------------------------
.../jvm/org/apache/storm/stats/StatsUtil.java | 21 +++++++++++---------
1 file changed, 12 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/3957be54/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 b6b7b6f..2d9f250 100644
--- a/storm-core/src/jvm/org/apache/storm/stats/StatsUtil.java
+++ b/storm-core/src/jvm/org/apache/storm/stats/StatsUtil.java
@@ -18,13 +18,7 @@
package org.apache.storm.stats;
import com.google.common.collect.Lists;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
+
import org.apache.storm.cluster.ExecutorBeat;
import org.apache.storm.cluster.IStormClusterState;
import org.apache.storm.generated.Bolt;
@@ -53,6 +47,14 @@ import org.apache.storm.utils.Utils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
@SuppressWarnings("unchecked")
public class StatsUtil {
private static final Logger logger = LoggerFactory.getLogger(StatsUtil.class);
@@ -1850,7 +1852,6 @@ public class StatsUtil {
ret.set_storm_id((String) getByKey(heartbeat, "storm-id"));
ret.set_time_secs(getByKeyOr0(heartbeat, TIME_SECS).intValue());
- // Map<List<Integer, Integer>, ExecutorStat>
Map<ExecutorInfo, ExecutorStats> convertedStats = new HashMap<>();
Map<List<Integer>, ExecutorStats> executorStats = getMapByKey(heartbeat, EXECUTOR_STATS);
@@ -1858,7 +1859,9 @@ public class StatsUtil {
for (Map.Entry<List<Integer>, ExecutorStats> entry : executorStats.entrySet()) {
List<Integer> executor = entry.getKey();
ExecutorStats stats = entry.getValue();
- convertedStats.put(new ExecutorInfo(executor.get(0), executor.get(1)), stats);
+ if (null != stats) {
+ convertedStats.put(new ExecutorInfo(executor.get(0), executor.get(1)), stats);
+ }
}
}
ret.set_executor_stats(convertedStats);
[2/3] storm git commit: Merge branch 'stat-util' of
https://github.com/abhishekagarwal87/storm into STORM-1676
Posted by ka...@apache.org.
Merge branch 'stat-util' of https://github.com/abhishekagarwal87/storm into STORM-1676
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/0f5d6fd1
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/0f5d6fd1
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/0f5d6fd1
Branch: refs/heads/master
Commit: 0f5d6fd12deb1a11a4654057a296f88f904e874f
Parents: 255911e 3957be5
Author: Jungtaek Lim <ka...@gmail.com>
Authored: Mon May 16 15:36:12 2016 +0900
Committer: Jungtaek Lim <ka...@gmail.com>
Committed: Mon May 16 15:36:12 2016 +0900
----------------------------------------------------------------------
.../jvm/org/apache/storm/stats/StatsUtil.java | 21 +++++++++++---------
1 file changed, 12 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/0f5d6fd1/storm-core/src/jvm/org/apache/storm/stats/StatsUtil.java
----------------------------------------------------------------------
diff --cc storm-core/src/jvm/org/apache/storm/stats/StatsUtil.java
index bbd3cdf,2d9f250..c9cfc0f
--- a/storm-core/src/jvm/org/apache/storm/stats/StatsUtil.java
+++ b/storm-core/src/jvm/org/apache/storm/stats/StatsUtil.java
@@@ -53,9 -47,17 +47,17 @@@ import org.apache.storm.utils.Utils
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+ import java.util.ArrayList;
+ import java.util.HashMap;
+ import java.util.HashSet;
+ import java.util.Iterator;
+ import java.util.List;
+ import java.util.Map;
+ import java.util.Set;
+
@SuppressWarnings("unchecked")
public class StatsUtil {
- private static final Logger logger = LoggerFactory.getLogger(StatsUtil.class);
+ private static final Logger LOG = LoggerFactory.getLogger(StatsUtil.class);
public static final String TYPE = "type";
public static final String SPOUT = "spout";
[3/3] storm git commit: add STORM-1676 to CHANGELOG.md
Posted by ka...@apache.org.
add STORM-1676 to CHANGELOG.md
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/f803fc67
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/f803fc67
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/f803fc67
Branch: refs/heads/master
Commit: f803fc67ea5f52b9ceebd749fb3a17a079b1e152
Parents: 0f5d6fd
Author: Jungtaek Lim <ka...@gmail.com>
Authored: Mon May 16 15:50:05 2016 +0900
Committer: Jungtaek Lim <ka...@gmail.com>
Committed: Mon May 16 15:50:05 2016 +0900
----------------------------------------------------------------------
CHANGELOG.md | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/f803fc67/CHANGELOG.md
----------------------------------------------------------------------
diff --git a/CHANGELOG.md b/CHANGELOG.md
index a956e66..492be32 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,5 @@
## 2.0.0
+ * STORM-1676: Filter null executor stats from worker heartbeat map
* STORM-1672: Stats not get class cast exception
* STORM-1739: update the minor JAVA version dependency in 0.10.0 and above
* STORM-1733: Flush stdout before calling "os.execvp" to prevent log loss