Skip to content

HDDS-15278. DiskBalancer should validate persisted config before applying. #10271

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
ChenSammi merged 2 commits into from
May 15, 2026
Merged

HDDS-15278. DiskBalancer should validate persisted config before applying. #10271

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b5de4d8
HDDS-15278. DiskBalancer should validate persisted config before appl…
slfan1989 May 15, 2026
626138a
HDDS-15278. DiskBalancer should validate persisted config before appl…
slfan1989 May 15, 2026
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
12 changes: 5 additions & 7 deletions ...ice/src/main/java/org/apache/hadoop/ozone/container/diskbalancer/DiskBalancerService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -243,18 +243,16 @@ private void loadDiskBalancerInfo() throws IOException {

private void applyDiskBalancerInfo(DiskBalancerInfo diskBalancerInfo)
throws IOException {
// verify ContainerStates first
DiskBalancerConfiguration validated = new DiskBalancerConfiguration();
validated.setContainerStates(diskBalancerInfo.getContainerStates());
DiskBalancerConfiguration validated = diskBalancerInfo.toConfiguration();
// First store in local file, then update in memory variables
writeDiskBalancerInfoTo(diskBalancerInfo, diskBalancerInfoFile);

updateOperationalStateFromInfo(diskBalancerInfo);

setThreshold(diskBalancerInfo.getThreshold());
setBandwidthInMB(diskBalancerInfo.getBandwidthInMB());
setParallelThread(diskBalancerInfo.getParallelThread());
setStopAfterDiskEven(diskBalancerInfo.isStopAfterDiskEven());
setThreshold(validated.getThreshold());
setBandwidthInMB(validated.getDiskBandwidthInMB());
setParallelThread(validated.getParallelThread());
setStopAfterDiskEven(validated.isStopAfterDiskEven());
setVersion(diskBalancerInfo.getVersion());
setContainerStates(validated.getMovableContainerStates());

Expand Down
32 changes: 32 additions & 0 deletions ...src/test/java/org/apache/hadoop/ozone/container/diskbalancer/TestDiskBalancerService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -199,6 +199,38 @@ public void testUpdateService(ContainerTestVersionInfo versionInfo) throws Excep
svc.shutdown();
}

@ParameterizedTest
@MethodSource("invalidDiskBalancerInfo")
public void testRefreshRejectsInvalidDiskBalancerInfo(
ContainerTestVersionInfo versionInfo, DiskBalancerInfo diskBalancerInfo)
throws Exception {
setLayoutAndSchemaForTest(versionInfo);
ContainerSet containerSet = ContainerSet.newReadOnlyContainerSet(1000);
ContainerMetrics metrics = ContainerMetrics.create(conf);
KeyValueHandler keyValueHandler =
new KeyValueHandler(conf, datanodeUuid, containerSet, volumeSet,
metrics, c -> {
}, new ContainerChecksumTreeManager(conf));
DiskBalancerServiceTestImpl svc =
getDiskBalancerService(containerSet, conf, keyValueHandler, null, 1);

assertThrows(IllegalArgumentException.class,
Comment thread
Gargi-jais11 marked this conversation as resolved.
() -> svc.refresh(diskBalancerInfo));

svc.shutdown();
}

public static Stream<Arguments> invalidDiskBalancerInfo() {
return ContainerTestVersionInfo.getLayoutList().stream()
.flatMap(versionInfo -> Stream.of(
Arguments.arguments(versionInfo, new DiskBalancerInfo(
DiskBalancerRunningStatus.RUNNING, 0.0d, 100L, 5, true)),
Arguments.arguments(versionInfo, new DiskBalancerInfo(
DiskBalancerRunningStatus.RUNNING, 10.0d, 0L, 5, true)),
Arguments.arguments(versionInfo, new DiskBalancerInfo(
DiskBalancerRunningStatus.RUNNING, 10.0d, 100L, 0, true))));
}

@ContainerTestVersionInfo.ContainerTest
public void testPolicyClassInitialization(ContainerTestVersionInfo versionInfo) throws IOException {
setLayoutAndSchemaForTest(versionInfo);
Expand Down