From aa4c3fc8aa447745b1efcd309d5c18782c0ed997 Mon Sep 17 00:00:00 2001 From: Eli Collins Date: Tue, 11 Sep 2012 17:56:19 +0000 Subject: [PATCH] HADOOP-8789. Tests setLevel(Level.OFF) should be Level.ERROR. Contributed by Andy Isaacson git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1383494 13f79535-47bb-0310-9956-ffa450edef68 --- hadoop-common-project/hadoop-common/CHANGES.txt | 3 +++ .../java/org/apache/hadoop/tools/TestHadoopArchives.java | 6 +++--- .../test/java/org/apache/hadoop/tools/TestCopyFiles.java | 6 +++--- .../src/test/java/org/apache/hadoop/tools/TestDistCh.java | 6 +++--- 4 files changed, 12 insertions(+), 9 deletions(-) diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt index 08a8d1240d..f93617c706 100644 --- a/hadoop-common-project/hadoop-common/CHANGES.txt +++ b/hadoop-common-project/hadoop-common/CHANGES.txt @@ -217,6 +217,9 @@ Release 2.0.3-alpha - Unreleased IMPROVEMENTS + HADOOP-8789. Tests setLevel(Level.OFF) should be Level.ERROR. + (Andy Isaacson via eli) + OPTIMIZATIONS BUG FIXES diff --git a/hadoop-tools/hadoop-archives/src/test/java/org/apache/hadoop/tools/TestHadoopArchives.java b/hadoop-tools/hadoop-archives/src/test/java/org/apache/hadoop/tools/TestHadoopArchives.java index a06b0b9ad3..71ed762b5a 100644 --- a/hadoop-tools/hadoop-archives/src/test/java/org/apache/hadoop/tools/TestHadoopArchives.java +++ b/hadoop-tools/hadoop-archives/src/test/java/org/apache/hadoop/tools/TestHadoopArchives.java @@ -52,11 +52,11 @@ public class TestHadoopArchives extends TestCase { { ((Log4JLogger)LogFactory.getLog(org.apache.hadoop.security.Groups.class) - ).getLogger().setLevel(Level.OFF); + ).getLogger().setLevel(Level.ERROR); ((Log4JLogger)org.apache.hadoop.ipc.Server.LOG - ).getLogger().setLevel(Level.OFF); + ).getLogger().setLevel(Level.ERROR); ((Log4JLogger)org.apache.hadoop.util.AsyncDiskService.LOG - ).getLogger().setLevel(Level.OFF); + ).getLogger().setLevel(Level.ERROR); } private static final String inputDir = "input"; 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 2f403f2176..6e4bdf5554 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 @@ -61,9 +61,9 @@ import org.junit.Ignore; public class TestCopyFiles extends TestCase { { ((Log4JLogger)LogFactory.getLog("org.apache.hadoop.hdfs.StateChange") - ).getLogger().setLevel(Level.OFF); - ((Log4JLogger)DataNode.LOG).getLogger().setLevel(Level.OFF); - ((Log4JLogger)LogFactory.getLog(FSNamesystem.class)).getLogger().setLevel(Level.OFF); + ).getLogger().setLevel(Level.ERROR); + ((Log4JLogger)DataNode.LOG).getLogger().setLevel(Level.ERROR); + ((Log4JLogger)LogFactory.getLog(FSNamesystem.class)).getLogger().setLevel(Level.ERROR); ((Log4JLogger)DistCpV1.LOG).getLogger().setLevel(Level.ALL); } diff --git a/hadoop-tools/hadoop-extras/src/test/java/org/apache/hadoop/tools/TestDistCh.java b/hadoop-tools/hadoop-extras/src/test/java/org/apache/hadoop/tools/TestDistCh.java index 9fa1aa8a7f..34435f4d83 100644 --- a/hadoop-tools/hadoop-extras/src/test/java/org/apache/hadoop/tools/TestDistCh.java +++ b/hadoop-tools/hadoop-extras/src/test/java/org/apache/hadoop/tools/TestDistCh.java @@ -46,9 +46,9 @@ import org.junit.Ignore; public class TestDistCh extends junit.framework.TestCase { { ((Log4JLogger)LogFactory.getLog("org.apache.hadoop.hdfs.StateChange") - ).getLogger().setLevel(Level.OFF); - ((Log4JLogger)DataNode.LOG).getLogger().setLevel(Level.OFF); - ((Log4JLogger)LogFactory.getLog(FSNamesystem.class)).getLogger().setLevel(Level.OFF); + ).getLogger().setLevel(Level.ERROR); + ((Log4JLogger)DataNode.LOG).getLogger().setLevel(Level.ERROR); + ((Log4JLogger)LogFactory.getLog(FSNamesystem.class)).getLogger().setLevel(Level.ERROR); } static final Long RANDOM_NUMBER_GENERATOR_SEED = null;