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 st...@apache.org on 2022/10/18 14:32:08 UTC
[hadoop] branch branch-3.3.5 updated (a05b01e71f1 -> 84404257c14)
This is an automated email from the ASF dual-hosted git repository.
stevel pushed a change to branch branch-3.3.5
in repository https://gitbox.apache.org/repos/asf/hadoop.git
from a05b01e71f1 HADOOP-17563. Upgrade BouncyCastle to 1.68 (#3980) (#5015)
new 193e042dd05 HADOOP-18497. Upgrade commons-text version to 1.10.0 to fix CVE-2022-42889. (#5037).
new 84404257c14 HADOOP-18476. Abfs and S3A FileContext bindings to close wrapped filesystems in finalizer (#4966)
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
LICENSE-binary | 2 +-
hadoop-project/pom.xml | 2 +-
.../src/main/java/org/apache/hadoop/fs/s3a/S3A.java | 13 +++++++++++--
.../src/main/java/org/apache/hadoop/fs/azurebfs/Abfs.java | 9 +++++++++
.../src/main/java/org/apache/hadoop/fs/azurebfs/Abfss.java | 9 +++++++++
5 files changed, 31 insertions(+), 4 deletions(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org
[hadoop] 02/02: HADOOP-18476. Abfs and S3A FileContext bindings to close wrapped filesystems in finalizer (#4966)
Posted by st...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
stevel pushed a commit to branch branch-3.3.5
in repository https://gitbox.apache.org/repos/asf/hadoop.git
commit 84404257c14c5de5393b9ec538c35c4305a0e89f
Author: Steve Loughran <st...@cloudera.com>
AuthorDate: Tue Oct 18 14:53:02 2022 +0100
HADOOP-18476. Abfs and S3A FileContext bindings to close wrapped filesystems in finalizer (#4966)
This is to try and close the underlying filesystems when the FileContext APIs are used.
Without this, threads may be leaked
Contributed by Steve Loughran
---
.../src/main/java/org/apache/hadoop/fs/s3a/S3A.java | 13 +++++++++++--
.../src/main/java/org/apache/hadoop/fs/azurebfs/Abfs.java | 9 +++++++++
.../src/main/java/org/apache/hadoop/fs/azurebfs/Abfss.java | 9 +++++++++
3 files changed, 29 insertions(+), 2 deletions(-)
diff --git a/hadoop-tools/hadoop-aws/src/main/java/org/apache/hadoop/fs/s3a/S3A.java b/hadoop-tools/hadoop-aws/src/main/java/org/apache/hadoop/fs/s3a/S3A.java
index 78643cc5e04..ec433fa95c2 100644
--- a/hadoop-tools/hadoop-aws/src/main/java/org/apache/hadoop/fs/s3a/S3A.java
+++ b/hadoop-tools/hadoop-aws/src/main/java/org/apache/hadoop/fs/s3a/S3A.java
@@ -33,10 +33,10 @@ import java.net.URISyntaxException;
*/
@InterfaceAudience.Public
@InterfaceStability.Evolving
-public class S3A extends DelegateToFileSystem{
+public class S3A extends DelegateToFileSystem {
public S3A(URI theUri, Configuration conf)
- throws IOException, URISyntaxException {
+ throws IOException, URISyntaxException {
super(theUri, new S3AFileSystem(), conf, "s3a", false);
}
@@ -54,4 +54,13 @@ public class S3A extends DelegateToFileSystem{
sb.append('}');
return sb.toString();
}
+
+ /**
+ * Close the file system; the FileContext API doesn't have an explicit close.
+ */
+ @Override
+ protected void finalize() throws Throwable {
+ fsImpl.close();
+ super.finalize();
+ }
}
diff --git a/hadoop-tools/hadoop-azure/src/main/java/org/apache/hadoop/fs/azurebfs/Abfs.java b/hadoop-tools/hadoop-azure/src/main/java/org/apache/hadoop/fs/azurebfs/Abfs.java
index 32df9422386..e595b2f4efa 100644
--- a/hadoop-tools/hadoop-azure/src/main/java/org/apache/hadoop/fs/azurebfs/Abfs.java
+++ b/hadoop-tools/hadoop-azure/src/main/java/org/apache/hadoop/fs/azurebfs/Abfs.java
@@ -43,4 +43,13 @@ public class Abfs extends DelegateToFileSystem {
public int getUriDefaultPort() {
return -1;
}
+
+ /**
+ * Close the file system; the FileContext API doesn't have an explicit close.
+ */
+ @Override
+ protected void finalize() throws Throwable {
+ fsImpl.close();
+ super.finalize();
+ }
}
diff --git a/hadoop-tools/hadoop-azure/src/main/java/org/apache/hadoop/fs/azurebfs/Abfss.java b/hadoop-tools/hadoop-azure/src/main/java/org/apache/hadoop/fs/azurebfs/Abfss.java
index c33265ce324..ba20bbb5d76 100644
--- a/hadoop-tools/hadoop-azure/src/main/java/org/apache/hadoop/fs/azurebfs/Abfss.java
+++ b/hadoop-tools/hadoop-azure/src/main/java/org/apache/hadoop/fs/azurebfs/Abfss.java
@@ -43,4 +43,13 @@ public class Abfss extends DelegateToFileSystem {
public int getUriDefaultPort() {
return -1;
}
+
+ /**
+ * Close the file system; the FileContext API doesn't have an explicit close.
+ */
+ @Override
+ protected void finalize() throws Throwable {
+ fsImpl.close();
+ super.finalize();
+ }
}
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org
[hadoop] 01/02: HADOOP-18497. Upgrade commons-text version to 1.10.0 to fix CVE-2022-42889. (#5037).
Posted by st...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
stevel pushed a commit to branch branch-3.3.5
in repository https://gitbox.apache.org/repos/asf/hadoop.git
commit 193e042dd0596bec74fcb8445d6239011211fd09
Author: Hexiaoqiao <he...@apache.org>
AuthorDate: Tue Oct 18 22:05:08 2022 +0800
HADOOP-18497. Upgrade commons-text version to 1.10.0 to fix CVE-2022-42889. (#5037).
Contributed by PJ Fanning.
---
LICENSE-binary | 2 +-
hadoop-project/pom.xml | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/LICENSE-binary b/LICENSE-binary
index 5f5a5a4b2c0..56b3e803a51 100644
--- a/LICENSE-binary
+++ b/LICENSE-binary
@@ -314,7 +314,7 @@ org.apache.commons:commons-csv:1.9.0
org.apache.commons:commons-digester:1.8.1
org.apache.commons:commons-lang3:3.12.0
org.apache.commons:commons-math3:3.1.1
-org.apache.commons:commons-text:1.9
+org.apache.commons:commons-text:1.10.0
org.apache.commons:commons-validator:1.6
org.apache.curator:curator-client:4.2.0
org.apache.curator:curator-framework:4.2.0
diff --git a/hadoop-project/pom.xml b/hadoop-project/pom.xml
index abe9f94e99c..c320954670d 100644
--- a/hadoop-project/pom.xml
+++ b/hadoop-project/pom.xml
@@ -125,7 +125,7 @@
<commons-logging-api.version>1.1</commons-logging-api.version>
<commons-math3.version>3.1.1</commons-math3.version>
<commons-net.version>3.6</commons-net.version>
- <commons-text.version>1.9</commons-text.version>
+ <commons-text.version>1.10.0</commons-text.version>
<kerby.version>1.0.1</kerby.version>
<jcache.version>1.0-alpha-1</jcache.version>
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org