hadoop-common-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From shahr...@apache.org
Subject hadoop git commit: HADOOP-14841 Kms client should disconnect if unable to get output stream from connection. Contributed by Rushabh S Shah
Date Fri, 04 May 2018 20:45:00 GMT
Repository: hadoop
Updated Branches:
  refs/heads/branch-3.0 21442dcaa -> d9fae993b


HADOOP-14841 Kms client should disconnect if unable to get output stream from connection.
Contributed by Rushabh S Shah

(cherry picked from commit 4cdbdce752e192b45c2b9756c2d4bd24ceffdabd)


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

Branch: refs/heads/branch-3.0
Commit: d9fae993b47709aa295429542c3451aedf6aea0e
Parents: 21442dc
Author: Rushabh Shah <shahrs87@apache.org>
Authored: Fri May 4 15:36:13 2018 -0500
Committer: Rushabh Shah <shahrs87@apache.org>
Committed: Fri May 4 15:43:24 2018 -0500

----------------------------------------------------------------------
 .../hadoop/crypto/key/kms/KMSClientProvider.java       | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hadoop/blob/d9fae993/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/crypto/key/kms/KMSClientProvider.java
----------------------------------------------------------------------
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/crypto/key/kms/KMSClientProvider.java
b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/crypto/key/kms/KMSClientProvider.java
index f97fde7..45097ef 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/crypto/key/kms/KMSClientProvider.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/crypto/key/kms/KMSClientProvider.java
@@ -447,12 +447,21 @@ public class KMSClientProvider extends KeyProvider implements CryptoExtension,
       int expectedResponse, Class<T> klass, int authRetryCount)
       throws IOException {
     T ret = null;
+    OutputStream os = null;
     try {
       if (jsonOutput != null) {
-        writeJson(jsonOutput, conn.getOutputStream());
+        os = conn.getOutputStream();
+        writeJson(jsonOutput, os);
       }
     } catch (IOException ex) {
-      IOUtils.closeStream(conn.getInputStream());
+      // The payload is not serialized if getOutputStream fails.
+      // Calling getInputStream will issue the put/post request with no payload
+      // which causes HTTP 500 server error.
+      if (os == null) {
+        conn.disconnect();
+      } else {
+        IOUtils.closeStream(conn.getInputStream());
+      }
       throw ex;
     }
     if ((conn.getResponseCode() == HttpURLConnection.HTTP_FORBIDDEN


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


Mime
View raw message