From 702127d49d7a65844ca2cd74036c360a7d71922c Mon Sep 17 00:00:00 2001 From: darthbear Date: Fri, 9 May 2014 20:47:03 -0400 Subject: [PATCH 1/2] added validation to registermetrics to have timebucketSizeInSecs >= 1 --- storm-core/src/jvm/backtype/storm/task/TopologyContext.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/storm-core/src/jvm/backtype/storm/task/TopologyContext.java b/storm-core/src/jvm/backtype/storm/task/TopologyContext.java index 1dd6b7db6f2..1ce59f77779 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 T registerMetric(String name, T metric, int timeBucke 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)) { From e9f9e5fdefe44b1862da026f0081de641a9b4fcb Mon Sep 17 00:00:00 2001 From: darthbear Date: Mon, 12 May 2014 20:44:39 -0400 Subject: [PATCH 2/2] throw IllegalArgumentException if timeBucketSizeInSecs <= 0 --- storm-core/src/jvm/backtype/storm/task/TopologyContext.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/storm-core/src/jvm/backtype/storm/task/TopologyContext.java b/storm-core/src/jvm/backtype/storm/task/TopologyContext.java index 1ce59f77779..067932c8f49 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 T registerMetric(String name, T metric, int timeBucke } 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;