hadoop-common-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hair...@apache.org
Subject svn commit: r661914 - in /hadoop/core/branches/branch-0.17: CHANGES.txt src/java/org/apache/hadoop/dfs/FSNamesystem.java
Date Fri, 30 May 2008 23:54:37 GMT
Author: hairong
Date: Fri May 30 16:54:37 2008
New Revision: 661914

URL: http://svn.apache.org/viewvc?rev=661914&view=rev
Log:
Merge -r 661911:661912 from trunk to main to move the change log of HADOOP-2159 into the release
0.17.1 section

Modified:
    hadoop/core/branches/branch-0.17/CHANGES.txt
    hadoop/core/branches/branch-0.17/src/java/org/apache/hadoop/dfs/FSNamesystem.java

Modified: hadoop/core/branches/branch-0.17/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/core/branches/branch-0.17/CHANGES.txt?rev=661914&r1=661913&r2=661914&view=diff
==============================================================================
--- hadoop/core/branches/branch-0.17/CHANGES.txt (original)
+++ hadoop/core/branches/branch-0.17/CHANGES.txt Fri May 30 16:54:37 2008
@@ -1,6 +1,13 @@
 Hadoop Change Log
 
 
+Release 0.17.1
+
+  BUG FIXES
+
+    HADOOP-2159 Namenode stuck in safemode. The counter blockSafe should
+    not be decremented for invalid blocks. (hairong)
+ 
 Release 0.17.0 - 2008-05-18
 
   INCOMPATIBLE CHANGES

Modified: hadoop/core/branches/branch-0.17/src/java/org/apache/hadoop/dfs/FSNamesystem.java
URL: http://svn.apache.org/viewvc/hadoop/core/branches/branch-0.17/src/java/org/apache/hadoop/dfs/FSNamesystem.java?rev=661914&r1=661913&r2=661914&view=diff
==============================================================================
--- hadoop/core/branches/branch-0.17/src/java/org/apache/hadoop/dfs/FSNamesystem.java (original)
+++ hadoop/core/branches/branch-0.17/src/java/org/apache/hadoop/dfs/FSNamesystem.java Fri
May 30 16:54:37 2008
@@ -3065,7 +3065,6 @@
       return;
     }
         
-    decrementSafeBlockCount(block);
     //
     // It's possible that the block was removed because of a datanode
     // failure.  If the block is still valid, check if replication is
@@ -3074,6 +3073,7 @@
     //
     INode fileINode = blocksMap.getINode(block);
     if (fileINode != null) {
+      decrementSafeBlockCount(block);
       updateNeededReplications(block, -1, 0);
     }
 



Mime
View raw message