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 cn...@apache.org on 2014/10/06 18:19:26 UTC
[1/3] git commit: HDFS-7172. Test data files may be checked out of
git with incorrect line endings,
causing test failures in TestHDFSCLI. Contributed by Chris Nauroth.
Repository: hadoop
Updated Branches:
refs/heads/branch-2.6 e65d8b750 -> 08ccd3006
HDFS-7172. Test data files may be checked out of git with incorrect line endings, causing test failures in TestHDFSCLI. Contributed by Chris Nauroth.
(cherry picked from commit 5db04a5a1a27d4199bfcc1c31a001ff4db32810b)
Conflicts:
hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/f567f3c8
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/f567f3c8
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/f567f3c8
Branch: refs/heads/branch-2.6
Commit: f567f3c8332fb3f7e23736041c6a0416fa541c8f
Parents: e65d8b7
Author: Haohui Mai <wh...@apache.org>
Authored: Wed Oct 1 10:45:54 2014 -0700
Committer: cnauroth <cn...@apache.org>
Committed: Mon Oct 6 09:15:41 2014 -0700
----------------------------------------------------------------------
hadoop-hdfs-project/hadoop-hdfs/.gitattributes | 1 +
hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt | 3 +++
2 files changed, 4 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/f567f3c8/hadoop-hdfs-project/hadoop-hdfs/.gitattributes
----------------------------------------------------------------------
diff --git a/hadoop-hdfs-project/hadoop-hdfs/.gitattributes b/hadoop-hdfs-project/hadoop-hdfs/.gitattributes
new file mode 100644
index 0000000..32bd020
--- /dev/null
+++ b/hadoop-hdfs-project/hadoop-hdfs/.gitattributes
@@ -0,0 +1 @@
+src/test/resources/data* text eol=lf
http://git-wip-us.apache.org/repos/asf/hadoop/blob/f567f3c8/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
----------------------------------------------------------------------
diff --git a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
index c4ac392..c0fcba7 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
+++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
@@ -539,6 +539,9 @@ Release 2.6.0 - UNRELEASED
HDFS-7176. The namenode usage message doesn't include "-rollingupgrade
started" (cmccabe)
+ HDFS-7172. Test data files may be checked out of git with incorrect line
+ endings, causing test failures in TestHDFSCLI. (Chris Nauroth via wheat9)
+
BREAKDOWN OF HDFS-6134 AND HADOOP-10150 SUBTASKS AND RELATED JIRAS
HDFS-6387. HDFS CLI admin tool for creating & deleting an
[2/3] git commit: HADOOP-11163. MetricsSystemImpl may miss a
registered source. Contributed by Chuan Liu.
Posted by cn...@apache.org.
HADOOP-11163. MetricsSystemImpl may miss a registered source. Contributed by Chuan Liu.
(cherry picked from commit 69c9af91031f345d9511618877646b8756b17863)
(cherry picked from commit a828ef15b0e2c63dac6854910bc9ae3b5f5ef755)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/29c20358
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/29c20358
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/29c20358
Branch: refs/heads/branch-2.6
Commit: 29c203585ee74a92dd0e3fa7fa486e0656cf01da
Parents: f567f3c
Author: cnauroth <cn...@apache.org>
Authored: Fri Oct 3 21:01:28 2014 -0700
Committer: cnauroth <cn...@apache.org>
Committed: Mon Oct 6 09:16:22 2014 -0700
----------------------------------------------------------------------
hadoop-common-project/hadoop-common/CHANGES.txt | 2 ++
.../hadoop/metrics2/impl/MetricsSystemImpl.java | 2 +-
.../metrics2/impl/TestMetricsSystemImpl.java | 32 ++++++++++++++++++++
3 files changed, 35 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/29c20358/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 38f44e7..6d13260 100644
--- a/hadoop-common-project/hadoop-common/CHANGES.txt
+++ b/hadoop-common-project/hadoop-common/CHANGES.txt
@@ -577,6 +577,8 @@ Release 2.6.0 - UNRELEASED
HADOOP-11117 UGI HadoopLoginModule doesn't catch & wrap all
kerberos-related exceptions (stevel)
+ HADOOP-11163 MetricsSystemImpl may miss a registered source. (cnauroth)
+
Release 2.5.1 - 2014-09-05
INCOMPATIBLE CHANGES
http://git-wip-us.apache.org/repos/asf/hadoop/blob/29c20358/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/impl/MetricsSystemImpl.java
----------------------------------------------------------------------
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/impl/MetricsSystemImpl.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/impl/MetricsSystemImpl.java
index 5e6c9ae..4507e35 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/impl/MetricsSystemImpl.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/impl/MetricsSystemImpl.java
@@ -234,7 +234,7 @@ public class MetricsSystemImpl extends MetricsSystem implements MetricsSource {
}
// We want to re-register the source to pick up new config when the
// metrics system restarts.
- register(name, new AbstractCallback() {
+ register(finalName, new AbstractCallback() {
@Override public void postStart() {
registerSource(finalName, finalDesc, s);
}
http://git-wip-us.apache.org/repos/asf/hadoop/blob/29c20358/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/metrics2/impl/TestMetricsSystemImpl.java
----------------------------------------------------------------------
diff --git a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/metrics2/impl/TestMetricsSystemImpl.java b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/metrics2/impl/TestMetricsSystemImpl.java
index 0122045..d59e80b 100644
--- a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/metrics2/impl/TestMetricsSystemImpl.java
+++ b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/metrics2/impl/TestMetricsSystemImpl.java
@@ -397,6 +397,24 @@ public class TestMetricsSystemImpl {
ms.shutdown();
}
+ @Test public void testRegisterSourceWithoutName() {
+ MetricsSystem ms = new MetricsSystemImpl();
+ TestSource ts = new TestSource("ts");
+ TestSource2 ts2 = new TestSource2("ts2");
+ ms.register(ts);
+ ms.register(ts2);
+ ms.init("TestMetricsSystem");
+ // if metrics source is registered without name,
+ // the class name will be used as the name
+ MetricsSourceAdapter sa = ((MetricsSystemImpl) ms)
+ .getSourceAdapter("TestSource");
+ assertNotNull(sa);
+ MetricsSourceAdapter sa2 = ((MetricsSystemImpl) ms)
+ .getSourceAdapter("TestSource2");
+ assertNotNull(sa2);
+ ms.shutdown();
+ }
+
private void checkMetricsRecords(List<MetricsRecord> recs) {
LOG.debug(recs);
MetricsRecord r = recs.get(0);
@@ -430,6 +448,20 @@ public class TestMetricsSystemImpl {
}
}
+ @Metrics(context="test")
+ private static class TestSource2 {
+ @Metric("C1 desc") MutableCounterLong c1;
+ @Metric("XXX desc") MutableCounterLong xxx;
+ @Metric("G1 desc") MutableGaugeLong g1;
+ @Metric("YYY desc") MutableGaugeLong yyy;
+ @Metric MutableRate s1;
+ final MetricsRegistry registry;
+
+ TestSource2(String recName) {
+ registry = new MetricsRegistry(recName);
+ }
+ }
+
private static String getPluginUrlsAsString() {
return "file:metrics2-test-plugin.jar";
}
[3/3] git commit: HADOOP-11163. Correct CHANGES.txt.
Posted by cn...@apache.org.
HADOOP-11163. Correct CHANGES.txt.
(cherry picked from commit bbb3b1acc0e8ce10b8689ded2be73b0965f09e52)
(cherry picked from commit 1329d1e701a52bb99759a9f0176865674887a90f)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/08ccd300
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/08ccd300
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/08ccd300
Branch: refs/heads/branch-2.6
Commit: 08ccd3006378810a9b43137769e21c18ba498ffc
Parents: 29c2035
Author: cnauroth <cn...@apache.org>
Authored: Fri Oct 3 21:07:01 2014 -0700
Committer: cnauroth <cn...@apache.org>
Committed: Mon Oct 6 09:16:31 2014 -0700
----------------------------------------------------------------------
hadoop-common-project/hadoop-common/CHANGES.txt | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/08ccd300/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 6d13260..6e92ebc 100644
--- a/hadoop-common-project/hadoop-common/CHANGES.txt
+++ b/hadoop-common-project/hadoop-common/CHANGES.txt
@@ -577,7 +577,8 @@ Release 2.6.0 - UNRELEASED
HADOOP-11117 UGI HadoopLoginModule doesn't catch & wrap all
kerberos-related exceptions (stevel)
- HADOOP-11163 MetricsSystemImpl may miss a registered source. (cnauroth)
+ HADOOP-11163. MetricsSystemImpl may miss a registered source.
+ (Chuan Liu via cnauroth)
Release 2.5.1 - 2014-09-05