HADOOP-3760. Fix a bug with HDFS file close() mistakenly introduced

by HADOOP-3681. (Lohit Vijayarenu via rangadi)


git-svn-id: https://svn.apache.org/repos/asf/hadoop/core/trunk@677126 13f79535-47bb-0310-9956-ffa450edef68

CHANGES.txt

@@ -844,6 +844,9 @@ Release 0.17.2 - Unreleased
 
   BUG FIXES
 
+    HADOOP-3760. Fix a bug with HDFS file close() mistakenly introduced
+    by HADOOP-3681. (Lohit Vijayarenu via rangadi)
+
     HADOOP-3681. DFSClient can get into an infinite loop while closing
     a file if there are some errors. (Lohit Vijayarenu via rangadi)
 

src/hdfs/org/apache/hadoop/hdfs/DFSClient.java

@@ -2704,8 +2704,8 @@ public class DFSClient implements FSConstants {
           }
 
         flushInternal();             // flush all data to Datanodes
-        isClosed();
-        closed = true;
+        isClosed(); // check to see if flushInternal had any exceptions
+        closed = true; // allow closeThreads() to showdown threads
 
         closeThreads();
         
@@ -2727,8 +2727,6 @@ public class DFSClient implements FSConstants {
 
         long localstart = System.currentTimeMillis();
         boolean fileComplete = false;
-        int fileCompleteRetry = 0;
-        final int checkFileCompleteRetry = 10;
         while (!fileComplete) {
           fileComplete = namenode.complete(src, clientName);
           if (!fileComplete) {
@@ -2739,9 +2737,6 @@ public class DFSClient implements FSConstants {
               }
             } catch (InterruptedException ie) {
             }
-            // after retrying for checkFileCompleteRetry times check isClosed() 
-            if ((++fileCompleteRetry % checkFileCompleteRetry) == 0) 
-              isClosed();
           }
         }
       } finally {