HDFS-3846. Namenode deadlock in branch-1. Contributed by Brandon Li.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-1@1376739 13f79535-47bb-0310-9956-ffa450edef68

CHANGES.txt

@@ -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

src/hdfs/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java

@@ -4207,10 +4207,6 @@ public class FSNamesystem implements FSConstants, FSNamesystemMBean, FSClusterSt
     }
   }
 
-  int getNumLiveDataNodes() {
-    return getNumberOfDatanodes(DatanodeReportType.LIVE);
-  }
-
   int getNumberOfDatanodes(DatanodeReportType type) {
     return getDatanodeListForReport(type).size(); 
   }
@@ -4897,7 +4893,7 @@ public class FSNamesystem implements FSConstants, FSNamesystemMBean, FSClusterSt
      */
     boolean needEnter() {
       return getSafeBlockRatio() < threshold ||
-          getNumLiveDataNodes() < datanodeThreshold;
+          numLiveDataNodes() < datanodeThreshold;
     }
       
     /**
@@ -4995,7 +4991,7 @@ public class FSNamesystem implements FSConstants, FSNamesystemMBean, FSClusterSt
       if(blockTotal < 0)
         return leaveMsg + ".";
 
-      int numLive = getNumLiveDataNodes();
+      int numLive = numLiveDataNodes();
       String msg = "";
       if (reached == 0) {
         if (getSafeBlockRatio() < threshold) {