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 d9c9709a75 HDDS-12221. Remove unused config property
ozone.block.deleting.limit.per.task (#7823)
d9c9709a75 is described below
commit d9c9709a759bd200c81f04bca33d728d0498a0af
Author: Gargi Jaiswal <[email protected]>
AuthorDate: Thu Feb 6 19:51:00 2025 +0530
HDDS-12221. Remove unused config property
ozone.block.deleting.limit.per.task (#7823)
---
.../main/java/org/apache/hadoop/ozone/OzoneConfigKeys.java | 6 ------
hadoop-hdds/common/src/main/resources/ozone-default.xml | 13 +------------
.../ozone/container/common/TestBlockDeletingService.java | 2 --
.../common/TestSchemaOneBackwardsCompatibility.java | 3 ---
.../common/TestSchemaTwoBackwardsCompatibility.java | 4 ----
5 files changed, 1 insertion(+), 27 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 102207dd11..b8ab3e541d 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
@@ -327,12 +327,6 @@ public final class OzoneConfigKeys {
"ozone.key.preallocation.max.blocks";
public static final int OZONE_KEY_PREALLOCATION_BLOCKS_MAX_DEFAULT
= 64;
-
- public static final String OZONE_BLOCK_DELETING_LIMIT_PER_CONTAINER =
- "ozone.block.deleting.limit.per.task";
- public static final int OZONE_BLOCK_DELETING_LIMIT_PER_CONTAINER_DEFAULT
- = 1000;
-
public static final String HDDS_CONTAINER_RATIS_ENABLED_KEY
= ScmConfigKeys.HDDS_CONTAINER_RATIS_ENABLED_KEY;
public static final boolean HDDS_CONTAINER_RATIS_ENABLED_DEFAULT
diff --git a/hadoop-hdds/common/src/main/resources/ozone-default.xml
b/hadoop-hdds/common/src/main/resources/ozone-default.xml
index 649a5d32d0..6acacd954a 100644
--- a/hadoop-hdds/common/src/main/resources/ozone-default.xml
+++ b/hadoop-hdds/common/src/main/resources/ozone-default.xml
@@ -426,16 +426,6 @@
or be directly or indirectly in a group defined in this property.
</description>
</property>
- <property>
- <name>ozone.block.deleting.limit.per.task</name>
- <value>1000</value>
- <tag>OZONE, PERFORMANCE, SCM</tag>
- <description>A maximum number of blocks to be deleted by block deleting
- service per
- time interval. This property is used to throttle the actual number of
- block deletions on a data node per container.
- </description>
- </property>
<property>
<name>ozone.block.deleting.service.interval</name>
<value>1m</value>
@@ -453,8 +443,7 @@
<description>A timeout value of block deletion service. If this is set
greater than 0,
the service will stop waiting for the block deleting completion after
this
- time. If timeout happens to a large proportion of block deletion, this
- needs to be increased with ozone.block.deleting.limit.per.task. This
+ time. This
setting supports multiple time unit suffixes as described in
dfs.heartbeat.interval. If no suffix is specified, then milliseconds is
assumed.
diff --git
a/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/common/TestBlockDeletingService.java
b/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/common/TestBlockDeletingService.java
index 057b944378..d5f7026a27 100644
---
a/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/common/TestBlockDeletingService.java
+++
b/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/common/TestBlockDeletingService.java
@@ -95,7 +95,6 @@
import static java.nio.charset.StandardCharsets.UTF_8;
import static org.apache.commons.lang3.RandomStringUtils.randomAlphanumeric;
-import static
org.apache.hadoop.ozone.OzoneConfigKeys.OZONE_BLOCK_DELETING_LIMIT_PER_CONTAINER;
import static
org.apache.hadoop.ozone.OzoneConfigKeys.OZONE_BLOCK_DELETING_SERVICE_INTERVAL;
import static org.apache.hadoop.ozone.OzoneConsts.SCHEMA_V1;
import static org.apache.hadoop.ozone.OzoneConsts.SCHEMA_V2;
@@ -769,7 +768,6 @@ public void testShutdownService(ContainerTestVersionInfo
versionInfo)
setLayoutAndSchemaForTest(versionInfo);
conf.setTimeDuration(OZONE_BLOCK_DELETING_SERVICE_INTERVAL, 500,
TimeUnit.MILLISECONDS);
- conf.setInt(OZONE_BLOCK_DELETING_LIMIT_PER_CONTAINER, 10);
ContainerSet containerSet = new ContainerSet(1000);
// Create 1 container with 100 blocks
diff --git
a/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/common/TestSchemaOneBackwardsCompatibility.java
b/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/common/TestSchemaOneBackwardsCompatibility.java
index e05192f789..deb70fa0da 100644
---
a/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/common/TestSchemaOneBackwardsCompatibility.java
+++
b/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/common/TestSchemaOneBackwardsCompatibility.java
@@ -24,7 +24,6 @@
import org.apache.hadoop.hdds.scm.ScmConfigKeys;
import org.apache.hadoop.hdds.utils.MetadataKeyFilters.KeyPrefixFilter;
import org.apache.hadoop.hdds.utils.db.Table;
-import org.apache.hadoop.ozone.OzoneConfigKeys;
import org.apache.hadoop.ozone.OzoneConsts;
import org.apache.hadoop.ozone.container.common.helpers.BlockData;
import org.apache.hadoop.ozone.container.common.helpers.ChunkInfoList;
@@ -554,8 +553,6 @@ public void testReadDeletedBlocks(String schemaVersion)
throws Exception {
private void runBlockDeletingService(KeyValueHandler keyValueHandler)
throws Exception {
- conf.setInt(OzoneConfigKeys.OZONE_BLOCK_DELETING_LIMIT_PER_CONTAINER, 2);
-
OzoneContainer container = makeMockOzoneContainer(keyValueHandler);
BlockDeletingServiceTestImpl service =
diff --git
a/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/common/TestSchemaTwoBackwardsCompatibility.java
b/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/common/TestSchemaTwoBackwardsCompatibility.java
index 98d19ea64c..a7f90ec242 100644
---
a/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/common/TestSchemaTwoBackwardsCompatibility.java
+++
b/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/common/TestSchemaTwoBackwardsCompatibility.java
@@ -26,7 +26,6 @@
import
org.apache.hadoop.hdds.scm.container.common.helpers.StorageContainerException;
import org.apache.hadoop.hdds.utils.db.BatchOperation;
import org.apache.hadoop.hdds.utils.db.Table;
-import org.apache.hadoop.ozone.OzoneConfigKeys;
import org.apache.hadoop.ozone.OzoneConsts;
import org.apache.hadoop.ozone.common.ChunkBuffer;
import org.apache.hadoop.ozone.container.ContainerTestHelper;
@@ -223,9 +222,6 @@ public void testReadMetadata() throws IOException {
@Test
public void testDeleteViaTransation() throws IOException, TimeoutException,
InterruptedException {
- conf.setInt(OzoneConfigKeys.OZONE_BLOCK_DELETING_LIMIT_PER_CONTAINER,
- BLOCKS_PER_CONTAINER);
-
// create a container of schema v2
KeyValueContainer container = createTestContainer();
assertEquals(container.getContainerData().getSchemaVersion(),
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
