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 ha...@apache.org on 2009/04/15 08:09:07 UTC
svn commit: r765059 - in /hadoop/core/branches/branch-0.18: ./ CHANGES.txt
src/hdfs/org/apache/hadoop/dfs/FSNamesystem.java
Author: hairong
Date: Wed Apr 15 06:09:07 2009
New Revision: 765059
URL: http://svn.apache.org/viewvc?rev=765059&view=rev
Log:
Merge -r 765015:765016 to move the change of HADOOP-5644 from trunk to branch 0.18.
Modified:
hadoop/core/branches/branch-0.18/ (props changed)
hadoop/core/branches/branch-0.18/CHANGES.txt
hadoop/core/branches/branch-0.18/src/hdfs/org/apache/hadoop/dfs/FSNamesystem.java
Propchange: hadoop/core/branches/branch-0.18/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Apr 15 06:09:07 2009
@@ -1,2 +1,4 @@
+/hadoop/core:743935
+/hadoop/core/branches/branch-0.18:743935
/hadoop/core/branches/branch-0.19:704733
/hadoop/core/trunk:699517,700163,704701,704732,705420,705430,707258,709040,720602,723460,723831,723918,743892,753346,759398
Modified: hadoop/core/branches/branch-0.18/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/core/branches/branch-0.18/CHANGES.txt?rev=765059&r1=765058&r2=765059&view=diff
==============================================================================
--- hadoop/core/branches/branch-0.18/CHANGES.txt (original)
+++ hadoop/core/branches/branch-0.18/CHANGES.txt Wed Apr 15 06:09:07 2009
@@ -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
Modified: hadoop/core/branches/branch-0.18/src/hdfs/org/apache/hadoop/dfs/FSNamesystem.java
URL: http://svn.apache.org/viewvc/hadoop/core/branches/branch-0.18/src/hdfs/org/apache/hadoop/dfs/FSNamesystem.java?rev=765059&r1=765058&r2=765059&view=diff
==============================================================================
--- hadoop/core/branches/branch-0.18/src/hdfs/org/apache/hadoop/dfs/FSNamesystem.java (original)
+++ hadoop/core/branches/branch-0.18/src/hdfs/org/apache/hadoop/dfs/FSNamesystem.java Wed Apr 15 06:09:07 2009
@@ -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;
}