Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 1DB8A200B9D for ; Thu, 29 Sep 2016 01:26:30 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 1C4F8160AD3; Wed, 28 Sep 2016 23:26:30 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 60B02160ADD for ; Thu, 29 Sep 2016 01:26:29 +0200 (CEST) Received: (qmail 64686 invoked by uid 500); 28 Sep 2016 23:26:28 -0000 Mailing-List: contact common-commits-help@hadoop.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Delivered-To: mailing list common-commits@hadoop.apache.org Received: (qmail 64465 invoked by uid 99); 28 Sep 2016 23:26:28 -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; Wed, 28 Sep 2016 23:26:28 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id E3362E09AC; Wed, 28 Sep 2016 23:26:27 +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: Wed, 28 Sep 2016 23:26:29 -0000 Message-Id: <080bf17d935c457a8e30cdd112b54a11@git.apache.org> In-Reply-To: <63dd277ac1804c9fabb44baeb9b99241@git.apache.org> References: <63dd277ac1804c9fabb44baeb9b99241@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [3/3] hadoop git commit: HADOOP-13599. s3a close() to be non-synchronized, so avoid risk of deadlock on shutdown. Contributed by Steve Loughran. archived-at: Wed, 28 Sep 2016 23:26:30 -0000 HADOOP-13599. s3a close() to be non-synchronized, so avoid risk of deadlock on shutdown. Contributed by Steve Loughran. (cherry picked from commit 47f80922dc7cb2fa6d084e6fb1f354c4ec1d4c69) (cherry picked from commit 1f1e47e41198760b0ddddceb489f2de2b569f38a) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/b7b06a5f Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/b7b06a5f Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/b7b06a5f Branch: refs/heads/branch-2.8 Commit: b7b06a5f3425f5ca6c34e5d0ac60105aae61a899 Parents: 7467628 Author: Chris Nauroth Authored: Wed Sep 28 15:53:17 2016 -0700 Committer: Chris Nauroth Committed: Wed Sep 28 16:21:10 2016 -0700 ---------------------------------------------------------------------- .../main/java/org/apache/hadoop/fs/s3a/S3AFileSystem.java | 7 ++++++- .../java/org/apache/hadoop/fs/s3a/TestS3AConfiguration.java | 8 ++++++++ 2 files changed, 14 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/b7b06a5f/hadoop-tools/hadoop-aws/src/main/java/org/apache/hadoop/fs/s3a/S3AFileSystem.java ---------------------------------------------------------------------- diff --git a/hadoop-tools/hadoop-aws/src/main/java/org/apache/hadoop/fs/s3a/S3AFileSystem.java b/hadoop-tools/hadoop-aws/src/main/java/org/apache/hadoop/fs/s3a/S3AFileSystem.java index 0c5e569..a7e36e4 100644 --- a/hadoop-tools/hadoop-aws/src/main/java/org/apache/hadoop/fs/s3a/S3AFileSystem.java +++ b/hadoop-tools/hadoop-aws/src/main/java/org/apache/hadoop/fs/s3a/S3AFileSystem.java @@ -127,6 +127,7 @@ public class S3AFileSystem extends FileSystem { private S3AInputPolicy inputPolicy; private static final AtomicBoolean warnedOfCoreThreadDeprecation = new AtomicBoolean(false); + private final AtomicBoolean closed = new AtomicBoolean(false); // The maximum number of entries that can be deleted in any call to s3 private static final int MAX_ENTRIES_TO_DELETE = 1000; @@ -1514,7 +1515,11 @@ public class S3AFileSystem extends FileSystem { * @throws IOException IO problem */ @Override - public synchronized void close() throws IOException { + public void close() throws IOException { + if (closed.getAndSet(true)) { + // already closed + return; + } try { super.close(); } finally { http://git-wip-us.apache.org/repos/asf/hadoop/blob/b7b06a5f/hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/s3a/TestS3AConfiguration.java ---------------------------------------------------------------------- diff --git a/hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/s3a/TestS3AConfiguration.java b/hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/s3a/TestS3AConfiguration.java index 3f9a99f..99934a5 100644 --- a/hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/s3a/TestS3AConfiguration.java +++ b/hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/s3a/TestS3AConfiguration.java @@ -401,6 +401,14 @@ public class TestS3AConfiguration { awsConf.getUserAgent()); } + @Test + public void testCloseIdempotent() throws Throwable { + conf = new Configuration(); + fs = S3ATestUtils.createTestFileSystem(conf); + fs.close(); + fs.close(); + } + /** * Reads and returns a field from an object using reflection. If the field * cannot be found, is null, or is not the expected type, then this method --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org For additional commands, e-mail: common-commits-help@hadoop.apache.org