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/04/11 21:57:13 UTC

[1/3] storm git commit: [STORM-1687] divide by zero in StatsUtil

Repository: storm
Updated Branches:
  refs/heads/master f48d7941b -> eadc7c4b5


[STORM-1687] divide by zero in StatsUtil


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

Branch: refs/heads/master
Commit: 44343318a116b8d546df3dedadc2bbea427ae3eb
Parents: 4ed28c1
Author: zhuol <zh...@yahoo-inc.com>
Authored: Tue Apr 5 20:03:02 2016 -0500
Committer: zhuol <zh...@yahoo-inc.com>
Committed: Tue Apr 5 20:03:02 2016 -0500

----------------------------------------------------------------------
 storm-core/src/jvm/org/apache/storm/stats/StatsUtil.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/storm/blob/44343318/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..ce6698d 100644
--- a/storm-core/src/jvm/org/apache/storm/stats/StatsUtil.java
+++ b/storm-core/src/jvm/org/apache/storm/stats/StatsUtil.java
@@ -2136,7 +2136,7 @@ public class StatsUtil {
      * </pre>
      */
     private static double computeAggCapacity(Map m, Integer uptime) {
-        if (uptime != null) {
+        if (uptime != null && uptime != 0) {
             Map execAvg = (Map) ((Map) getByKey(m, EXEC_LATENCIES)).get(TEN_MIN_IN_SECONDS_STR);
             Map exec = (Map) ((Map) getByKey(m, EXECUTED)).get(TEN_MIN_IN_SECONDS_STR);

[2/3] storm git commit: Merge branch 'STORM-1687' of https://github.com/zhuoliu/storm into STORM-1687

Posted by bo...@apache.org.
Merge branch 'STORM-1687' of https://github.com/zhuoliu/storm into STORM-1687

STORM-1687: divide by zero in StatsUtil


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

Branch: refs/heads/master
Commit: 3b8bc85bd36fd31ca8d4d8874e8f91c2dd581e9a
Parents: f48d794 4434331
Author: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Authored: Mon Apr 11 09:52:54 2016 -0500
Committer: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Committed: Mon Apr 11 09:52:54 2016 -0500

----------------------------------------------------------------------
 storm-core/src/jvm/org/apache/storm/stats/StatsUtil.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------

[3/3] storm git commit: added STORM-1687 to Changelog.

Posted by bo...@apache.org.
added STORM-1687 to Changelog.


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

Branch: refs/heads/master
Commit: eadc7c4b565b6fac0a75f586fe7a3250966846e3
Parents: 3b8bc85
Author: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Authored: Mon Apr 11 09:53:19 2016 -0500
Committer: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Committed: Mon Apr 11 09:53:19 2016 -0500

----------------------------------------------------------------------
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/storm/blob/eadc7c4b/CHANGELOG.md
----------------------------------------------------------------------
diff --git a/CHANGELOG.md b/CHANGELOG.md
index d8bae07..5ee5e2e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,5 @@
 ## 2.0.0
+ * STORM-1687: divide by zero in StatsUtil
  * STORM-1464: storm-hdfs support for multiple file outputs
  * STORM-515: Clojure documentation and examples
  * STORM-1279: port backtype.storm.daemon.supervisor to java