You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by cn...@apache.org on 2016/09/28 23:26:28 UTC
[2/3] hadoop git commit: HADOOP-13599. s3a close() to be
non-synchronized,
so avoid risk of deadlock on shutdown. Contributed by Steve Loughran.
HADOOP-13599. s3a close() to be non-synchronized, so avoid risk of deadlock on shutdown. Contributed by Steve Loughran.
(cherry picked from commit 47f80922dc7cb2fa6d084e6fb1f354c4ec1d4c69)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/1f1e47e4
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/1f1e47e4
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/1f1e47e4
Branch: refs/heads/branch-2
Commit: 1f1e47e41198760b0ddddceb489f2de2b569f38a
Parents: a7c1636
Author: Chris Nauroth <cn...@apache.org>
Authored: Wed Sep 28 15:53:17 2016 -0700
Committer: Chris Nauroth <cn...@apache.org>
Committed: Wed Sep 28 16:21:00 2016 -0700
----------------------------------------------------------------------
.../main/java/org/apache/hadoop/fs/s3a/S3AFileSystem.java | 7 ++++++-
.../java/org/apache/hadoop/fs/s3a/ITestS3AConfiguration.java | 8 ++++++++
2 files changed, 14 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/1f1e47e4/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 f238362..87bf774 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
@@ -124,6 +124,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;
@@ -1423,7 +1424,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/1f1e47e4/hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/s3a/ITestS3AConfiguration.java
----------------------------------------------------------------------
diff --git a/hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/s3a/ITestS3AConfiguration.java b/hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/s3a/ITestS3AConfiguration.java
index fca8e49..b08bfe9 100644
--- a/hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/s3a/ITestS3AConfiguration.java
+++ b/hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/s3a/ITestS3AConfiguration.java
@@ -409,6 +409,14 @@ public class ITestS3AConfiguration {
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