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 2016/03/23 20:25:21 UTC

[1/2] hadoop git commit: HDFS-10199. Unit tests TestCopyFiles, TestDistCh, TestLogalyzer under org.apache.hadoop.tools are failing. Contributed by Tibor Kiss.

Repository: hadoop
Updated Branches:
  refs/heads/branch-2 7ad3162df -> 57a0e6543
  refs/heads/branch-2.8 4ca13e7b9 -> f3e4dac87


HDFS-10199. Unit tests TestCopyFiles, TestDistCh, TestLogalyzer under org.apache.hadoop.tools are failing. Contributed by Tibor Kiss.


Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/57a0e654
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/57a0e654
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/57a0e654

Branch: refs/heads/branch-2
Commit: 57a0e6543cd00c5b8a9c0ee5a9613596a7e8b78e
Parents: 7ad3162
Author: Chris Nauroth <cn...@apache.org>
Authored: Wed Mar 23 12:17:27 2016 -0700
Committer: Chris Nauroth <cn...@apache.org>
Committed: Wed Mar 23 12:17:27 2016 -0700

----------------------------------------------------------------------
 .../src/test/java/org/apache/hadoop/tools/TestCopyFiles.java       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hadoop/blob/57a0e654/hadoop-tools/hadoop-extras/src/test/java/org/apache/hadoop/tools/TestCopyFiles.java
----------------------------------------------------------------------
diff --git a/hadoop-tools/hadoop-extras/src/test/java/org/apache/hadoop/tools/TestCopyFiles.java b/hadoop-tools/hadoop-extras/src/test/java/org/apache/hadoop/tools/TestCopyFiles.java
index 16ca0be..b28da4c 100644
--- a/hadoop-tools/hadoop-extras/src/test/java/org/apache/hadoop/tools/TestCopyFiles.java
+++ b/hadoop-tools/hadoop-extras/src/test/java/org/apache/hadoop/tools/TestCopyFiles.java
@@ -60,7 +60,7 @@ public class TestCopyFiles extends TestCase {
   {
     ((Log4JLogger)LogFactory.getLog("org.apache.hadoop.hdfs.StateChange")
         ).getLogger().setLevel(Level.ERROR);
-    ((Log4JLogger)DataNode.LOG).getLogger().setLevel(Level.ERROR);
+    ((Log4JLogger)LogFactory.getLog(DataNode.class)).getLogger().setLevel(Level.ERROR);
     ((Log4JLogger)LogFactory.getLog(FSNamesystem.class)).getLogger().setLevel(Level.ERROR);
     ((Log4JLogger)DistCpV1.LOG).getLogger().setLevel(Level.ALL);
   }

[2/2] hadoop git commit: HDFS-10199. Unit tests TestCopyFiles, TestDistCh, TestLogalyzer under org.apache.hadoop.tools are failing. Contributed by Tibor Kiss.

Posted by cn...@apache.org.
HDFS-10199. Unit tests TestCopyFiles, TestDistCh, TestLogalyzer under org.apache.hadoop.tools are failing. Contributed by Tibor Kiss.

(cherry picked from commit 57a0e6543cd00c5b8a9c0ee5a9613596a7e8b78e)


Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/f3e4dac8
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/f3e4dac8
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/f3e4dac8

Branch: refs/heads/branch-2.8
Commit: f3e4dac87d66ad0d7ad8ca28304294557c627160
Parents: 4ca13e7
Author: Chris Nauroth <cn...@apache.org>
Authored: Wed Mar 23 12:17:27 2016 -0700
Committer: Chris Nauroth <cn...@apache.org>
Committed: Wed Mar 23 12:17:39 2016 -0700

----------------------------------------------------------------------
 .../src/test/java/org/apache/hadoop/tools/TestCopyFiles.java       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hadoop/blob/f3e4dac8/hadoop-tools/hadoop-extras/src/test/java/org/apache/hadoop/tools/TestCopyFiles.java
----------------------------------------------------------------------
diff --git a/hadoop-tools/hadoop-extras/src/test/java/org/apache/hadoop/tools/TestCopyFiles.java b/hadoop-tools/hadoop-extras/src/test/java/org/apache/hadoop/tools/TestCopyFiles.java
index 16ca0be..b28da4c 100644
--- a/hadoop-tools/hadoop-extras/src/test/java/org/apache/hadoop/tools/TestCopyFiles.java
+++ b/hadoop-tools/hadoop-extras/src/test/java/org/apache/hadoop/tools/TestCopyFiles.java
@@ -60,7 +60,7 @@ public class TestCopyFiles extends TestCase {
   {
     ((Log4JLogger)LogFactory.getLog("org.apache.hadoop.hdfs.StateChange")
         ).getLogger().setLevel(Level.ERROR);
-    ((Log4JLogger)DataNode.LOG).getLogger().setLevel(Level.ERROR);
+    ((Log4JLogger)LogFactory.getLog(DataNode.class)).getLogger().setLevel(Level.ERROR);
     ((Log4JLogger)LogFactory.getLog(FSNamesystem.class)).getLogger().setLevel(Level.ERROR);
     ((Log4JLogger)DistCpV1.LOG).getLogger().setLevel(Level.ALL);
   }