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 315ef204d8 HDDS-13175. Leftover reference to OM-specific trash
implementation (#8563)
315ef204d8 is described below
commit 315ef204d8370d3405dab60d1e057e6d22b8660b
Author: Doroszlai, Attila <[email protected]>
AuthorDate: Wed Jun 4 14:30:39 2025 +0200
HDDS-13175. Leftover reference to OM-specific trash implementation (#8563)
---
.../src/main/java/org/apache/hadoop/ozone/OzoneConfigKeys.java | 2 +-
hadoop-hdds/common/src/main/resources/ozone-default.xml | 2 +-
hadoop-hdds/docs/content/interface/Ofs.md | 2 +-
hadoop-hdds/docs/content/interface/Ofs.zh.md | 2 +-
.../apache/hadoop/fs/ozone/AbstractOzoneFileSystemTest.java | 3 +--
.../hadoop/fs/ozone/AbstractRootedOzoneFileSystemTest.java | 3 +--
.../java/org/apache/hadoop/ozone/shell/TestOzoneShellHA.java | 10 +++++-----
.../main/java/org/apache/hadoop/ozone/om/TrashPolicyOzone.java | 7 ++-----
8 files changed, 13 insertions(+), 18 deletions(-)
diff --git
a/hadoop-hdds/common/src/main/java/org/apache/hadoop/ozone/OzoneConfigKeys.java
b/hadoop-hdds/common/src/main/java/org/apache/hadoop/ozone/OzoneConfigKeys.java
index 7ffb02eb42..822cce29ad 100644
---
a/hadoop-hdds/common/src/main/java/org/apache/hadoop/ozone/OzoneConfigKeys.java
+++
b/hadoop-hdds/common/src/main/java/org/apache/hadoop/ozone/OzoneConfigKeys.java
@@ -621,7 +621,7 @@ public final class OzoneConfigKeys {
public static final String FS_TRASH_CLASSNAME = "fs.trash.classname";
public static final String FS_TRASH_CLASSNAME_DEFAULT =
- "org.apache.hadoop.ozone.om.TrashPolicyOzone";
+ "org.apache.hadoop.fs.ozone.OzoneTrashPolicy";
public static final String
OZONE_OM_SNAPSHOT_COMPACTION_DAG_MAX_TIME_ALLOWED =
diff --git a/hadoop-hdds/common/src/main/resources/ozone-default.xml
b/hadoop-hdds/common/src/main/resources/ozone-default.xml
index f2539b5895..bda52dcf9b 100644
--- a/hadoop-hdds/common/src/main/resources/ozone-default.xml
+++ b/hadoop-hdds/common/src/main/resources/ozone-default.xml
@@ -2789,7 +2789,7 @@
<property>
<name>fs.trash.classname</name>
- <value>org.apache.hadoop.ozone.om.TrashPolicyOzone</value>
+ <value>org.apache.hadoop.fs.ozone.OzoneTrashPolicy</value>
<tag>OZONE, OZONEFS, CLIENT</tag>
<description>
Trash Policy to be used.
diff --git a/hadoop-hdds/docs/content/interface/Ofs.md
b/hadoop-hdds/docs/content/interface/Ofs.md
index 3c3598b3ed..d37e2421d0 100644
--- a/hadoop-hdds/docs/content/interface/Ofs.md
+++ b/hadoop-hdds/docs/content/interface/Ofs.md
@@ -237,7 +237,7 @@ In order to enable trash in Ozone, Please add these configs
to core-site.xml
</property>
<property>
<name>fs.trash.classname</name>
- <value>org.apache.hadoop.ozone.om.TrashPolicyOzone</value>
+ <value>org.apache.hadoop.fs.ozone.OzoneTrashPolicy</value>
</property>
{{< /highlight >}}
diff --git a/hadoop-hdds/docs/content/interface/Ofs.zh.md
b/hadoop-hdds/docs/content/interface/Ofs.zh.md
index 25d7039f49..7086a7f3ce 100644
--- a/hadoop-hdds/docs/content/interface/Ofs.zh.md
+++ b/hadoop-hdds/docs/content/interface/Ofs.zh.md
@@ -220,7 +220,7 @@ $ ozone fs -put ./NOTICE.txt ofs://om/tmp/key1
</property>
<property>
<name>fs.trash.classname</name>
- <value>org.apache.hadoop.ozone.om.TrashPolicyOzone</value>
+ <value>org.apache.hadoop.fs.ozone.OzoneTrashPolicy</value>
</property>
{{< /highlight >}}
diff --git
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/AbstractOzoneFileSystemTest.java
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/AbstractOzoneFileSystemTest.java
index a4d7e9675d..b65ff6cb9a 100644
---
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/AbstractOzoneFileSystemTest.java
+++
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/AbstractOzoneFileSystemTest.java
@@ -111,7 +111,6 @@
import org.apache.hadoop.ozone.om.OMMetrics;
import org.apache.hadoop.ozone.om.OmConfig;
import org.apache.hadoop.ozone.om.OzonePrefixPathImpl;
-import org.apache.hadoop.ozone.om.TrashPolicyOzone;
import org.apache.hadoop.ozone.om.exceptions.OMException;
import org.apache.hadoop.ozone.om.helpers.BucketLayout;
import org.apache.hadoop.ozone.om.helpers.OmKeyArgs;
@@ -1685,7 +1684,7 @@ public void testTrash() throws Exception {
ContractTestUtils.touch(fs, path);
assertTrue(trash.getConf().getClass(
"fs.trash.classname", TrashPolicy.class).
- isAssignableFrom(TrashPolicyOzone.class));
+ isAssignableFrom(OzoneTrashPolicy.class));
assertEquals(TRASH_INTERVAL, trash.getConf().
getFloat(OMConfigKeys.OZONE_FS_TRASH_INTERVAL_KEY, 0), 0);
diff --git
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/AbstractRootedOzoneFileSystemTest.java
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/AbstractRootedOzoneFileSystemTest.java
index 6cfe5b13f5..d704130e10 100644
---
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/AbstractRootedOzoneFileSystemTest.java
+++
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/AbstractRootedOzoneFileSystemTest.java
@@ -117,7 +117,6 @@
import org.apache.hadoop.ozone.om.OMConfigKeys;
import org.apache.hadoop.ozone.om.OMMetrics;
import org.apache.hadoop.ozone.om.OmConfig;
-import org.apache.hadoop.ozone.om.TrashPolicyOzone;
import org.apache.hadoop.ozone.om.exceptions.OMException;
import org.apache.hadoop.ozone.om.helpers.BucketLayout;
import org.apache.hadoop.ozone.om.helpers.QuotaUtil;
@@ -1869,7 +1868,7 @@ void testTrash() throws Exception {
assertTrue(trash.getConf().getClass(
"fs.trash.classname", TrashPolicy.class).
- isAssignableFrom(TrashPolicyOzone.class));
+ isAssignableFrom(OzoneTrashPolicy.class));
long prevNumTrashDeletes = getOMMetrics().getNumTrashDeletes();
long prevNumTrashFileDeletes = getOMMetrics().getNumTrashFilesDeletes();
diff --git
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/shell/TestOzoneShellHA.java
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/shell/TestOzoneShellHA.java
index 5d6c5c87f2..b0385095aa 100644
---
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/shell/TestOzoneShellHA.java
+++
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/shell/TestOzoneShellHA.java
@@ -69,6 +69,7 @@
import org.apache.hadoop.fs.Path;
import org.apache.hadoop.fs.TrashPolicy;
import org.apache.hadoop.fs.ozone.OzoneFsShell;
+import org.apache.hadoop.fs.ozone.OzoneTrashPolicy;
import org.apache.hadoop.hdds.JsonTestUtils;
import org.apache.hadoop.hdds.cli.GenericCli;
import org.apache.hadoop.hdds.client.ReplicationType;
@@ -92,7 +93,6 @@
import org.apache.hadoop.ozone.ha.ConfUtils;
import org.apache.hadoop.ozone.om.OMConfigKeys;
import org.apache.hadoop.ozone.om.OzoneManager;
-import org.apache.hadoop.ozone.om.TrashPolicyOzone;
import org.apache.hadoop.ozone.om.exceptions.OMException;
import org.apache.hadoop.ozone.om.helpers.BucketLayout;
import org.apache.hadoop.ozone.om.helpers.OzoneFileStatus;
@@ -991,17 +991,17 @@ private OzoneConfiguration getClientConfForOFS(
/**
* Helper function to retrieve Ozone client configuration for ozone
- * trash testing with TrashPolicyOzone.
+ * trash testing with OzoneTrashPolicy.
* @param hostPrefix Scheme + Authority. e.g. ofs://om-service-test1
* @param configuration Server config to generate client config from.
* @return Config ofs configuration added with fs.trash.classname
- * = TrashPolicyOzone.
+ * = OzoneTrashPolicy.
*/
private OzoneConfiguration getClientConfForOzoneTrashPolicy(
String hostPrefix, OzoneConfiguration configuration) {
OzoneConfiguration clientConf =
getClientConfForOFS(hostPrefix, configuration);
- clientConf.setClass("fs.trash.classname", TrashPolicyOzone.class,
+ clientConf.setClass("fs.trash.classname", OzoneTrashPolicy.class,
TrashPolicy.class);
return clientConf;
}
@@ -1186,7 +1186,7 @@ public void testDeleteTrashNoSkipTrash() throws Exception
{
// Test delete from Trash directory removes item from filesystem
- // setup configuration to use TrashPolicyOzone
+ // setup configuration to use OzoneTrashPolicy
// (default is TrashPolicyDefault)
final String hostPrefix = OZONE_OFS_URI_SCHEME + "://" + omServiceId;
OzoneConfiguration clientConf =
diff --git
a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/TrashPolicyOzone.java
b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/TrashPolicyOzone.java
index 47547af8cc..764c1190c9 100644
---
a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/TrashPolicyOzone.java
+++
b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/TrashPolicyOzone.java
@@ -48,7 +48,7 @@
* of TrashPolicy ozone-specific trash optimizations are/will be made such as
* having a multithreaded TrashEmptier.
*/
-public class TrashPolicyOzone extends OzoneTrashPolicy {
+class TrashPolicyOzone extends OzoneTrashPolicy {
private static final Logger LOG =
LoggerFactory.getLogger(TrashPolicyOzone.class);
@@ -60,10 +60,7 @@ public class TrashPolicyOzone extends OzoneTrashPolicy {
new SimpleDateFormat("yyMMddHHmm");
private long emptierInterval;
- private OzoneManager om;
-
- public TrashPolicyOzone() {
- }
+ private final OzoneManager om;
@Override
public void initialize(Configuration conf, FileSystem fs) {
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
