svn commit: r765063 - in /hadoop/core/branches/branch-0.19: CHANGES.txt src/hdfs/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java

[hairong]

Author: hairong
Date: Wed Apr 15 06:14:02 2009
New Revision: 765063

URL: http://svn.apache.org/viewvc?rev=765063&view=rev
Log:
Merge -r 765015:765016 to move the change of HADOOP-5644 from trunk to branch 
0.19.

Modified:
    hadoop/core/branches/branch-0.19/CHANGES.txt
    
hadoop/core/branches/branch-0.19/src/hdfs/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java

Modified: hadoop/core/branches/branch-0.19/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/hadoop/core/branches/branch-0.19/CHANGES.txt?rev=765063&r1=765062&r2=765063&view=diff
==============================================================================
--- hadoop/core/branches/branch-0.19/CHANGES.txt (original)
+++ hadoop/core/branches/branch-0.19/CHANGES.txt Wed Apr 15 06:14:02 2009
@@ -1209,6 +1209,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

Modified: 
hadoop/core/branches/branch-0.19/src/hdfs/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java
URL: 
http://svn.apache.org/viewvc/hadoop/core/branches/branch-0.19/src/hdfs/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java?rev=765063&r1=765062&r2=765063&view=diff
==============================================================================
--- 
hadoop/core/branches/branch-0.19/src/hdfs/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java
 (original)
+++ 
hadoop/core/branches/branch-0.19/src/hdfs/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java
 Wed Apr 15 06:14:02 2009
@@ -1957,12 +1957,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;
     }