This is an automated email from the ASF dual-hosted git repository.
adoroszlai pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ozone.git
The following commit(s) were added to refs/heads/master by this push:
new c7a196f313 HDDS-11635. Memory leak when using Ozone FS via Hadoop
FileContext API (#7382)
c7a196f313 is described below
commit c7a196f3134613f23a5fffeaf50920235be94196
Author: aekom87 <[email protected]>
AuthorDate: Fri Nov 1 19:11:47 2024 +0300
HDDS-11635. Memory leak when using Ozone FS via Hadoop FileContext API
(#7382)
---
.../src/main/java/org/apache/hadoop/fs/ozone/BasicOzFs.java | 9 +++++++++
.../src/main/java/org/apache/hadoop/fs/ozone/OzFs.java | 9 +++++++++
.../src/main/java/org/apache/hadoop/fs/ozone/RootedOzFs.java | 9 +++++++++
.../src/main/java/org/apache/hadoop/fs/ozone/OzFs.java | 9 +++++++++
.../src/main/java/org/apache/hadoop/fs/ozone/RootedOzFs.java | 9 +++++++++
.../ozonefs/src/main/java/org/apache/hadoop/fs/ozone/OzFs.java | 9 +++++++++
.../src/main/java/org/apache/hadoop/fs/ozone/RootedOzFs.java | 9 +++++++++
7 files changed, 63 insertions(+)
diff --git
a/hadoop-ozone/ozonefs-common/src/main/java/org/apache/hadoop/fs/ozone/BasicOzFs.java
b/hadoop-ozone/ozonefs-common/src/main/java/org/apache/hadoop/fs/ozone/BasicOzFs.java
index acab6d168c..9f7551aa8f 100644
---
a/hadoop-ozone/ozonefs-common/src/main/java/org/apache/hadoop/fs/ozone/BasicOzFs.java
+++
b/hadoop-ozone/ozonefs-common/src/main/java/org/apache/hadoop/fs/ozone/BasicOzFs.java
@@ -46,4 +46,13 @@ public class BasicOzFs 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-ozone/ozonefs-hadoop2/src/main/java/org/apache/hadoop/fs/ozone/OzFs.java
b/hadoop-ozone/ozonefs-hadoop2/src/main/java/org/apache/hadoop/fs/ozone/OzFs.java
index b5012f95c4..e1cb391da5 100644
---
a/hadoop-ozone/ozonefs-hadoop2/src/main/java/org/apache/hadoop/fs/ozone/OzFs.java
+++
b/hadoop-ozone/ozonefs-hadoop2/src/main/java/org/apache/hadoop/fs/ozone/OzFs.java
@@ -45,4 +45,13 @@ public class OzFs 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-ozone/ozonefs-hadoop2/src/main/java/org/apache/hadoop/fs/ozone/RootedOzFs.java
b/hadoop-ozone/ozonefs-hadoop2/src/main/java/org/apache/hadoop/fs/ozone/RootedOzFs.java
index 4cd04da9c8..0f421a8552 100644
---
a/hadoop-ozone/ozonefs-hadoop2/src/main/java/org/apache/hadoop/fs/ozone/RootedOzFs.java
+++
b/hadoop-ozone/ozonefs-hadoop2/src/main/java/org/apache/hadoop/fs/ozone/RootedOzFs.java
@@ -46,4 +46,13 @@ public class RootedOzFs 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-ozone/ozonefs-hadoop3/src/main/java/org/apache/hadoop/fs/ozone/OzFs.java
b/hadoop-ozone/ozonefs-hadoop3/src/main/java/org/apache/hadoop/fs/ozone/OzFs.java
index 914832e2cf..b1e046547f 100644
---
a/hadoop-ozone/ozonefs-hadoop3/src/main/java/org/apache/hadoop/fs/ozone/OzFs.java
+++
b/hadoop-ozone/ozonefs-hadoop3/src/main/java/org/apache/hadoop/fs/ozone/OzFs.java
@@ -40,4 +40,13 @@ public class OzFs extends DelegateToFileSystem {
super(theUri, new OzoneFileSystem(), conf,
OzoneConsts.OZONE_URI_SCHEME, false);
}
+
+ /**
+ * 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-ozone/ozonefs-hadoop3/src/main/java/org/apache/hadoop/fs/ozone/RootedOzFs.java
b/hadoop-ozone/ozonefs-hadoop3/src/main/java/org/apache/hadoop/fs/ozone/RootedOzFs.java
index 076287eaac..81bbaacd7c 100644
---
a/hadoop-ozone/ozonefs-hadoop3/src/main/java/org/apache/hadoop/fs/ozone/RootedOzFs.java
+++
b/hadoop-ozone/ozonefs-hadoop3/src/main/java/org/apache/hadoop/fs/ozone/RootedOzFs.java
@@ -41,4 +41,13 @@ public class RootedOzFs extends DelegateToFileSystem {
super(theUri, new RootedOzoneFileSystem(), conf,
OzoneConsts.OZONE_OFS_URI_SCHEME, false);
}
+
+ /**
+ * 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-ozone/ozonefs/src/main/java/org/apache/hadoop/fs/ozone/OzFs.java
b/hadoop-ozone/ozonefs/src/main/java/org/apache/hadoop/fs/ozone/OzFs.java
index 346b994a3a..548e11f5d4 100644
--- a/hadoop-ozone/ozonefs/src/main/java/org/apache/hadoop/fs/ozone/OzFs.java
+++ b/hadoop-ozone/ozonefs/src/main/java/org/apache/hadoop/fs/ozone/OzFs.java
@@ -41,4 +41,13 @@ public class OzFs extends DelegateToFileSystem {
super(theUri, new OzoneFileSystem(), conf,
OzoneConsts.OZONE_URI_SCHEME, false);
}
+
+ /**
+ * 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-ozone/ozonefs/src/main/java/org/apache/hadoop/fs/ozone/RootedOzFs.java
b/hadoop-ozone/ozonefs/src/main/java/org/apache/hadoop/fs/ozone/RootedOzFs.java
index 076287eaac..81bbaacd7c 100644
---
a/hadoop-ozone/ozonefs/src/main/java/org/apache/hadoop/fs/ozone/RootedOzFs.java
+++
b/hadoop-ozone/ozonefs/src/main/java/org/apache/hadoop/fs/ozone/RootedOzFs.java
@@ -41,4 +41,13 @@ public class RootedOzFs extends DelegateToFileSystem {
super(theUri, new RootedOzoneFileSystem(), conf,
OzoneConsts.OZONE_OFS_URI_SCHEME, false);
}
+
+ /**
+ * 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: [email protected]
For additional commands, e-mail: [email protected]
