Repository: hadoop Updated Branches: refs/heads/branch-2 63ccb9167 -> 889b92fa4
HDFS-4448. Allow HA NN to start in secure mode with wildcard address configured (atm via asuresh) (cherry picked from commit baf8bc6c488de170d2caf76d9fa4c99faaa8f1a6) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/889b92fa Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/889b92fa Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/889b92fa Branch: refs/heads/branch-2 Commit: 889b92fa403f5bd82b20eb2333110c5793d28a34 Parents: 63ccb91 Author: Arun Suresh <asur...@apache.org> Authored: Thu Apr 23 01:42:24 2015 -0700 Committer: Arun Suresh <asur...@apache.org> Committed: Thu Apr 23 01:45:33 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/889b92fa/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 45d8929..83c5ed2 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt +++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt @@ -143,6 +143,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/889b92fa/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 73ef95b..600f15f 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 @@ -1018,17 +1018,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;
