Repository: hadoop Updated Branches: refs/heads/branch-3.0 712e9381d -> 35247cca8
HDFS-13100. Handle IllegalArgumentException when GETSERVERDEFAULTS is not implemented in webhdfs. Contributed by Aaron T. Myers and Yongjun Zhang. (cherry picked from commit 4e9a59ce16e81b4bd6fae443a997ef24d588a6e8) (cherry picked from commit 0524fac21ef8a8e440a2fe759936e6fb6a63cbf1) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/35247cca Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/35247cca Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/35247cca Branch: refs/heads/branch-3.0 Commit: 35247cca874e1e7099e120fd02db867fd6d3c464 Parents: 712e938 Author: Yongjun Zhang <yzh...@cloudera.com> Authored: Fri Feb 2 22:58:44 2018 -0800 Committer: Xiao Chen <x...@apache.org> Committed: Sun Feb 4 22:53:09 2018 -0800 ---------------------------------------------------------------------- .../org/apache/hadoop/hdfs/web/WebHdfsFileSystem.java | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/35247cca/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 d05cfec..f680062 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 @@ -1852,8 +1852,17 @@ public class WebHdfsFileSystem extends FileSystem try { keyProviderUri = getServerDefaults().getKeyProviderUri(); } catch (UnsupportedOperationException e) { - // This means server doesn't supports GETSERVERDEFAULTS call. + // This means server doesn't support GETSERVERDEFAULTS call. // Do nothing, let keyProviderUri = null. + } catch (RemoteException e) { + if (e.getClassName() != null && + e.getClassName().equals("java.lang.IllegalArgumentException")) { + // See HDFS-13100. + // This means server doesn't support GETSERVERDEFAULTS call. + // Do nothing, let keyProviderUri = null. + } else { + throw e; + } } return HdfsKMSUtil.getKeyProviderUri(ugi, getUri(), keyProviderUri, getConf()); --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org For additional commands, e-mail: common-commits-h...@hadoop.apache.org
