HDFS-2300. TestFileAppend4 and TestMultiThreadedSync failure.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.20-security@1166401 13f79535-47bb-0310-9956-ffa450edef68

CHANGES.txt

@@ -99,6 +99,8 @@ Release 0.20.205.0 - unreleased
 
     HDFS-2309. TestRenameWhileOpen fails. (jitendra)
 
+    HDFS-2300. TestFileAppend4 and TestMultiThreadedSync failure. (jitendra)
+
   IMPROVEMENTS
 
     MAPREDUCE-2187. Reporter sends progress during sort/merge. (Anupam Seth via

src/test/org/apache/hadoop/hdfs/TestFileAppend4.java

@@ -683,7 +683,7 @@ public class TestFileAppend4 extends TestCase {
       Throwable thrownByClose = err.get();
       assertNotNull(thrownByClose);
       assertTrue(thrownByClose instanceof IOException);
-      if (!thrownByClose.getMessage().contains("Could not complete write")) {
+      if (!thrownByClose.getMessage().contains("does not have any open files")) {
         throw thrownByClose;
       }
     } finally {

src/test/org/apache/hadoop/hdfs/TestMultiThreadedSync.java

@@ -51,15 +51,6 @@ public class TestMultiThreadedSync {
   
   private byte[] toWrite = null;
 
-  {
-    ((Log4JLogger)NameNode.stateChangeLog).getLogger().setLevel(Level.ALL);
-    ((Log4JLogger)LeaseManager.LOG).getLogger().setLevel(Level.ALL);
-    ((Log4JLogger)FSNamesystem.LOG).getLogger().setLevel(Level.ALL);
-    ((Log4JLogger)DataNode.LOG).getLogger().setLevel(Level.ALL);
-    ((Log4JLogger)DFSClient.LOG).getLogger().setLevel(Level.ALL);
-    ((Log4JLogger)InterDatanodeProtocol.LOG).getLogger().setLevel(Level.ALL);
-  }
-
   /*
    * creates a file but does not close it
    */