HADOOP-4464. Separate out TestFileCreationClient from TestFileCreation. Contributed by Tsz Wo (Nicholas), SZE.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/core/trunk@706371 13f79535-47bb-0310-9956-ffa450edef68

CHANGES.txt

@@ -983,6 +983,9 @@ Release 0.19.0 - Unreleased
     HADOOP-4457. Fixes an input split logging problem introduced by
     HADOOP-3245. (Amareshwari Sriramadasu via ddas)
 
+    HADOOP-4464. Separate out TestFileCreationClient from TestFileCreation.
+    (Tsz Wo (Nicholas), SZE via cdouglas)
+
 Release 0.18.2 - Unreleased
 
   BUG FIXES

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

@@ -703,103 +703,4 @@ public class TestFileCreation extends junit.framework.TestCase {
 
     System.out.println("testLeaseExpireHardLimit successful");
   }
-
-  /** Test lease recovery Triggered by DFSClient. */
-  public void testClientTriggeredLeaseRecovery() throws Exception {
-    final int REPLICATION = 3;
-    Configuration conf = new Configuration();
-    conf.setInt("dfs.datanode.handler.count", 1);
-    conf.setInt("dfs.replication", REPLICATION);
-    MiniDFSCluster cluster = new MiniDFSCluster(conf, REPLICATION, true, null);
-
-    try {
-      final FileSystem fs = cluster.getFileSystem();
-      final Path dir = new Path("/wrwelkj");
-      
-      SlowWriter[] slowwriters = new SlowWriter[10];
-      for(int i = 0; i < slowwriters.length; i++) {
-        slowwriters[i] = new SlowWriter(fs, new Path(dir, "file" + i));
-      }
-
-      try {
-        for(int i = 0; i < slowwriters.length; i++) {
-          slowwriters[i].start();
-        }
-
-        Thread.sleep(1000);                       // let writers get started
-
-        //stop a datanode, it should have least recover.
-        cluster.stopDataNode(AppendTestUtil.nextInt(REPLICATION));
-        
-        //let the slow writer writes a few more seconds
-        System.out.println("Wait a few seconds");
-        Thread.sleep(5000);
-      }
-      finally {
-        for(int i = 0; i < slowwriters.length; i++) {
-          if (slowwriters[i] != null) {
-            slowwriters[i].running = false;
-            slowwriters[i].interrupt();
-          }
-        }
-        for(int i = 0; i < slowwriters.length; i++) {
-          if (slowwriters[i] != null) {
-            slowwriters[i].join();
-          }
-        }
-      }
-
-      //Verify the file
-      System.out.println("Verify the file");
-      for(int i = 0; i < slowwriters.length; i++) {
-        System.out.println(slowwriters[i].filepath + ": length="
-            + fs.getFileStatus(slowwriters[i].filepath).getLen());
-        FSDataInputStream in = null;
-        try {
-          in = fs.open(slowwriters[i].filepath);
-          for(int j = 0, x; (x = in.read()) != -1; j++) {
-            assertEquals(j, x);
-          }
-        }
-        finally {
-          IOUtils.closeStream(in);
-        }
-      }
-    } finally {
-      if (cluster != null) {cluster.shutdown();}
-    }
-  }
-
-  static class SlowWriter extends Thread {
-    final FileSystem fs;
-    final Path filepath;
-    boolean running = true;
-    
-    SlowWriter(FileSystem fs, Path filepath) {
-      super(SlowWriter.class.getSimpleName() + ":" + filepath);
-      this.fs = fs;
-      this.filepath = filepath;
-    }
-
-    public void run() {
-      FSDataOutputStream out = null;
-      int i = 0;
-      try {
-        out = fs.create(filepath);
-        for(; running; i++) {
-          System.out.println(getName() + " writes " + i);
-          out.write(i);
-          out.sync();
-          sleep(100);
-        }
-      }
-      catch(Exception e) {
-        System.out.println(getName() + " dies: e=" + e);
-      }
-      finally {
-        System.out.println(getName() + ": i=" + i);
-        IOUtils.closeStream(out);
-      }
-    }        
-  }
 }

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

