Repository: hadoop Updated Branches: refs/heads/trunk d9bcf99ae -> baf8bc6c4
HDFS-4448. Allow HA NN to start in secure mode with wildcard address configured (atm via asuresh) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/baf8bc6c Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/baf8bc6c Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/baf8bc6c Branch: refs/heads/trunk Commit: baf8bc6c488de170d2caf76d9fa4c99faaa8f1a6 Parents: d9bcf99 Author: Arun Suresh <[email protected]> Authored: Thu Apr 23 01:42:24 2015 -0700 Committer: Arun Suresh <[email protected]> Committed: Thu Apr 23 01:44:17 2015 -0700 ---------------------------------------------------------------------- hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt | 3 +++ .../src/main/java/org/apache/hadoop/hdfs/DFSUtil.java | 9 +-------- 2 files changed, 4 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/baf8bc6c/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt index 521315b..b9f8787 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt +++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt @@ -461,6 +461,9 @@ Release 2.8.0 - UNRELEASED HDFS-8218. Move classes that used by ClientProtocol into hdfs-client. (wheat9) + HDFS-4448. Allow HA NN to start in secure mode with wildcard address + configured (atm via asuresh) + OPTIMIZATIONS HDFS-8026. Trace FSOutputSummer#writeChecksumChunks rather than http://git-wip-us.apache.org/repos/asf/hadoop/blob/baf8bc6c/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DFSUtil.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DFSUtil.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DFSUtil.java index 60a496f..078b0bb 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DFSUtil.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DFSUtil.java @@ -1017,17 +1017,10 @@ public class DFSUtil { */ @VisibleForTesting static String substituteForWildcardAddress(String configuredAddress, - String defaultHost) throws IOException { + String defaultHost) { InetSocketAddress sockAddr = NetUtils.createSocketAddr(configuredAddress); - InetSocketAddress defaultSockAddr = NetUtils.createSocketAddr(defaultHost - + ":0"); final InetAddress addr = sockAddr.getAddress(); if (addr != null && addr.isAnyLocalAddress()) { - if (UserGroupInformation.isSecurityEnabled() && - defaultSockAddr.getAddress().isAnyLocalAddress()) { - throw new IOException("Cannot use a wildcard address with security. " + - "Must explicitly set bind address for Kerberos"); - } return defaultHost + ":" + sockAddr.getPort(); } else { return configuredAddress;
