Merge -r 765015:765016 to move the change of HADOOP-5644 from trunk to branch 0.18.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/core/branches/branch-0.18@765059 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/CHANGES.txt b/CHANGES.txt
index 841547b..25a962e 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -23,6 +23,8 @@
HADOOP-5557. Fixes some minor problems in TestOverReplicatedBlocks.
(szetszwo)
+ HADOOP-5644. Namnode is stuck in safe mode. (Suresh Srinivas via hairong)
+
Release 0.18.3 - 2009-01-27
IMPROVEMENTS
diff --git a/src/hdfs/org/apache/hadoop/dfs/FSNamesystem.java b/src/hdfs/org/apache/hadoop/dfs/FSNamesystem.java
index b32f949..6a2ff17 100644
--- a/src/hdfs/org/apache/hadoop/dfs/FSNamesystem.java
+++ b/src/hdfs/org/apache/hadoop/dfs/FSNamesystem.java
@@ -1809,12 +1809,9 @@
}
}
- // If this commit does not want to close the file, just persist
- // blocks and return
+ // Return if this commit does not want to close the file
String src = leaseManager.findPath(pendingFile);
if (!closeFile) {
- dir.persistBlocks(src, pendingFile);
- getEditLog().logSync();
LOG.info("commitBlockSynchronization(" + lastblock + ") successful");
return;
}
