svn commit: r1166863 - in /hadoop/common/branches/branch-0.20-security: CHANGES.txt src/test/org/apache/hadoop/hdfs/TestFileAppend4.java

[ji...@apache.org]

Author: jitendra
Date: Thu Sep  8 19:06:41 2011
New Revision: 1166863

URL: http://svn.apache.org/viewvc?rev=1166863&view=rev
Log:
HDFS-1242. Add test for appendFile() race solved in HDFS-142. Contributed by Todd Lipcon.

Modified:
    hadoop/common/branches/branch-0.20-security/CHANGES.txt
    hadoop/common/branches/branch-0.20-security/src/test/org/apache/hadoop/hdfs/TestFileAppend4.java

Modified: hadoop/common/branches/branch-0.20-security/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security/CHANGES.txt?rev=1166863&r1=1166862&r2=1166863&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20-security/CHANGES.txt (original)
+++ hadoop/common/branches/branch-0.20-security/CHANGES.txt Thu Sep  8 19:06:41 2011
@@ -155,6 +155,9 @@ Release 0.20.205.0 - unreleased
 
     HADOOP-7594. Support HTTP REST in HttpServer.  (szetszwo)
 
+    HDFS-1242. Add test for appendFile() race solved in HDFS-142.
+    (Todd Lipcon via jitendra)
+
 Release 0.20.204.0 - 2011-8-25
 
   NEW FEATURES

Modified: hadoop/common/branches/branch-0.20-security/src/test/org/apache/hadoop/hdfs/TestFileAppend4.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security/src/test/org/apache/hadoop/hdfs/TestFileAppend4.java?rev=1166863&r1=1166862&r2=1166863&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20-security/src/test/org/apache/hadoop/hdfs/TestFileAppend4.java (original)
+++ hadoop/common/branches/branch-0.20-security/src/test/org/apache/hadoop/hdfs/TestFileAppend4.java Thu Sep  8 19:06:41 2011
@@ -47,6 +47,8 @@ import org.apache.hadoop.hdfs.server.nam
 import org.apache.hadoop.hdfs.server.namenode.LeaseExpiredException;
 import org.apache.hadoop.hdfs.server.namenode.LeaseManager;
 import org.apache.hadoop.hdfs.server.namenode.NameNode;
+import org.apache.hadoop.hdfs.server.namenode.FSEditLog;
+import org.apache.hadoop.hdfs.server.namenode.FSImageAdapter;
 import org.apache.hadoop.fs.BlockLocation;
 import org.apache.hadoop.fs.FSDataOutputStream;
 import org.apache.hadoop.fs.FileSystem;
@@ -61,6 +63,7 @@ import static org.mockito.Matchers.anyIn
 import static org.mockito.Matchers.anyObject;
 import static org.mockito.Matchers.anyString;
 import static org.mockito.Mockito.doAnswer;
+import static org.mockito.Mockito.reset;
 import static org.mockito.Mockito.spy;
 
 /* File Append tests for HDFS-200 & HDFS-142, specifically focused on:
@@ -979,6 +982,69 @@ public class TestFileAppend4 extends Tes
   }
 
   /**
+   * Test for a race in appendFile where the file might get removed in between
+   * the two synchronized sections.
+   */
+  public void testAppendFileRace() throws Throwable {
+    LOG.info("START");
+    cluster = new MiniDFSCluster(conf, 1, true, null);
+    final FileSystem fs1 = cluster.getFileSystem();;
+
+    try {
+      createFile(fs1, "/testAppendFileRace", 1, BBW_SIZE);
+      stm.close();
+
+      NameNode nn = cluster.getNameNode();
+      FSEditLog editLogSpy = FSImageAdapter.injectEditLogSpy(nn.getNamesystem());
+      DelayAnswer  delayer = new DelayAnswer();
+      doAnswer(delayer).when(editLogSpy).logSync();
+
+      final AtomicReference<Throwable> err = new AtomicReference<Throwable>();
+      Thread appender = new Thread() {
+          public void run() {
+            try {
+              stm = fs1.append(file1);
+            } catch (Throwable t) {
+              err.set(t);
+            }
+          }
+        };
+      LOG.info("Triggering append in other thread");
+      appender.start();
+
+      LOG.info("Waiting for logsync");
+      delayer.waitForCall();
+
+      LOG.info("Resetting spy");
+      reset(editLogSpy);
+
+      LOG.info("Deleting file");
+      fs1.delete(file1, true);
+
+      LOG.info("Allowing append to proceed");
+      delayer.proceed();
+
+      LOG.info("Waiting for append to finish");
+
+      appender.join();
+
+      if (err.get() != null) {
+        if (err.get().getMessage().contains(
+              "File does not exist.")) {
+          LOG.info("Got expected exception", err.get());
+        } else {
+          throw err.get();
+        }
+      }
+      LOG.info("Closing stream");
+      stm.close();
+    } finally {
+      fs1.close();
+      cluster.shutdown();
+    }
+  }
+
+  /**
    * Mockito answer helper that triggers one latch as soon as the
    * method is called, then waits on another before continuing.
    */