Skip to content

HDDS-14701. Consolidate DiskBalancerVolumeChoosingPolicy and ContainerChoosingPolicy #9858

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

Open
Gargi-jais11 wants to merge 3 commits into
base: master
Choose a base branch
from
+649 −567
Open

HDDS-14701. Consolidate DiskBalancerVolumeChoosingPolicy and ContainerChoosingPolicy #9858

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
bb8c61b
merge container and volume choosing policy into one
Gargi-jais11 Mar 2, 2026
4740a4e
fix tests failure and pmd issues
Gargi-jais11 Mar 2, 2026
daa2d17
Merge branch 'master' of github.com:apache/ozone into HDDS-14701
Gargi-jais11 Mar 6, 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
8 changes: 4 additions & 4 deletions ...ain/java/org/apache/hadoop/ozone/container/common/volume/VolumeChoosingPolicyFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
import org.apache.hadoop.hdds.conf.ConfigurationSource;
import org.apache.hadoop.ozone.container.common.interfaces.VolumeChoosingPolicy;
import org.apache.hadoop.ozone.container.diskbalancer.DiskBalancerConfiguration;
import org.apache.hadoop.ozone.container.diskbalancer.policy.DiskBalancerVolumeChoosingPolicy;
import org.apache.hadoop.ozone.container.diskbalancer.policy.VolumeContainerChoosingPolicy;
import org.apache.ratis.util.ReflectionUtils;

