Return-Path: X-Original-To: apmail-hadoop-common-commits-archive@www.apache.org Delivered-To: apmail-hadoop-common-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id E4DA817E56 for ; Mon, 27 Apr 2015 21:26:09 +0000 (UTC) Received: (qmail 80329 invoked by uid 500); 27 Apr 2015 21:26:04 -0000 Delivered-To: apmail-hadoop-common-commits-archive@hadoop.apache.org Received: (qmail 80235 invoked by uid 500); 27 Apr 2015 21:26:04 -0000 Mailing-List: contact common-commits-help@hadoop.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: common-dev@hadoop.apache.org Delivered-To: mailing list common-commits@hadoop.apache.org Received: (qmail 80217 invoked by uid 99); 27 Apr 2015 21:26:04 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 27 Apr 2015 21:26:04 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 5498BE17E4; Mon, 27 Apr 2015 21:26:04 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: zjshen@apache.org To: common-commits@hadoop.apache.org Date: Mon, 27 Apr 2015 21:26:05 -0000 Message-Id: <1c0da04aab834e6b8430f899c144d73f@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [02/50] [abbrv] hadoop git commit: HDFS-4448. Allow HA NN to start in secure mode with wildcard address configured (atm via asuresh) 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/a4dc6af1 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/a4dc6af1 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/a4dc6af1 Branch: refs/heads/YARN-2928 Commit: a4dc6af18676dbf80d669ae1c58499e8307f92c2 Parents: eb4aee5 Author: Arun Suresh Authored: Thu Apr 23 01:42:24 2015 -0700 Committer: Zhijie Shen Committed: Mon Apr 27 13:35:22 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/a4dc6af1/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/a4dc6af1/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;