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 sh...@apache.org on 2008/11/07 03:11:24 UTC

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

Author: shv
Date: Thu Nov  6 18:11:24 2008
New Revision: 712040

URL: http://svn.apache.org/viewvc?rev=712040&view=rev
Log:
HADOOP-4597. Merge -r 712032:712033 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=712040&r1=712039&r2=712040&view=diff
==============================================================================
--- hadoop/core/branches/branch-0.19/CHANGES.txt (original)
+++ hadoop/core/branches/branch-0.19/CHANGES.txt Thu Nov  6 18:11:24 2008
@@ -969,6 +969,8 @@
   BUG FIXES
 
     HADOOP-4499. DFSClient should invoke checksumOk only once. (Raghu Angadi)
+    HADOOP-4597. Calculate mis-replicated blocks when safe-mode is turned
+    off manually. (shv)
 
 Release 0.18.2 - 2008-11-03
 

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=712040&r1=712039&r2=712040&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 Thu Nov  6 18:11:24 2008
@@ -4153,7 +4153,7 @@
       checkSuperuserPrivilege();
       switch(action) {
       case SAFEMODE_LEAVE: // leave safe mode
-        leaveSafeMode(false, false);
+        leaveSafeMode(false, true);
         break;
       case SAFEMODE_ENTER: // enter safe mode
         enterSafeMode();