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 xi...@apache.org on 2018/07/16 20:19:56 UTC
hadoop git commit: HDFS-13690. Improve error message when creating
encryption zone while KMS is unreachable. Contributed by Kitti Nanasi.
Repository: hadoop
Updated Branches:
refs/heads/trunk 0c7a57892 -> d2874e041
HDFS-13690. Improve error message when creating encryption zone while KMS is unreachable. Contributed by Kitti Nanasi.
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/d2874e04
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/d2874e04
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/d2874e04
Branch: refs/heads/trunk
Commit: d2874e04173613b1a3d44eabf8d449c8a3920fa4
Parents: 0c7a578
Author: Xiao Chen <xi...@apache.org>
Authored: Mon Jul 16 13:19:24 2018 -0700
Committer: Xiao Chen <xi...@apache.org>
Committed: Mon Jul 16 13:19:53 2018 -0700
----------------------------------------------------------------------
.../apache/hadoop/crypto/key/kms/KMSClientProvider.java | 11 ++++++++---
1 file changed, 8 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/d2874e04/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 11815da..8125510 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
@@ -56,6 +56,7 @@ import java.io.OutputStream;
import java.io.OutputStreamWriter;
import java.io.Writer;
import java.lang.reflect.UndeclaredThrowableException;
+import java.net.ConnectException;
import java.net.HttpURLConnection;
import java.net.InetSocketAddress;
import java.net.MalformedURLException;
@@ -478,10 +479,14 @@ public class KMSClientProvider extends KeyProvider implements CryptoExtension,
return authUrl.openConnection(url, authToken, doAsUser);
}
});
+ } catch (ConnectException ex) {
+ String msg = "Failed to connect to: " + url.toString();
+ LOG.warn(msg);
+ throw new IOException(msg, ex);
+ } catch (SocketTimeoutException ex) {
+ LOG.warn("Failed to connect to {}:{}", url.getHost(), url.getPort());
+ throw ex;
} catch (IOException ex) {
- if (ex instanceof SocketTimeoutException) {
- LOG.warn("Failed to connect to {}:{}", url.getHost(), url.getPort());
- }
throw ex;
} catch (UndeclaredThrowableException ex) {
throw new IOException(ex.getUndeclaredThrowable());
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org