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 br...@apache.org on 2017/01/03 14:03:52 UTC

[1/4] hadoop git commit: Revert "HDFS-11280. Allow WebHDFS to reuse HTTP connections to NN. Contributed by Zheng Shao."

Repository: hadoop
Updated Branches:
  refs/heads/branch-2 d6e5e4288 -> 029b6fbe7
  refs/heads/branch-2.7 d90f7412f -> a3f4ee53c
  refs/heads/branch-2.8 b8be8f0d4 -> 7392a5a72
  refs/heads/trunk 6938b6771 -> b31e1951e


Revert "HDFS-11280. Allow WebHDFS to reuse HTTP connections to NN. Contributed by Zheng Shao."

This reverts commit b811a1c14d00ab236158ab75fad1fe41364045a4.


Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/b31e1951
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/b31e1951
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/b31e1951

Branch: refs/heads/trunk
Commit: b31e1951e044b2c6f6e88a007a8c175941ddd674
Parents: 6938b67
Author: Brahma Reddy Battula <br...@apache.org>
Authored: Tue Jan 3 19:19:29 2017 +0530
Committer: Brahma Reddy Battula <br...@apache.org>
Committed: Tue Jan 3 19:19:29 2017 +0530

----------------------------------------------------------------------
 .../org/apache/hadoop/hdfs/web/WebHdfsFileSystem.java    | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hadoop/blob/b31e1951/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/web/WebHdfsFileSystem.java
----------------------------------------------------------------------
diff --git a/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/web/WebHdfsFileSystem.java b/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/web/WebHdfsFileSystem.java
index c89913e..26cfc01 100644
--- a/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/web/WebHdfsFileSystem.java
+++ b/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/web/WebHdfsFileSystem.java
@@ -659,9 +659,7 @@ public class WebHdfsFileSystem extends FileSystem
           url = new URL(conn.getHeaderField("Location"));
           redirectHost = url.getHost() + ":" + url.getPort();
         } finally {
-          // Don't call conn.disconnect() to allow connection reuse
-          // See http://tinyurl.com/java7-http-keepalive
-          conn.getInputStream().close();
+          conn.disconnect();
         }
       }
       try {
@@ -893,9 +891,7 @@ public class WebHdfsFileSystem extends FileSystem
         LOG.debug("Response decoding failure.", e);
         throw ioe;
       } finally {
-        // Don't call conn.disconnect() to allow connection reuse
-        // See http://tinyurl.com/java7-http-keepalive
-        conn.getInputStream().close();
+        conn.disconnect();
       }
     }
 
@@ -942,9 +938,6 @@ public class WebHdfsFileSystem extends FileSystem
             try {
               validateResponse(op, conn, true);
             } finally {
-              // This is a connection to DataNode.  Let's disconnect since
-              // there is little chance that the connection will be reused
-              // any time soonl
               conn.disconnect();
             }
           }


---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org


[4/4] hadoop git commit: Revert "HDFS-11280. Allow WebHDFS to reuse HTTP connections to NN. Contributed by Zheng Shao."

Posted by br...@apache.org.
Revert "HDFS-11280. Allow WebHDFS to reuse HTTP connections to NN. Contributed by Zheng Shao."

This reverts commit d90f7412f2162550d3cc9a3ae33f330e7114bc5c.


Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/a3f4ee53
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/a3f4ee53
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/a3f4ee53

Branch: refs/heads/branch-2.7
Commit: a3f4ee53c80a169b15e24d63032081740b741f39
Parents: d90f741
Author: Brahma Reddy Battula <br...@apache.org>
Authored: Tue Jan 3 19:32:39 2017 +0530
Committer: Brahma Reddy Battula <br...@apache.org>
Committed: Tue Jan 3 19:32:39 2017 +0530

----------------------------------------------------------------------
 .../org/apache/hadoop/hdfs/web/WebHdfsFileSystem.java    | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hadoop/blob/a3f4ee53/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/web/WebHdfsFileSystem.java
----------------------------------------------------------------------
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/web/WebHdfsFileSystem.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/web/WebHdfsFileSystem.java
index a599705..ccfed0b 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/web/WebHdfsFileSystem.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/web/WebHdfsFileSystem.java
@@ -545,9 +545,7 @@ public class WebHdfsFileSystem extends FileSystem
           url = new URL(conn.getHeaderField("Location"));
           redirectHost = url.getHost() + ":" + url.getPort();
         } finally {
-          // Don't call conn.disconnect() to allow connection reuse
-          // See http://tinyurl.com/java7-http-keepalive
-          conn.getInputStream().close();
+          conn.disconnect();
         }
       }
       try {
@@ -776,9 +774,7 @@ public class WebHdfsFileSystem extends FileSystem
         }
         throw ioe;
       } finally {
-        // Don't call conn.disconnect() to allow connection reuse
-        // See http://tinyurl.com/java7-http-keepalive
-        conn.getInputStream().close();
+        conn.disconnect();
       }
     }
     
@@ -824,9 +820,6 @@ public class WebHdfsFileSystem extends FileSystem
             try {
               validateResponse(op, conn, true);
             } finally {
-              // This is a connection to DataNode.  Let's disconnect since
-              // there is little chance that the connection will be reused
-              // any time soonl
               conn.disconnect();
             }
           }


