svn commit: r1605442 - in /hadoop/common/branches/branch-2.4.1/hadoop-hdfs-project/hadoop-hdfs: CHANGES.txt src/main/java/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java src/test/java/org/apache/hadoop/hdfs/server/namenode/TestDeleteRace.java

[ki...@apache.org]

Author: kihwal
Date: Wed Jun 25 15:09:32 2014
New Revision: 1605442

URL: http://svn.apache.org/r1605442
Log:
Reverting HDFS-6527 from 2.4.1. Also updating the release notes.

Removed:
    hadoop/common/branches/branch-2.4.1/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestDeleteRace.java
Modified:
    hadoop/common/branches/branch-2.4.1/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
    hadoop/common/branches/branch-2.4.1/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java

Modified: hadoop/common/branches/branch-2.4.1/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.4.1/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt?rev=1605442&r1=1605441&r2=1605442&view=diff
==============================================================================
--- hadoop/common/branches/branch-2.4.1/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt (original)
+++ hadoop/common/branches/branch-2.4.1/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt Wed Jun 25 15:09:32 2014
@@ -89,9 +89,6 @@ Release 2.4.1 - 2014-06-23 
     HDFS-6411. nfs-hdfs-gateway mount raises I/O error and hangs when a 
     unauthorized user attempts to access it (brandonli)
 
-    HDFS-6527. Edit log corruption due to defered INode removal. (kihwal and
-    jing9 via jing9)
-
 Release 2.4.0 - 2014-04-07 
 
   INCOMPATIBLE CHANGES

Modified: hadoop/common/branches/branch-2.4.1/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.4.1/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java?rev=1605442&r1=1605441&r2=1605442&view=diff
==============================================================================
--- hadoop/common/branches/branch-2.4.1/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java (original)
+++ hadoop/common/branches/branch-2.4.1/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java Wed Jun 25 15:09:32 2014
@@ -2962,13 +2962,6 @@ public class FSNamesystem implements Nam
           + (lease != null ? lease.toString()
               : "Holder " + holder + " does not have any open files."));
     }
-    // No further modification is allowed on a deleted file.
-    // A file is considered deleted, if it has no parent or is marked
-    // as deleted in the snapshot feature.
-    if (file.getParent() == null || (file.isWithSnapshot() &&
-        file.getFileWithSnapshotFeature().isCurrentFileDeleted())) {
-      throw new FileNotFoundException(src);
-    }
     String clientName = file.getFileUnderConstructionFeature().getClientName();
     if (holder != null && !clientName.equals(holder)) {
       throw new LeaseExpiredException("Lease mismatch on " + src + " owned by "
@@ -3378,7 +3371,6 @@ public class FSNamesystem implements Nam
     getEditLog().logSync(); 
     removeBlocks(collectedBlocks); // Incremental deletion of blocks
     collectedBlocks.clear();
-
     dir.writeLock();
     try {
       dir.removeFromInodeMap(removedINodes);