You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by su...@apache.org on 2012/11/07 23:55:08 UTC
svn commit: r1406854 - in /hadoop/common/branches/branch-1.1: CHANGES.txt
src/hdfs/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java
Author: suresh
Date: Wed Nov 7 22:55:07 2012
New Revision: 1406854
URL: http://svn.apache.org/viewvc?rev=1406854&view=rev
Log:
HDFS-2815. Merging r1378664 from branch-1
Modified:
hadoop/common/branches/branch-1.1/CHANGES.txt
hadoop/common/branches/branch-1.1/src/hdfs/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java
Modified: hadoop/common/branches/branch-1.1/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-1.1/CHANGES.txt?rev=1406854&r1=1406853&r2=1406854&view=diff
==============================================================================
--- hadoop/common/branches/branch-1.1/CHANGES.txt (original)
+++ hadoop/common/branches/branch-1.1/CHANGES.txt Wed Nov 7 22:55:07 2012
@@ -16,6 +16,9 @@ Release 1.1.1 - Unreleased
directory deletion completes. It allows other operations when the
deletion is in progress. (umamahesh via suresh)
+ HDFS-2815. Namenode is not coming out of safemode when we perform ( NN crash + restart ).
+ Also FSCK report shows blocks missed. (umamahesh)
+
Release 1.1.0 - 2012.09.28
INCOMPATIBLE CHANGES
Modified: hadoop/common/branches/branch-1.1/src/hdfs/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-1.1/src/hdfs/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java?rev=1406854&r1=1406853&r2=1406854&view=diff
==============================================================================
--- hadoop/common/branches/branch-1.1/src/hdfs/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java (original)
+++ hadoop/common/branches/branch-1.1/src/hdfs/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java Wed Nov 7 22:55:07 2012
@@ -2081,7 +2081,6 @@ public class FSNamesystem implements FSC
*/
private boolean deleteInternal(String src,
boolean enforcePermission) throws IOException {
- boolean deleteNow = false;
ArrayList<Block> collectedBlocks = new ArrayList<Block>();
synchronized (this) {
if (isInSafeMode()) {
@@ -2094,17 +2093,11 @@ public class FSNamesystem implements FSC
if (!dir.delete(src, collectedBlocks)) {
return false;
}
- deleteNow = collectedBlocks.size() <= BLOCK_DELETION_INCREMENT;
- if (deleteNow) { // Perform small deletes right away
- removeBlocks(collectedBlocks);
- }
}
// Log directory deletion to editlog
getEditLog().logSync();
- if (!deleteNow) {
- removeBlocks(collectedBlocks); // Incremental deletion of blocks
- }
+ removeBlocks(collectedBlocks); // Incremental deletion of blocks
collectedBlocks.clear();
if (NameNode.stateChangeLog.isDebugEnabled()) {
NameNode.stateChangeLog.debug("DIR* Namesystem.delete: " + src