---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org


[3/4] hadoop git commit: Revert "HDFS-11280. Allow WebHDFS to reuse HTTP connections to NN. Contributed by Zheng Shao."

Posted by br...@apache.org.
Revert "HDFS-11280. Allow WebHDFS to reuse HTTP connections to NN. Contributed by Zheng Shao."

This reverts commit 0ff9efcf37e7e86c6b7e187df8e676c1e93fe0e7.


Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/7392a5a7
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/7392a5a7
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/7392a5a7

Branch: refs/heads/branch-2.8
Commit: 7392a5a72cbde9f0fcf5c5463506bb8bcdbf856e
Parents: b8be8f0
Author: Brahma Reddy Battula <br...@apache.org>
Authored: Tue Jan 3 19:30:45 2017 +0530
Committer: Brahma Reddy Battula <br...@apache.org>
Committed: Tue Jan 3 19:30:45 2017 +0530

----------------------------------------------------------------------
 .../org/apache/hadoop/hdfs/web/WebHdfsFileSystem.java    | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hadoop/blob/7392a5a7/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/web/WebHdfsFileSystem.java
----------------------------------------------------------------------
diff --git a/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/web/WebHdfsFileSystem.java b/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/web/WebHdfsFileSystem.java
index 4e143cc..166e3c3 100644
--- a/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/web/WebHdfsFileSystem.java
+++ b/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/web/WebHdfsFileSystem.java
@@ -663,9 +663,7 @@ public class WebHdfsFileSystem extends FileSystem
           url = new URL(conn.getHeaderField("Location"));
           redirectHost = url.getHost() + ":" + url.getPort();
         } finally {
-          // Don't call conn.disconnect() to allow connection reuse
-          // See http://tinyurl.com/java7-http-keepalive
-          conn.getInputStream().close();
+          conn.disconnect();
         }
       }
       try {
@@ -897,9 +895,7 @@ public class WebHdfsFileSystem extends FileSystem
         LOG.debug("Response decoding failure.", e);
         throw ioe;
       } finally {
-        // Don't call conn.disconnect() to allow connection reuse
-        // See http://tinyurl.com/java7-http-keepalive
-        conn.getInputStream().close();
+        conn.disconnect();
       }
     }
 
@@ -946,9 +942,6 @@ public class WebHdfsFileSystem extends FileSystem
             try {
               validateResponse(op, conn, true);
             } finally {
-              // This is a connection to DataNode.  Let's disconnect since
-              // there is little chance that the connection will be reused
-              // any time soonl
               conn.disconnect();
             }
           }


---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org


[2/4] hadoop git commit: Revert "HDFS-11280. Allow WebHDFS to reuse HTTP connections to NN. Contributed by Zheng Shao."

Posted by br...@apache.org.
Revert "HDFS-11280. Allow WebHDFS to reuse HTTP connections to NN. Contributed by Zheng Shao."

This reverts commit 1bc9b316ba60b1ecc8d6fca8d78642933d2c186b.


Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/029b6fbe
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/029b6fbe
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/029b6fbe

Branch: refs/heads/branch-2
Commit: 029b6fbe7153fd0ec1a65d334f865cdcf75f27c4
Parents: d6e5e42
Author: Brahma Reddy Battula <br...@apache.org>
Authored: Tue Jan 3 19:26:44 2017 +0530
Committer: Brahma Reddy Battula <br...@apache.org>
Committed: Tue Jan 3 19:26:44 2017 +0530

----------------------------------------------------------------------
 .../org/apache/hadoop/hdfs/web/WebHdfsFileSystem.java    | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hadoop/blob/029b6fbe/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/web/WebHdfsFileSystem.java
----------------------------------------------------------------------
diff --git a/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/web/WebHdfsFileSystem.java b/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/web/WebHdfsFileSystem.java
index 4cc5b67..1607be9 100644
--- a/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/web/WebHdfsFileSystem.java
+++ b/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/web/WebHdfsFileSystem.java
@@ -667,9 +667,7 @@ public class WebHdfsFileSystem extends FileSystem
           url = new URL(conn.getHeaderField("Location"));
           redirectHost = url.getHost() + ":" + url.getPort();
         } finally {
-          // Don't call conn.disconnect() to allow connection reuse
-          // See http://tinyurl.com/java7-http-keepalive
-          conn.getInputStream().close();
+          conn.disconnect();
         }
       }
       try {
@@ -901,9 +899,7 @@ public class WebHdfsFileSystem extends FileSystem
         LOG.debug("Response decoding failure.", e);
         throw ioe;
       } finally {
-        // Don't call conn.disconnect() to allow connection reuse
-        // See http://tinyurl.com/java7-http-keepalive
-        conn.getInputStream().close();
+        conn.disconnect();
       }
     }
 
@@ -950,9 +946,6 @@ public class WebHdfsFileSystem extends FileSystem
             try {
               validateResponse(op, conn, true);
             } finally {
-              // This is a connection to DataNode.  Let's disconnect since
-              // there is little chance that the connection will be reused
-              // any time soonl
               conn.disconnect();
             }
           }


---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org