Skip to content

HDDS-10607. Remove unused ozone.block.deleting.container.limit.per.interval config property #7816

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
adoroszlai merged 4 commits into from
Feb 6, 2025
Merged

HDDS-10607. Remove unused ozone.block.deleting.container.limit.per.interval config property #7816

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2a191c7
HDDS-10607. Removed ozone.block.deleting.container.limit.per.interval…
Feb 5, 2025
13aadda
HDDS-10607. Removed the ozone.block.deleting.container.limit.per.inte…
Feb 5, 2025
e4b5f6b
Update hadoop-hdds/common/src/main/java/org/apache/hadoop/ozone/Ozone…
sreejasahithi Feb 5, 2025
08fc90d
Update hadoop-hdds/container-service/src/test/java/org/apache/hadoop/…
sreejasahithi Feb 5, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 0 additions & 5 deletions hadoop-hdds/common/src/main/java/org/apache/hadoop/ozone/OzoneConfigKeys.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -333,11 +333,6 @@ public final class OzoneConfigKeys {
public static final int OZONE_BLOCK_DELETING_LIMIT_PER_CONTAINER_DEFAULT
= 1000;

public static final String OZONE_BLOCK_DELETING_CONTAINER_LIMIT_PER_INTERVAL
= "ozone.block.deleting.container.limit.per.interval";
public static final int
OZONE_BLOCK_DELETING_CONTAINER_LIMIT_PER_INTERVAL_DEFAULT = 10;

public static final String HDDS_CONTAINER_RATIS_ENABLED_KEY
= ScmConfigKeys.HDDS_CONTAINER_RATIS_ENABLED_KEY;
public static final boolean HDDS_CONTAINER_RATIS_ENABLED_DEFAULT
Expand Down
11 changes: 0 additions & 11 deletions hadoop-hdds/common/src/main/resources/ozone-default.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -426,17 +426,6 @@
or be directly or indirectly in a group defined in this property.
</description>
</property>
<property>
<name>ozone.block.deleting.container.limit.per.interval</name>
<value>10</value>
<tag>OZONE, PERFORMANCE, SCM</tag>
<description>A maximum number of containers to be scanned by block deleting
service per
time interval. The block deleting service spawns a thread to handle block
deletions in a container. This property is used to throttle the number of
threads spawned for block deletions.
</description>
</property>
<property>
<name>ozone.block.deleting.limit.per.task</name>
<value>1000</value>
Expand Down
2 changes: 0 additions & 2 deletions ...vice/src/test/java/org/apache/hadoop/ozone/container/common/TestBlockDeletingService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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_CONTAINER_LIMIT_PER_INTERVAL;
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;
Expand Down Expand Up @@ -770,7 +769,6 @@ public void testShutdownService(ContainerTestVersionInfo versionInfo)
setLayoutAndSchemaForTest(versionInfo);
conf.setTimeDuration(OZONE_BLOCK_DELETING_SERVICE_INTERVAL, 500,
TimeUnit.MILLISECONDS);
conf.setInt(OZONE_BLOCK_DELETING_CONTAINER_LIMIT_PER_INTERVAL, 10);
conf.setInt(OZONE_BLOCK_DELETING_LIMIT_PER_CONTAINER, 10);

ContainerSet containerSet = new ContainerSet(1000);
Expand Down
2 changes: 0 additions & 2 deletions ...st/java/org/apache/hadoop/ozone/container/common/TestSchemaOneBackwardsCompatibility.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,6 @@
import java.util.Arrays;
import java.util.stream.Collectors;

import static org.apache.hadoop.ozone.OzoneConfigKeys.OZONE_BLOCK_DELETING_CONTAINER_LIMIT_PER_INTERVAL;
import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNull;
Expand Down Expand Up @@ -555,7 +554,6 @@ public void testReadDeletedBlocks(String schemaVersion) throws Exception {

private void runBlockDeletingService(KeyValueHandler keyValueHandler)
throws Exception {
conf.setInt(OZONE_BLOCK_DELETING_CONTAINER_LIMIT_PER_INTERVAL, 10);
conf.setInt(OzoneConfigKeys.OZONE_BLOCK_DELETING_LIMIT_PER_CONTAINER, 2);

OzoneContainer container = makeMockOzoneContainer(keyValueHandler);
Expand Down
2 changes: 0 additions & 2 deletions ...st/java/org/apache/hadoop/ozone/container/common/TestSchemaTwoBackwardsCompatibility.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,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_CONTAINER_LIMIT_PER_INTERVAL;
import static org.apache.hadoop.ozone.OzoneConsts.BLOCK_COUNT;
import static org.apache.hadoop.ozone.OzoneConsts.CONTAINER_BYTES_USED;
import static org.apache.hadoop.ozone.OzoneConsts.PENDING_DELETE_BLOCK_COUNT;
Expand Down Expand Up @@ -224,7 +223,6 @@ public void testReadMetadata() throws IOException {
@Test
public void testDeleteViaTransation() throws IOException, TimeoutException,
InterruptedException {
conf.setInt(OZONE_BLOCK_DELETING_CONTAINER_LIMIT_PER_INTERVAL, 10);
conf.setInt(OzoneConfigKeys.OZONE_BLOCK_DELETING_LIMIT_PER_CONTAINER,
BLOCKS_PER_CONTAINER);

Expand Down
Loading