hadoop-common-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ma...@apache.org
Subject svn commit: r1411088 - in /hadoop/common/branches/branch-1.1: CHANGES.txt src/hdfs/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java
Date Mon, 19 Nov 2012 07:26:08 GMT
Author: mattf
Date: Mon Nov 19 07:26:07 2012
New Revision: 1411088

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

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

Modified: hadoop/common/branches/branch-1.1/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-1.1/CHANGES.txt?rev=1411088&r1=1411087&r2=1411088&view=diff
==============================================================================
--- hadoop/common/branches/branch-1.1/CHANGES.txt (original)
+++ hadoop/common/branches/branch-1.1/CHANGES.txt Mon Nov 19 07:26:07 2012
@@ -61,6 +61,8 @@ Release 1.1.1 - 2012.11.18
 
     HDFS-3658. Fix bugs in TestDFSClientRetries and add more tests.  (szetszwo)
 
+    HDFS-3846. Namenode deadlock in branch-1. (Brandon Li via jitendra)
+
 Release 1.1.0 - 2012.09.28
 
   INCOMPATIBLE CHANGES

Modified: hadoop/common/branches/branch-1.1/src/hdfs/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-1.1/src/hdfs/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java?rev=1411088&r1=1411087&r2=1411088&view=diff
==============================================================================
--- hadoop/common/branches/branch-1.1/src/hdfs/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java
(original)
+++ hadoop/common/branches/branch-1.1/src/hdfs/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java
Mon Nov 19 07:26:07 2012
@@ -4308,10 +4308,6 @@ public class FSNamesystem implements FSC
     }
   }
 
-  int getNumLiveDataNodes() {
-    return getNumberOfDatanodes(DatanodeReportType.LIVE);
-  }
-
   int getNumberOfDatanodes(DatanodeReportType type) {
     return getDatanodeListForReport(type).size(); 
   }
@@ -4998,7 +4994,7 @@ public class FSNamesystem implements FSC
      */
     boolean needEnter() {
       return getSafeBlockRatio() < threshold ||
-          getNumLiveDataNodes() < datanodeThreshold;
+          numLiveDataNodes() < datanodeThreshold;
     }
       
     /**
@@ -5096,7 +5092,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