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 AFF8917307 for ; Tue, 13 Jan 2015 17:50:07 +0000 (UTC) Received: (qmail 40658 invoked by uid 500); 13 Jan 2015 17:50:03 -0000 Delivered-To: apmail-hadoop-common-commits-archive@hadoop.apache.org Received: (qmail 40448 invoked by uid 500); 13 Jan 2015 17:50:03 -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 40098 invoked by uid 99); 13 Jan 2015 17:50:03 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 13 Jan 2015 17:50:03 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id C1DC29AF7CA; Tue, 13 Jan 2015 17:50:02 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: cnauroth@apache.org To: common-commits@hadoop.apache.org Date: Tue, 13 Jan 2015 17:50:05 -0000 Message-Id: <66e1535202174fcd80f85f9e1845f07b@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [04/50] [abbrv] hadoop git commit: HADOOP-11459. Fix recent findbugs in ActiveStandbyElector, NetUtils and ShellBasedIdMapping (Contributed by Vinayakumar B) HADOOP-11459. Fix recent findbugs in ActiveStandbyElector, NetUtils and ShellBasedIdMapping (Contributed by Vinayakumar B) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/9803ae37 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/9803ae37 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/9803ae37 Branch: refs/heads/HDFS-6994 Commit: 9803ae374f69942aec82ec6eeeb9722523a1ade0 Parents: 0c4b112 Author: Vinayakumar B Authored: Tue Jan 6 09:15:23 2015 +0530 Committer: Vinayakumar B Committed: Tue Jan 6 09:15:23 2015 +0530 ---------------------------------------------------------------------- hadoop-common-project/hadoop-common/CHANGES.txt | 5 ++++- .../main/java/org/apache/hadoop/ha/ActiveStandbyElector.java | 4 +++- .../src/main/java/org/apache/hadoop/net/NetUtils.java | 2 +- .../java/org/apache/hadoop/security/ShellBasedIdMapping.java | 2 +- 4 files changed, 9 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/9803ae37/hadoop-common-project/hadoop-common/CHANGES.txt ---------------------------------------------------------------------- diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt index 40e8d29..4ceb77d 100644 --- a/hadoop-common-project/hadoop-common/CHANGES.txt +++ b/hadoop-common-project/hadoop-common/CHANGES.txt @@ -670,7 +670,10 @@ Release 2.7.0 - UNRELEASED HADOOP-11446. S3AOutputStream should use shared thread pool to avoid OutOfMemoryError. (Ted Yu via stevel) - + + HADOOP-11459. Fix recent findbugs in ActiveStandbyElector, NetUtils + and ShellBasedIdMapping (vinayakumarb) + Release 2.6.0 - 2014-11-18 INCOMPATIBLE CHANGES http://git-wip-us.apache.org/repos/asf/hadoop/blob/9803ae37/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ha/ActiveStandbyElector.java ---------------------------------------------------------------------- diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ha/ActiveStandbyElector.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ha/ActiveStandbyElector.java index 123f119..947baa9 100644 --- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ha/ActiveStandbyElector.java +++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ha/ActiveStandbyElector.java @@ -1064,7 +1064,9 @@ public class ActiveStandbyElector implements StatCallback, StringCallback { public void process(WatchedEvent event) { hasReceivedEvent.countDown(); try { - hasSetZooKeeper.await(zkSessionTimeout, TimeUnit.MILLISECONDS); + if (!hasSetZooKeeper.await(zkSessionTimeout, TimeUnit.MILLISECONDS)) { + LOG.debug("Event received with stale zk"); + } ActiveStandbyElector.this.processWatchEvent( zk, event); } catch (Throwable t) { http://git-wip-us.apache.org/repos/asf/hadoop/blob/9803ae37/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/net/NetUtils.java ---------------------------------------------------------------------- diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/net/NetUtils.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/net/NetUtils.java index ffee402..ef1092b 100644 --- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/net/NetUtils.java +++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/net/NetUtils.java @@ -288,7 +288,7 @@ public class NetUtils { try { fqHost = SecurityUtil.getByName(host).getHostName(); // slight race condition, but won't hurt - canonicalizedHostCache.put(host, fqHost); + canonicalizedHostCache.putIfAbsent(host, fqHost); } catch (UnknownHostException e) { fqHost = host; } http://git-wip-us.apache.org/repos/asf/hadoop/blob/9803ae37/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/ShellBasedIdMapping.java ---------------------------------------------------------------------- diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/ShellBasedIdMapping.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/ShellBasedIdMapping.java index 428e835..28ab248 100644 --- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/ShellBasedIdMapping.java +++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/ShellBasedIdMapping.java @@ -290,7 +290,7 @@ public class ShellBasedIdMapping implements IdMappingServiceProvider { return true; } - private void initStaticMapping() throws IOException { + private synchronized void initStaticMapping() throws IOException { staticMapping = new StaticMapping( new HashMap(), new HashMap()); if (staticMappingFile.exists()) {