Author: todd
Date: Mon Feb 13 21:00:37 2012
New Revision: 1243691
URL: http://svn.apache.org/viewvc?rev=1243691&view=rev
Log:
Merge trunk into HA branch.
Some conflicts around TestBlockRecovery: mocking changed for new heartbeat
types/responses
Added:
hadoop/common/branches/HDFS-1623/hadoop-common-project/hadoop-common/src/main/conf/core-site.xml
- copied unchanged from r1243679,
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/conf/core-site.xml
Modified:
hadoop/common/branches/HDFS-1623/hadoop-common-project/hadoop-common/CHANGES.txt
(contents, props changed)
hadoop/common/branches/HDFS-1623/hadoop-common-project/hadoop-common/src/main/docs/
(props changed)
hadoop/common/branches/HDFS-1623/hadoop-common-project/hadoop-common/src/main/java/
(props changed)
hadoop/common/branches/HDFS-1623/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/util/SampleStat.java
hadoop/common/branches/HDFS-1623/hadoop-common-project/hadoop-common/src/test/core/
(props changed)
hadoop/common/branches/HDFS-1623/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/metrics2/util/TestSampleStat.java
Modified:
hadoop/common/branches/HDFS-1623/hadoop-common-project/hadoop-common/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-1623/hadoop-common-project/hadoop-common/CHANGES.txt?rev=1243691&r1=1243690&r2=1243691&view=diff
==============================================================================
---
hadoop/common/branches/HDFS-1623/hadoop-common-project/hadoop-common/CHANGES.txt
(original)
+++
hadoop/common/branches/HDFS-1623/hadoop-common-project/hadoop-common/CHANGES.txt
Mon Feb 13 21:00:37 2012
@@ -174,6 +174,14 @@ Release 0.23.2 - UNRELEASED
HADOOP-8035 Hadoop Maven site is inefficient and runs phases redundantly
(abayer via tucu)
+ HADOOP-8051 HttpFS documentation it is not wired to the generated site
(tucu)
+
+ HADOOP-8055. Hadoop tarball distribution lacks a core-site.xml (harsh)
+
+ HADOOP-8052. Hadoop Metrics2 should emit Float.MAX_VALUE (instead of
+ Double.MAX_VALUE) to avoid making Ganglia's gmetad core. (Varun Kapoor
+ via mattf)
+
Release 0.23.1 - 2012-02-08
INCOMPATIBLE CHANGES
Propchange:
hadoop/common/branches/HDFS-1623/hadoop-common-project/hadoop-common/CHANGES.txt
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Feb 13 21:00:37 2012
@@ -1,5 +1,6 @@
+/hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/CHANGES.txt:1243206
/hadoop/common/branches/yahoo-merge/CHANGES.txt:1079157,1079163-1079164,1079167
-/hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt:1161333-1242870
+/hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt:1161333-1243679
/hadoop/core/branches/branch-0.18/CHANGES.txt:727226
/hadoop/core/branches/branch-0.19/CHANGES.txt:713112
/hadoop/core/trunk/CHANGES.txt:776175-785643,785929-786278
Propchange:
hadoop/common/branches/HDFS-1623/hadoop-common-project/hadoop-common/src/main/docs/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Feb 13 21:00:37 2012
@@ -1,2 +1,2 @@
-/hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/docs:1152502-1242870
+/hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/docs:1152502-1243679
/hadoop/core/branches/branch-0.19/src/docs:713112
Propchange:
hadoop/common/branches/HDFS-1623/hadoop-common-project/hadoop-common/src/main/java/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Feb 13 21:00:37 2012
@@ -1,3 +1,3 @@
-/hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java:1152502-1242870
+/hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java:1152502-1243679
/hadoop/core/branches/branch-0.19/core/src/java:713112
/hadoop/core/trunk/src/core:776175-785643,785929-786278
Modified:
hadoop/common/branches/HDFS-1623/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/util/SampleStat.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-1623/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/util/SampleStat.java?rev=1243691&r1=1243690&r2=1243691&view=diff
==============================================================================
---
hadoop/common/branches/HDFS-1623/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/util/SampleStat.java
(original)
+++
hadoop/common/branches/HDFS-1623/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/util/SampleStat.java
Mon Feb 13 21:00:37 2012
@@ -143,8 +143,16 @@ public class SampleStat {
@SuppressWarnings("PublicInnerClass")
public static class MinMax {
- private double min = Double.MAX_VALUE;
- private double max = Double.MIN_VALUE;
+ // Float.MAX_VALUE is used rather than Double.MAX_VALUE, even though the
+ // min and max variables are of type double.
+ // Float.MAX_VALUE is big enough, and using Double.MAX_VALUE makes
+ // Ganglia core due to buffer overflow.
+ // The same reasoning applies to the MIN_VALUE counterparts.
+ static final double DEFAULT_MIN_VALUE = Float.MAX_VALUE;
+ static final double DEFAULT_MAX_VALUE = Float.MIN_VALUE;
+
+ private double min = DEFAULT_MIN_VALUE;
+ private double max = DEFAULT_MAX_VALUE;
public void add(double value) {
if (value > max) max = value;
@@ -155,8 +163,8 @@ public class SampleStat {
public double max() { return max; }
public void reset() {
- min = Double.MAX_VALUE;
- max = Double.MIN_VALUE;
+ min = DEFAULT_MIN_VALUE;
+ max = DEFAULT_MAX_VALUE;
}
public void reset(MinMax other) {
Propchange:
hadoop/common/branches/HDFS-1623/hadoop-common-project/hadoop-common/src/test/core/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Feb 13 21:00:37 2012
@@ -1,3 +1,3 @@
-/hadoop/common/trunk/hadoop-common-project/hadoop-common/src/test/core:1152502-1242870
+/hadoop/common/trunk/hadoop-common-project/hadoop-common/src/test/core:1152502-1243679
/hadoop/core/branches/branch-0.19/core/src/test/core:713112
/hadoop/core/trunk/src/test/core:776175-785643,785929-786278
Modified:
hadoop/common/branches/HDFS-1623/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/metrics2/util/TestSampleStat.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-1623/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/metrics2/util/TestSampleStat.java?rev=1243691&r1=1243690&r2=1243691&view=diff
==============================================================================
---
hadoop/common/branches/HDFS-1623/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/metrics2/util/TestSampleStat.java
(original)
+++
hadoop/common/branches/HDFS-1623/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/metrics2/util/TestSampleStat.java
Mon Feb 13 21:00:37 2012
@@ -36,8 +36,8 @@ public class TestSampleStat {
assertEquals("mean", 0.0, stat.mean(), EPSILON);
assertEquals("variance", 0.0, stat.variance(), EPSILON);
assertEquals("stddev", 0.0, stat.stddev(), EPSILON);
- assertEquals("min", Double.MAX_VALUE, stat.min(), EPSILON);
- assertEquals("max", Double.MIN_VALUE, stat.max(), EPSILON);
+ assertEquals("min", SampleStat.MinMax.DEFAULT_MIN_VALUE, stat.min(),
EPSILON);
+ assertEquals("max", SampleStat.MinMax.DEFAULT_MAX_VALUE, stat.max(),
EPSILON);
stat.add(3);
assertEquals("num samples", 1L, stat.numSamples());
@@ -60,8 +60,8 @@ public class TestSampleStat {
assertEquals("mean", 0.0, stat.mean(), EPSILON);
assertEquals("variance", 0.0, stat.variance(), EPSILON);
assertEquals("stddev", 0.0, stat.stddev(), EPSILON);
- assertEquals("min", Double.MAX_VALUE, stat.min(), EPSILON);
- assertEquals("max", Double.MIN_VALUE, stat.max(), EPSILON);
+ assertEquals("min", SampleStat.MinMax.DEFAULT_MIN_VALUE, stat.min(),
EPSILON);
+ assertEquals("max", SampleStat.MinMax.DEFAULT_MAX_VALUE, stat.max(),
EPSILON);
}
}
