You are viewing a plain text version of this content. The canonical link for it is here.
Posted to hdfs-commits@hadoop.apache.org by su...@apache.org on 2012/02/13 21:19:23 UTC
svn commit: r1243674 - in
/hadoop/common/branches/branch-0.23/hadoop-hdfs-project/hadoop-hdfs:
CHANGES.txt
src/main/java/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java
Author: suresh
Date: Mon Feb 13 20:19:23 2012
New Revision: 1243674
URL: http://svn.apache.org/viewvc?rev=1243674&view=rev
Log:
HDFS-2815. Merging change r1243673 from trunk to 0.23.
Modified:
hadoop/common/branches/branch-0.23/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
hadoop/common/branches/branch-0.23/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java
Modified: hadoop/common/branches/branch-0.23/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt?rev=1243674&r1=1243673&r2=1243674&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.23/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt (original)
+++ hadoop/common/branches/branch-0.23/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt Mon Feb 13 20:19:23 2012
@@ -29,6 +29,9 @@ Release 0.23.2 - UNRELEASED
HDFS-776. Fix exception handling in Balancer. (Uma Maheswara Rao G
via szetszwo)
+ HDFS-2815. Namenode sometimes oes not come out of safemode during
+ NN crash + restart. (Uma Maheswara Rao via suresh)
+
Release 0.23.1 - 2012-02-08
INCOMPATIBLE CHANGES
Modified: hadoop/common/branches/branch-0.23/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-0.23/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java?rev=1243674&r1=1243673&r2=1243674&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.23/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java (original)
+++ hadoop/common/branches/branch-0.23/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java Mon Feb 13 20:19:23 2012
@@ -1908,7 +1908,6 @@ public class FSNamesystem implements Nam
boolean enforcePermission)
throws AccessControlException, SafeModeException, UnresolvedLinkException,
IOException {
- boolean deleteNow = false;
ArrayList<Block> collectedBlocks = new ArrayList<Block>();
writeLock();
@@ -1926,10 +1925,6 @@ public class FSNamesystem implements Nam
if (!dir.delete(src, collectedBlocks)) {
return false;
}
- deleteNow = collectedBlocks.size() <= BLOCK_DELETION_INCREMENT;
- if (deleteNow) { // Perform small deletes right away
- removeBlocks(collectedBlocks);
- }
} finally {
writeUnlock();
}
@@ -1938,9 +1933,7 @@ public class FSNamesystem implements Nam
writeLock();
try {
- if (!deleteNow) {
- removeBlocks(collectedBlocks); // Incremental deletion of blocks
- }
+ removeBlocks(collectedBlocks); // Incremental deletion of blocks
} finally {
writeUnlock();
}