diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/TestOzoneFileSystemMetrics.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/TestOzoneFileSystemMetrics.java index 0c456e6a8ba7..4a077c5e5446 100644 --- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/TestOzoneFileSystemMetrics.java +++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/TestOzoneFileSystemMetrics.java @@ -62,6 +62,9 @@ enum TestOps { @BeforeAll void init() throws Exception { + cluster().getOzoneManager().getKeyManager().getDeletingService().suspend(); + cluster().getOzoneManager().getKeyManager().getDirDeletingService().suspend(); + client = cluster().newClient(); OmConfig omConfig = cluster().getOzoneManager().getConfig(); @@ -81,6 +84,8 @@ void init() throws Exception { void cleanup() { IOUtils.closeQuietly(client, fs); cluster().getOzoneManager().getConfig().setFrom(originalOmConfig); + cluster().getOzoneManager().getKeyManager().getDeletingService().resume(); + cluster().getOzoneManager().getKeyManager().getDirDeletingService().resume(); } @Test diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/ozone/test/ClusterForTests.java b/hadoop-ozone/integration-test/src/test/java/org/apache/ozone/test/ClusterForTests.java index c91bca1a7119..b9264b1c8c0c 100644 --- a/hadoop-ozone/integration-test/src/test/java/org/apache/ozone/test/ClusterForTests.java +++ b/hadoop-ozone/integration-test/src/test/java/org/apache/ozone/test/ClusterForTests.java @@ -20,7 +20,6 @@ import static org.apache.hadoop.ozone.OzoneConfigKeys.OZONE_FS_HSYNC_ENABLED; import static org.apache.hadoop.ozone.OzoneConfigKeys.OZONE_HBASE_ENHANCEMENTS_ALLOWED; import static org.apache.hadoop.ozone.OzoneConfigKeys.OZONE_OM_LEASE_SOFT_LIMIT; -import static org.apache.hadoop.ozone.om.OMConfigKeys.OZONE_KEY_DELETING_LIMIT_PER_TASK; import java.time.Duration; import java.util.concurrent.TimeUnit; @@ -70,7 +69,6 @@ protected static OzoneConfiguration createBaseConfiguration() { conf.setBoolean("ozone.client.hbase.enhancements.allowed", true); conf.setBoolean(OZONE_FS_HSYNC_ENABLED, true); conf.setTimeDuration(OZONE_OM_LEASE_SOFT_LIMIT, 0, TimeUnit.SECONDS); - conf.setInt(OZONE_KEY_DELETING_LIMIT_PER_TASK, 0); return conf; }