/**
Expand All @@ -48,9 +48,9 @@ public static VolumeChoosingPolicy getPolicy(ConfigurationSource conf) {
return ReflectionUtils.newInstance(policyClass, new Class<?>[] {ReentrantLock.class}, LOCK);
}

public static DiskBalancerVolumeChoosingPolicy getDiskBalancerPolicy(ConfigurationSource conf) {
Class<?> policyClass = conf.getObject(DiskBalancerConfiguration.class).getVolumeChoosingPolicyClass();
return (DiskBalancerVolumeChoosingPolicy) ReflectionUtils.newInstance(
public static VolumeContainerChoosingPolicy getDiskBalancerContainerPolicy(ConfigurationSource conf) {
Copy link
Contributor

@ChenSammi ChenSammi Mar 6, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We need a new dedicated Factory for ContainerChoosingPolicy.

Class<?> policyClass = conf.getObject(DiskBalancerConfiguration.class).getVolumeContainerChoosingPolicyClass();
return (VolumeContainerChoosingPolicy) ReflectionUtils.newInstance(
policyClass, new Class<?>[]{ReentrantLock.class}, LOCK);
}
}
25 changes: 7 additions & 18 deletions ...c/main/java/org/apache/hadoop/ozone/container/diskbalancer/DiskBalancerConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,20 +94,13 @@ public final class DiskBalancerConfiguration {
)
private long diskBalancerTimeout = Duration.ofSeconds(300).toMillis();

@Config(key = "hdds.datanode.disk.balancer.volume.choosing.policy", type = ConfigType.CLASS,
@Config(key = "hdds.datanode.disk.balancer.volume.container.choosing.policy", type = ConfigType.CLASS,
defaultValue = "org.apache.hadoop.ozone.container.diskbalancer.policy" +
".DefaultVolumeChoosingPolicy",
".DefaultVolumeContainerChoosingPolicy",
tags = {ConfigTag.DISKBALANCER},
description = "The volume choosing policy of the disk balancer service.")
private Class<?> volumeChoosingPolicyClass;

@Config(key = "hdds.datanode.disk.balancer.container.choosing.policy", type = ConfigType.CLASS,
defaultValue = "org.apache.hadoop.ozone.container.diskbalancer.policy" +
".DefaultContainerChoosingPolicy",
tags = {ConfigTag.DISKBALANCER},
description = "The container choosing policy of the disk balancer " +
"service.")
private Class<?> containerChoosingPolicyClass;
description = "The policy for selecting source/destination volumes and " +
"containers to move for disk balancing.")
private Class<?> volumeContainerChoosingPolicyClass;

@Config(key = "hdds.datanode.disk.balancer.stop.after.disk.even",
type = ConfigType.BOOLEAN,
Expand Down Expand Up @@ -174,12 +167,8 @@ public void setDiskBalancerTimeout(Duration duration) {
this.diskBalancerTimeout = duration.toMillis();
}

public Class<?> getVolumeChoosingPolicyClass() {
return volumeChoosingPolicyClass;
}

public Class<?> getContainerChoosingPolicyClass() {
return containerChoosingPolicyClass;
public Class<?> getVolumeContainerChoosingPolicyClass() {
return volumeContainerChoosingPolicyClass;
}

public boolean isStopAfterDiskEven() {
Expand Down
75 changes: 25 additions & 50 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 @@ -41,15 +41,12 @@
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicLong;
import org.apache.commons.io.FileUtils;
import org.apache.commons.lang3.tuple.Pair;
import org.apache.hadoop.hdds.conf.ConfigurationSource;
import org.apache.hadoop.hdds.conf.StorageUnit;
import org.apache.hadoop.hdds.fs.SpaceUsageSource;
import org.apache.hadoop.hdds.protocol.DatanodeDetails;
import org.apache.hadoop.hdds.protocol.datanode.proto.ContainerProtos.ContainerDataProto.State;
import org.apache.hadoop.hdds.protocol.proto.HddsProtos;
import org.apache.hadoop.hdds.protocol.proto.HddsProtos.DiskBalancerRunningStatus;
import org.apache.hadoop.hdds.scm.ScmConfigKeys;
import org.apache.hadoop.hdds.scm.container.ContainerID;
import org.apache.hadoop.hdds.scm.container.common.helpers.StorageContainerException;
import org.apache.hadoop.hdds.server.ServerUtils;
Expand All @@ -69,9 +66,9 @@
import org.apache.hadoop.ozone.container.common.volume.MutableVolumeSet;
import org.apache.hadoop.ozone.container.common.volume.VolumeChoosingPolicyFactory;
import org.apache.hadoop.ozone.container.diskbalancer.DiskBalancerVolumeCalculation.VolumeFixedUsage;
import org.apache.hadoop.ozone.container.diskbalancer.policy.ContainerChoosingPolicy;
import org.apache.hadoop.ozone.container.diskbalancer.policy.DefaultContainerChoosingPolicy;
import org.apache.hadoop.ozone.container.diskbalancer.policy.DiskBalancerVolumeChoosingPolicy;
import org.apache.hadoop.ozone.container.diskbalancer.policy.DefaultVolumeContainerChoosingPolicy;
import org.apache.hadoop.ozone.container.diskbalancer.policy.DiskBalancerVolumeContainerCandidate;
import org.apache.hadoop.ozone.container.diskbalancer.policy.VolumeContainerChoosingPolicy;
import org.apache.hadoop.ozone.container.keyvalue.KeyValueContainerData;
import org.apache.hadoop.ozone.container.keyvalue.helpers.KeyValueContainerLocationUtil;
import org.apache.hadoop.ozone.container.keyvalue.helpers.KeyValueContainerUtil;
Expand Down Expand Up @@ -126,12 +123,10 @@ public class DiskBalancerService extends BackgroundService {
private Map<HddsVolume, Long> deltaSizes;
private MutableVolumeSet volumeSet;

private DiskBalancerVolumeChoosingPolicy volumeChoosingPolicy;
private ContainerChoosingPolicy containerChoosingPolicy;
private VolumeContainerChoosingPolicy volumeContainerChoosingPolicy;
private final File diskBalancerInfoFile;

private DiskBalancerServiceMetrics metrics;
private long containerDefaultSize;

public DiskBalancerService(OzoneContainer ozoneContainer,
long serviceCheckInterval, long serviceCheckTimeout, TimeUnit timeUnit,
Expand All @@ -148,15 +143,9 @@ public DiskBalancerService(OzoneContainer ozoneContainer,
inProgressContainers = ConcurrentHashMap.newKeySet();
deltaSizes = new ConcurrentHashMap<>();
volumeSet = ozoneContainer.getVolumeSet();
containerDefaultSize = (long) conf.getStorageSize(
ScmConfigKeys.OZONE_SCM_CONTAINER_SIZE,
ScmConfigKeys.OZONE_SCM_CONTAINER_SIZE_DEFAULT, StorageUnit.BYTES);

try {
volumeChoosingPolicy = VolumeChoosingPolicyFactory.getDiskBalancerPolicy(conf);
containerChoosingPolicy = (ContainerChoosingPolicy)
conf.getObject(DiskBalancerConfiguration.class)
.getContainerChoosingPolicyClass().newInstance();
volumeContainerChoosingPolicy = VolumeChoosingPolicyFactory.getDiskBalancerContainerPolicy(conf);
} catch (Exception e) {
LOG.error("Got exception when initializing DiskBalancerService", e);
throw new IOException(e);
Expand Down Expand Up @@ -405,25 +394,20 @@ public BackgroundTaskQueue getTasks() {
}

for (int i = 0; i < availableTaskCount; i++) {
Pair<HddsVolume, HddsVolume> pair = volumeChoosingPolicy
.chooseVolume(volumeSet, threshold, deltaSizes, containerDefaultSize);
if (pair == null) {
continue;
}
HddsVolume sourceVolume = pair.getLeft(), destVolume = pair.getRight();
ContainerData toBalanceContainer = containerChoosingPolicy
.chooseContainer(ozoneContainer, sourceVolume, destVolume,
inProgressContainers, threshold, volumeSet, deltaSizes);
if (toBalanceContainer != null) {
DiskBalancerTask task = new DiskBalancerTask(toBalanceContainer, sourceVolume,
destVolume);
queue.add(task);
inProgressContainers.add(ContainerID.valueOf(toBalanceContainer.getContainerID()));
deltaSizes.put(sourceVolume, deltaSizes.getOrDefault(sourceVolume, 0L)
- toBalanceContainer.getBytesUsed());
} else {
// release destVolume committed bytes
destVolume.incCommittedBytes(0 - containerDefaultSize);
DiskBalancerVolumeContainerCandidate candidate = volumeContainerChoosingPolicy.chooseVolumesAndContainer(
ozoneContainer, volumeSet, deltaSizes, inProgressContainers, threshold);
if (candidate != null) {
HddsVolume sourceVolume = candidate.getSourceVolume();
HddsVolume destVolume = candidate.getDestVolume();
ContainerData toBalanceContainer = candidate.getContainerData();
if (toBalanceContainer != null) {
DiskBalancerTask task = new DiskBalancerTask(toBalanceContainer, sourceVolume,
destVolume);
queue.add(task);
inProgressContainers.add(ContainerID.valueOf(toBalanceContainer.getContainerID()));
deltaSizes.put(sourceVolume, deltaSizes.getOrDefault(sourceVolume, 0L)
- toBalanceContainer.getBytesUsed());
}
}
}

Expand Down Expand Up @@ -503,7 +487,7 @@ public BackgroundTaskResult call() {
// QUASI_CLOSED is allowed when test mode is enabled, this is done to test in production
// these containers are rejected.
State containerState = container.getContainerData().getState();
boolean isTestMode = DefaultContainerChoosingPolicy.isTest();
boolean isTestMode = DefaultVolumeContainerChoosingPolicy.isTest();
if (containerState != State.CLOSED && !(isTestMode && containerState == State.QUASI_CLOSED)) {
LOG.warn("Container {} is in {} state, skipping move process. Only CLOSED containers can be moved.",
containerId, containerState);
Expand Down Expand Up @@ -640,7 +624,7 @@ private void postCall(boolean success, long startTime) {
inProgressContainers.remove(ContainerID.valueOf(containerData.getContainerID()));
deltaSizes.put(sourceVolume, deltaSizes.get(sourceVolume) +
containerData.getBytesUsed());
destVolume.incCommittedBytes(0 - containerDefaultSize);
destVolume.incCommittedBytes(0 - containerData.getBytesUsed());
long endTime = Time.monotonicNow();
if (success) {
metrics.incrSuccessCount(1);
Expand Down Expand Up @@ -749,22 +733,13 @@ public void setBalancedBytesInLastWindow(long bytes) {
this.balancedBytesInLastWindow.set(bytes);
}

public ContainerChoosingPolicy getContainerChoosingPolicy() {
return containerChoosingPolicy;
}

public DiskBalancerVolumeChoosingPolicy getVolumeChoosingPolicy() {
return volumeChoosingPolicy;
}

@VisibleForTesting
public void setVolumeChoosingPolicy(DiskBalancerVolumeChoosingPolicy volumeChoosingPolicy) {
this.volumeChoosingPolicy = volumeChoosingPolicy;
public VolumeContainerChoosingPolicy getVolumeContainerChoosingPolicy() {
return volumeContainerChoosingPolicy;
}

@VisibleForTesting
public void setContainerChoosingPolicy(ContainerChoosingPolicy containerChoosingPolicy) {
this.containerChoosingPolicy = containerChoosingPolicy;
public void setVolumeContainerChoosingPolicy(VolumeContainerChoosingPolicy volumeContainerChoosingPolicy) {
this.volumeContainerChoosingPolicy = volumeContainerChoosingPolicy;
}

@VisibleForTesting
Expand Down
105 changes: 0 additions & 105 deletions ...org/apache/hadoop/ozone/container/diskbalancer/policy/DefaultContainerChoosingPolicy.java
View file
Open in desktop

This file was deleted.

Loading