@@ -0,0 +1,145 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.hadoop.hdfs;
+
+import org.apache.commons.logging.impl.Log4JLogger;
+import org.apache.hadoop.conf.Configuration;
+import org.apache.hadoop.fs.FSDataInputStream;
+import org.apache.hadoop.fs.FSDataOutputStream;
+import org.apache.hadoop.fs.FileSystem;
+import org.apache.hadoop.fs.Path;
+import org.apache.hadoop.hdfs.server.datanode.DataNode;
+import org.apache.hadoop.hdfs.server.namenode.FSNamesystem;
+import org.apache.hadoop.hdfs.server.namenode.LeaseManager;
+import org.apache.hadoop.hdfs.server.protocol.InterDatanodeProtocol;
+import org.apache.hadoop.io.IOUtils;
+import org.apache.log4j.Level;
+
+/**
+ * This class tests that a file need not be closed before its
+ * data can be read by another client.
+ */
+public class TestFileCreationClient extends junit.framework.TestCase {
+  static final String DIR = "/" + TestFileCreationClient.class.getSimpleName() + "/";
+
+  {
+    ((Log4JLogger)DataNode.LOG).getLogger().setLevel(Level.ALL);
+    ((Log4JLogger)LeaseManager.LOG).getLogger().setLevel(Level.ALL);
+    ((Log4JLogger)FSNamesystem.LOG).getLogger().setLevel(Level.ALL);
+    ((Log4JLogger)InterDatanodeProtocol.LOG).getLogger().setLevel(Level.ALL);
+  }
+
+  /** Test lease recovery Triggered by DFSClient. */
+  public void testClientTriggeredLeaseRecovery() throws Exception {
+    final int REPLICATION = 3;
+    Configuration conf = new Configuration();
+    conf.setInt("dfs.datanode.handler.count", 1);
+    conf.setInt("dfs.replication", REPLICATION);
+    MiniDFSCluster cluster = new MiniDFSCluster(conf, REPLICATION, true, null);
+
+    try {
+      final FileSystem fs = cluster.getFileSystem();
+      final Path dir = new Path("/wrwelkj");
+      
+      SlowWriter[] slowwriters = new SlowWriter[10];
+      for(int i = 0; i < slowwriters.length; i++) {
+        slowwriters[i] = new SlowWriter(fs, new Path(dir, "file" + i));
+      }
+
+      try {
+        for(int i = 0; i < slowwriters.length; i++) {
+          slowwriters[i].start();
+        }
+
+        Thread.sleep(1000);                       // let writers get started
+
+        //stop a datanode, it should have least recover.
+        cluster.stopDataNode(AppendTestUtil.nextInt(REPLICATION));
+        
+        //let the slow writer writes a few more seconds
+        System.out.println("Wait a few seconds");
+        Thread.sleep(5000);
+      }
+      finally {
+        for(int i = 0; i < slowwriters.length; i++) {
+          if (slowwriters[i] != null) {
+            slowwriters[i].running = false;
+            slowwriters[i].interrupt();
+          }
+        }
+        for(int i = 0; i < slowwriters.length; i++) {
+          if (slowwriters[i] != null) {
+            slowwriters[i].join();
+          }
+        }
+      }
+
+      //Verify the file
+      System.out.println("Verify the file");
+      for(int i = 0; i < slowwriters.length; i++) {
+        System.out.println(slowwriters[i].filepath + ": length="
+            + fs.getFileStatus(slowwriters[i].filepath).getLen());
+        FSDataInputStream in = null;
+        try {
+          in = fs.open(slowwriters[i].filepath);
+          for(int j = 0, x; (x = in.read()) != -1; j++) {
+            assertEquals(j, x);
+          }
+        }
+        finally {
+          IOUtils.closeStream(in);
+        }
+      }
+    } finally {
+      if (cluster != null) {cluster.shutdown();}
+    }
+  }
+
+  static class SlowWriter extends Thread {
+    final FileSystem fs;
+    final Path filepath;
+    boolean running = true;
+    
+    SlowWriter(FileSystem fs, Path filepath) {
+      super(SlowWriter.class.getSimpleName() + ":" + filepath);
+      this.fs = fs;
+      this.filepath = filepath;
+    }
+
+    public void run() {
+      FSDataOutputStream out = null;
+      int i = 0;
+      try {
+        out = fs.create(filepath);
+        for(; running; i++) {
+          System.out.println(getName() + " writes " + i);
+          out.write(i);
+          out.sync();
+          sleep(100);
+        }
+      }
+      catch(Exception e) {
+        System.out.println(getName() + " dies: e=" + e);
+      }
+      finally {
+        System.out.println(getName() + ": i=" + i);
+        IOUtils.closeStream(out);
+      }
+    }        
+  }
+}