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 2014/05/13 17:11:47 UTC
[1/4] git commit: added validation to registermetrics to have
timebucketSizeInSecs >= 1
Repository: incubator-storm
Updated Branches:
refs/heads/master 9902c9d4e -> 5df89d54d
added validation to registermetrics to have timebucketSizeInSecs >= 1
Project: http://git-wip-us.apache.org/repos/asf/incubator-storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-storm/commit/702127d4
Tree: http://git-wip-us.apache.org/repos/asf/incubator-storm/tree/702127d4
Diff: http://git-wip-us.apache.org/repos/asf/incubator-storm/diff/702127d4
Branch: refs/heads/master
Commit: 702127d49d7a65844ca2cd74036c360a7d71922c
Parents: b612a86
Author: darthbear <fr...@gmail.com>
Authored: Fri May 9 20:47:03 2014 -0400
Committer: darthbear <fr...@gmail.com>
Committed: Fri May 9 20:47:03 2014 -0400
----------------------------------------------------------------------
storm-core/src/jvm/backtype/storm/task/TopologyContext.java | 5 +++++
1 file changed, 5 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-storm/blob/702127d4/storm-core/src/jvm/backtype/storm/task/TopologyContext.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/backtype/storm/task/TopologyContext.java b/storm-core/src/jvm/backtype/storm/task/TopologyContext.java
index 1dd6b7d..1ce59f7 100644
--- a/storm-core/src/jvm/backtype/storm/task/TopologyContext.java
+++ b/storm-core/src/jvm/backtype/storm/task/TopologyContext.java
@@ -234,6 +234,11 @@ public class TopologyContext extends WorkerTopologyContext implements IMetricsCo
if (metric == null) {
throw new IllegalArgumentException("Cannot register a null metric");
}
+
+ if (timeBucketSizeInSecs <= 0) {
+ throw new RuntimeException("TopologyContext.registerMetric can only be called with timeBucketSizeInSecs " +
+ "greater than or equal to 1 second.");
+ }
Map m1 = _registeredMetrics;
if(!m1.containsKey(timeBucketSizeInSecs)) {
[4/4] git commit: Added STORM-316 to Changelog
Posted by bo...@apache.org.
Added STORM-316 to Changelog
Project: http://git-wip-us.apache.org/repos/asf/incubator-storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-storm/commit/5df89d54
Tree: http://git-wip-us.apache.org/repos/asf/incubator-storm/tree/5df89d54
Diff: http://git-wip-us.apache.org/repos/asf/incubator-storm/diff/5df89d54
Branch: refs/heads/master
Commit: 5df89d54d0573995035b74de50b49072b079fe4b
Parents: 0a3b474
Author: Robert (Bobby) Evans <bo...@apache.org>
Authored: Tue May 13 15:09:50 2014 +0000
Committer: Robert (Bobby) Evans <bo...@apache.org>
Committed: Tue May 13 15:09:50 2014 +0000
----------------------------------------------------------------------
CHANGELOG.md | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-storm/blob/5df89d54/CHANGELOG.md
----------------------------------------------------------------------
diff --git a/CHANGELOG.md b/CHANGELOG.md
index fa27264..250380d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,5 @@
## 0.9.2-incubating (unreleased)
+ * STORM-316: added validation to registermetrics to have timebucketSizeInSecs >= 1
* STORM-315: Added progress bar when submitting topology
* STORM-214: Windows: storm.cmd does not properly handle multiple -c arguments
* STORM-306: Add security documentation
[3/4] git commit: Merge branch 'registermetrics-validation' of
https://github.com/darthbear/incubator-storm into STORM-316
Posted by bo...@apache.org.
Merge branch 'registermetrics-validation' of https://github.com/darthbear/incubator-storm into STORM-316
STORM-316: added validation to registermetrics to have timebucketSizeInSecs >= 1
Project: http://git-wip-us.apache.org/repos/asf/incubator-storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-storm/commit/0a3b4740
Tree: http://git-wip-us.apache.org/repos/asf/incubator-storm/tree/0a3b4740
Diff: http://git-wip-us.apache.org/repos/asf/incubator-storm/diff/0a3b4740
Branch: refs/heads/master
Commit: 0a3b474063cf83fe63feb6b2874b40161539d0b4
Parents: 9902c9d e9f9e5f
Author: Robert (Bobby) Evans <bo...@apache.org>
Authored: Tue May 13 15:09:26 2014 +0000
Committer: Robert (Bobby) Evans <bo...@apache.org>
Committed: Tue May 13 15:09:26 2014 +0000
----------------------------------------------------------------------
storm-core/src/jvm/backtype/storm/task/TopologyContext.java | 5 +++++
1 file changed, 5 insertions(+)
----------------------------------------------------------------------
[2/4] git commit: throw IllegalArgumentException if
timeBucketSizeInSecs <= 0
Posted by bo...@apache.org.
throw IllegalArgumentException if timeBucketSizeInSecs <= 0
Project: http://git-wip-us.apache.org/repos/asf/incubator-storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-storm/commit/e9f9e5fd
Tree: http://git-wip-us.apache.org/repos/asf/incubator-storm/tree/e9f9e5fd
Diff: http://git-wip-us.apache.org/repos/asf/incubator-storm/diff/e9f9e5fd
Branch: refs/heads/master
Commit: e9f9e5fdefe44b1862da026f0081de641a9b4fcb
Parents: 702127d
Author: darthbear <fr...@gmail.com>
Authored: Mon May 12 20:44:39 2014 -0400
Committer: darthbear <fr...@gmail.com>
Committed: Mon May 12 20:44:39 2014 -0400
----------------------------------------------------------------------
storm-core/src/jvm/backtype/storm/task/TopologyContext.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-storm/blob/e9f9e5fd/storm-core/src/jvm/backtype/storm/task/TopologyContext.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/backtype/storm/task/TopologyContext.java b/storm-core/src/jvm/backtype/storm/task/TopologyContext.java
index 1ce59f7..067932c 100644
--- a/storm-core/src/jvm/backtype/storm/task/TopologyContext.java
+++ b/storm-core/src/jvm/backtype/storm/task/TopologyContext.java
@@ -236,8 +236,8 @@ public class TopologyContext extends WorkerTopologyContext implements IMetricsCo
}
if (timeBucketSizeInSecs <= 0) {
- throw new RuntimeException("TopologyContext.registerMetric can only be called with timeBucketSizeInSecs " +
- "greater than or equal to 1 second.");
+ throw new IllegalArgumentException("TopologyContext.registerMetric can only be called with timeBucketSizeInSecs " +
+ "greater than or equal to 1 second.");
}
Map m1 = _registeredMetrics;