HDFS-2815. Namenode sometimes oes not come out of safemode during NN crash + restart. Contributed by Uma Maheswara Rao.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1243673 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
parent
52004aa8e9
commit
a70bc6c6a2
|
@ -235,6 +235,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
|
||||
|
|
|
@ -1960,7 +1960,6 @@ public class FSNamesystem implements Namesystem, FSClusterStats,
|
|||
boolean enforcePermission)
|
||||
throws AccessControlException, SafeModeException, UnresolvedLinkException,
|
||||
IOException {
|
||||
boolean deleteNow = false;
|
||||
ArrayList<Block> collectedBlocks = new ArrayList<Block>();
|
||||
|
||||
writeLock();
|
||||
|
@ -1978,10 +1977,6 @@ public class FSNamesystem implements Namesystem, FSClusterStats,
|
|||
if (!dir.delete(src, collectedBlocks)) {
|
||||
return false;
|
||||
}
|
||||
deleteNow = collectedBlocks.size() <= BLOCK_DELETION_INCREMENT;
|
||||
if (deleteNow) { // Perform small deletes right away
|
||||
removeBlocks(collectedBlocks);
|
||||
}
|
||||
} finally {
|
||||
writeUnlock();
|
||||
}
|
||||
|
@ -1990,9 +1985,7 @@ public class FSNamesystem implements Namesystem, FSClusterStats,
|
|||
|
||||
writeLock();
|
||||
try {
|
||||
if (!deleteNow) {
|
||||
removeBlocks(collectedBlocks); // Incremental deletion of blocks
|
||||
}
|
||||
removeBlocks(collectedBlocks); // Incremental deletion of blocks
|
||||
} finally {
|
||||
writeUnlock();
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue