svn commit: r765016 - in /hadoop/core/trunk: CHANGES.txt src/hdfs/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java

[hairong]

Author: hairong
Date: Wed Apr 15 00:08:44 2009
New Revision: 765016

URL: http://svn.apache.org/viewvc?rev=765016&view=rev
Log:
HADOOP-5644. Namenode is stuck in safe mode. Contributed by Suresh Srinivas.

Modified:
    hadoop/core/trunk/CHANGES.txt
    
hadoop/core/trunk/src/hdfs/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java

Modified: hadoop/core/trunk/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/hadoop/core/trunk/CHANGES.txt?rev=765016&r1=765015&r2=765016&view=diff
==============================================================================
--- hadoop/core/trunk/CHANGES.txt (original)
+++ hadoop/core/trunk/CHANGES.txt Wed Apr 15 00:08:44 2009
@@ -2403,6 +2403,8 @@
     HADOOP-5557. Fixes some minor problems in TestOverReplicatedBlocks.
     (szetszwo)
 
+    HADOOP-5644. Namenode is stuck in safe mode. (suresh Srinivas via hairong)
+
 Release 0.18.3 - 2009-01-27
 
   IMPROVEMENTS

Modified: 
hadoop/core/trunk/src/hdfs/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java
URL: 
http://svn.apache.org/viewvc/hadoop/core/trunk/src/hdfs/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java?rev=765016&r1=765015&r2=765016&view=diff
==============================================================================
--- 
hadoop/core/trunk/src/hdfs/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java
 (original)
+++ 
hadoop/core/trunk/src/hdfs/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java
 Wed Apr 15 00:08:44 2009
@@ -1976,12 +1976,14 @@
       }
     }
 
-    // If this commit does not want to close the file, just persist
-    // blocks and return
+    // If this commit does not want to close the file, persist
+    // blocks only if append is supported and return
     String src = leaseManager.findPath(pendingFile);
     if (!closeFile) {
-      dir.persistBlocks(src, pendingFile);
-      getEditLog().logSync();
+      if (supportAppends) {
+        dir.persistBlocks(src, pendingFile);
+        getEditLog().logSync();
+      }
       LOG.info("commitBlockSynchronization(" + lastblock + ") successful");
       return;
     }