hadoop-common-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jiten...@apache.org
Subject svn commit: r1376739 - in /hadoop/common/branches/branch-1: CHANGES.txt src/hdfs/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java
Date Thu, 23 Aug 2012 22:22:45 GMT
Author: jitendra
Date: Thu Aug 23 22:22:45 2012
New Revision: 1376739

URL: http://svn.apache.org/viewvc?rev=1376739&view=rev
Log:
HDFS-3846. Namenode deadlock in branch-1. Contributed by Brandon Li.

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

Modified: hadoop/common/branches/branch-1/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-1/CHANGES.txt?rev=1376739&r1=1376738&r2=1376739&view=diff
==============================================================================
--- hadoop/common/branches/branch-1/CHANGES.txt (original)
+++ hadoop/common/branches/branch-1/CHANGES.txt Thu Aug 23 22:22:45 2012
@@ -192,6 +192,8 @@ Release 1.2.0 - unreleased
     MAPREDUCE-2374. "Text File Busy" errors launching MR tasks. (Andy Isaacson
     via atm)
 
+    HDFS-3846. Namenode deadlock in branch-1. (Brandon Li via jitendra)
+
 Release 1.1.0 - unreleased
 
   INCOMPATIBLE CHANGES

Modified: hadoop/common/branches/branch-1/src/hdfs/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-1/src/hdfs/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java?rev=1376739&r1=1376738&r2=1376739&view=diff
==============================================================================
--- hadoop/common/branches/branch-1/src/hdfs/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java
(original)
+++ hadoop/common/branches/branch-1/src/hdfs/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java
Thu Aug 23 22:22:45 2012
@@ -4207,10 +4207,6 @@ public class FSNamesystem implements FSC
     }
   }
 
-  int getNumLiveDataNodes() {
-    return getNumberOfDatanodes(DatanodeReportType.LIVE);
-  }
-
   int getNumberOfDatanodes(DatanodeReportType type) {
     return getDatanodeListForReport(type).size(); 
   }
@@ -4897,7 +4893,7 @@ public class FSNamesystem implements FSC
      */
     boolean needEnter() {
       return getSafeBlockRatio() < threshold ||
-          getNumLiveDataNodes() < datanodeThreshold;
+          numLiveDataNodes() < datanodeThreshold;
     }
       
     /**
@@ -4995,7 +4991,7 @@ public class FSNamesystem implements FSC
       if(blockTotal < 0)
         return leaveMsg + ".";
 
-      int numLive = getNumLiveDataNodes();
+      int numLive = numLiveDataNodes();
       String msg = "";
       if (reached == 0) {
         if (getSafeBlockRatio() < threshold) {



Mime
View raw message