You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by aa...@apache.org on 2015/10/09 04:11:20 UTC
hadoop git commit: HADOOP-11104.
org.apache.hadoop.metrics2.lib.MetricsRegistry needs numerical parameter
checking. Contributed by Ray Chiang.
Repository: hadoop
Updated Branches:
refs/heads/trunk 584cf3bb3 -> e1bf8b3df
HADOOP-11104. org.apache.hadoop.metrics2.lib.MetricsRegistry needs numerical parameter checking. Contributed by Ray Chiang.
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/e1bf8b3d
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/e1bf8b3d
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/e1bf8b3d
Branch: refs/heads/trunk
Commit: e1bf8b3df6f019b92a3dad37c977f40397324e75
Parents: 584cf3b
Author: Akira Ajisaka <aa...@apache.org>
Authored: Fri Oct 9 11:10:29 2015 +0900
Committer: Akira Ajisaka <aa...@apache.org>
Committed: Fri Oct 9 11:10:29 2015 +0900
----------------------------------------------------------------------
hadoop-common-project/hadoop-common/CHANGES.txt | 3 +++
.../apache/hadoop/metrics2/lib/MetricsRegistry.java | 9 +++++++--
.../hadoop/metrics2/lib/TestMetricsRegistry.java | 16 ++++++++++++++++
3 files changed, 26 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/e1bf8b3d/hadoop-common-project/hadoop-common/CHANGES.txt
----------------------------------------------------------------------
diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt
index 3eb106f..9d954d0 100644
--- a/hadoop-common-project/hadoop-common/CHANGES.txt
+++ b/hadoop-common-project/hadoop-common/CHANGES.txt
@@ -876,6 +876,9 @@ Release 2.8.0 - UNRELEASED
HADOOP-12350. WASB Logging: Improve WASB Logging around deletes, reads and
writes (Dushyanth via cnauroth)
+ HADOOP-11104. org.apache.hadoop.metrics2.lib.MetricsRegistry needs numerical
+ parameter checking. (Ray Chiang via aajisaka)
+
OPTIMIZATIONS
HADOOP-11785. Reduce the number of listStatus operation in distcp
http://git-wip-us.apache.org/repos/asf/hadoop/blob/e1bf8b3d/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/lib/MetricsRegistry.java
----------------------------------------------------------------------
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/lib/MetricsRegistry.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/lib/MetricsRegistry.java
index 4b561f2..6e7e5ab 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/lib/MetricsRegistry.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/lib/MetricsRegistry.java
@@ -188,16 +188,21 @@ public class MetricsRegistry {
* @param valueName of the metric (e.g., "Time" or "Latency")
* @param interval rollover interval of estimator in seconds
* @return a new quantile estimator object
+ * @throws MetricsException if interval is not a positive integer
*/
public synchronized MutableQuantiles newQuantiles(String name, String desc,
String sampleName, String valueName, int interval) {
checkMetricName(name);
- MutableQuantiles ret =
+ if (interval <= 0) {
+ throw new MetricsException("Interval should be positive. Value passed" +
+ " is: " + interval);
+ }
+ MutableQuantiles ret =
new MutableQuantiles(name, desc, sampleName, valueName, interval);
metricsMap.put(name, ret);
return ret;
}
-
+
/**
* Create a mutable metric with stats
* @param name of the metric
http://git-wip-us.apache.org/repos/asf/hadoop/blob/e1bf8b3d/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/metrics2/lib/TestMetricsRegistry.java
----------------------------------------------------------------------
diff --git a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/metrics2/lib/TestMetricsRegistry.java b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/metrics2/lib/TestMetricsRegistry.java
index af1ff96..d916928 100644
--- a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/metrics2/lib/TestMetricsRegistry.java
+++ b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/metrics2/lib/TestMetricsRegistry.java
@@ -122,6 +122,22 @@ public class TestMetricsRegistry {
});
}
+ /**
+ * Test adding illegal parameters
+ */
+ @Test
+ public void testAddIllegalParameters() {
+ final MetricsRegistry r = new MetricsRegistry("IllegalParamTest");
+
+ expectMetricsException("Interval should be positive. Value passed is: -20",
+ new Runnable() {
+ @Override
+ public void run() {
+ r.newQuantiles("q1", "New Quantile 1", "qq1", "qv1", (int)-20);
+ }
+ });
+ }
+
@Ignore
private void expectMetricsException(String prefix, Runnable fun) {
try {