Skip to content

HDDS-15311. [DiskBalancer] Fix DiskBalancer DN container Log Format #10307

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 3 commits into from
May 21, 2026
+20 −21
Merged

HDDS-15311. [DiskBalancer] Fix DiskBalancer DN container Log Format #10307

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
fc5d1c8
fixed diskbalancer container logger message
Gargi-jais11 May 19, 2026
9ed51fc
address copilot comment
Gargi-jais11 May 20, 2026
9ae1755
fix findbugs
Gargi-jais11 May 20, 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
32 changes: 15 additions & 17 deletions ...service/src/main/java/org/apache/hadoop/ozone/container/common/utils/ContainerLogger.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -181,40 +181,38 @@ public static void logReconciled(ContainerData containerData, long oldDataChecks
/**
* Logged when a container is successfully moved from one data volume to another.
*
* @param containerId The ID of the moved container.
* @param containerData The container after it has been moved to the destination volume.
* @param sourceVolume The source volume path.
* @param destinationVolume The destination volume path.
* @param containerSize The size of data moved from container in bytes.
* @param timeTaken The time taken for the move in milliseconds.
*/
public static void logMoveSuccess(long containerId, StorageVolume sourceVolume,
public static void logMoveSuccess(ContainerData containerData, StorageVolume sourceVolume,
StorageVolume destinationVolume, long containerSize, long timeTaken) {
LOG.info(getMessage(containerId, sourceVolume, destinationVolume, containerSize, timeTaken));
LOG.info(getMessage(containerData,
"SrcVolume=" + sourceVolume,
"DestVolume=" + destinationVolume,
"Size=" + containerSize + " bytes",
"TimeTaken=" + timeTaken + " ms",
"Container is moved from SrcVolume to DestVolume"));
}
Comment thread
Gargi-jais11 marked this conversation as resolved.

private static String getMessage(ContainerData containerData,
String message) {
private static String getMessage(ContainerData containerData, String message) {
return String.join(FIELD_SEPARATOR, getMessage(containerData), message);
}

private static String getMessage(ContainerData containerData) {
private static String getMessage(ContainerData containerData, String... fields) {
return String.join(FIELD_SEPARATOR,
"ID=" + containerData.getContainerID(),
"Index=" + containerData.getReplicaIndex(),
"BCSID=" + containerData.getBlockCommitSequenceId(),
"State=" + containerData.getState(),
"Volume=" + containerData.getVolume(),
"DataChecksum=" + checksumToString(containerData.getDataChecksum()));
String.join(FIELD_SEPARATOR, fields));
}

private static String getMessage(long containerId, StorageVolume sourceVolume,
StorageVolume destinationVolume, long containerSize, long timeTaken) {
return String.join(FIELD_SEPARATOR,
"ID=" + containerId,
"SrcVolume=" + sourceVolume,
"DestVolume=" + destinationVolume,
"Size=" + containerSize + " bytes",
"TimeTaken=" + timeTaken + " ms",
"Container is moved from SrcVolume to DestVolume");
private static String getMessage(ContainerData containerData) {
return getMessage(containerData,
"Volume=" + containerData.getVolume(),
"DataChecksum=" + checksumToString(containerData.getDataChecksum()));
}
}
9 changes: 5 additions & 4 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 @@ -509,6 +509,7 @@ protected class DiskBalancerTask implements BackgroundTask {
public BackgroundTaskResult call() {
long startTime = Time.monotonicNow();
boolean moveSucceeded = true;
Container newContainer = null;
long containerId = containerData.getContainerID();
Container container = ozoneContainer.getContainerSet().getContainer(containerId);
boolean readLockReleased = false;
Expand Down Expand Up @@ -580,7 +581,7 @@ public BackgroundTaskResult call() {
}

// Import the container. importContainer will reset container back to original state
Container newContainer = ozoneContainer.getController().importContainer(tempContainerData);
newContainer = ozoneContainer.getController().importContainer(tempContainerData);

// Step 4: Update container for containerID and mark old container for deletion
// first, update the in-memory set to point to the new replica.
Expand Down Expand Up @@ -633,13 +634,13 @@ public BackgroundTaskResult call() {
if (!readLockReleased) {
container.readUnlock();
}
if (moveSucceeded) {
if (moveSucceeded && newContainer != null) {
// Add current old container to pendingDeletionContainers.
pendingDeletionContainers.put(System.currentTimeMillis() + replicaDeletionDelay, container);
ContainerLogger.logMoveSuccess(containerId, sourceVolume,
ContainerLogger.logMoveSuccess(newContainer.getContainerData(), sourceVolume,
destVolume, containerSize, Time.monotonicNow() - startTime);
}
postCall(moveSucceeded, startTime);
postCall(moveSucceeded && newContainer != null, startTime);

// pick one expired container from pendingDeletionContainers to delete
tryCleanupOnePendingDeletionContainer();
Expand Down