Skip to content

HDDS-14718. Update Remaining Allocatable to consider Free Space To Spare #9826

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
ssulav wants to merge 7 commits into
base: master
Choose a base branch
from
+7 −3
Open

HDDS-14718. Update Remaining Allocatable to consider Free Space To Spare #9826

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
0aa98a9
HDDS-14718. Update Remaining Allocatable to consider Free Space To Spare
ssulav Feb 25, 2026
1b017c0
Add test for getRemainingAllocatable
ssulav Feb 25, 2026
f6e2509
Removed stdout for test output
ssulav Feb 25, 2026
78013f8
Updated assertValue for remainingAllocatable
ssulav Feb 26, 2026
374e1c6
Addressed review comments
ssulav Feb 28, 2026
402b294
Updated description to include the same consistent name
ssulav Mar 2, 2026
172d870
Fix checkstyle issue
ssulav Mar 3, 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
9 changes: 6 additions & 3 deletions .../cli-admin/src/main/java/org/apache/hadoop/hdds/scm/cli/datanode/UsageInfoSubcommand.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,9 +154,8 @@ private void printInfo(DatanodeUsage info) {
info.getContainerCount());
System.out.printf("%-24s: %s (%s) %n", "Container Pre-allocated",
info.getCommitted() + " B", StringUtils.byteDesc(info.getCommitted()));
System.out.printf("%-24s: %s (%s) %n", "Remaining Allocatable",
(info.getOzoneAvailable() - info.getCommitted()) + " B",
StringUtils.byteDesc((info.getOzoneAvailable() - info.getCommitted())));
System.out.printf("%-24s: %s (Ozone Available - Container Pre-allocated - Free Space To Spare) %n",
"Remaining Allocatable", info.getRemainingAllocatable() + " B");
System.out.printf("%-24s: %s (%s) %n", "Free Space To Spare",
info.getFreeSpaceToSpare() + " B",
StringUtils.byteDesc(info.getFreeSpaceToSpare()));
Expand Down Expand Up @@ -332,6 +331,10 @@ public long getPipelineCount() {
public long getReserved() {
return reserved;
}

public long getRemainingAllocatable() {
return ozoneAvailable - committed - freeSpaceToSpare;
}
}

private static class NodeSelectionArguments extends NodeSelectionMixin {
Expand Down
1 change: 1 addition & 0 deletions ...-admin/src/test/java/org/apache/hadoop/hdds/scm/cli/datanode/TestUsageInfoSubcommand.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,7 @@ public void testCorrectJsonValuesInReport() throws IOException {

assertEquals(5, json.get(0).get("containerCount").longValue());
assertEquals(10, json.get(0).get("pipelineCount").longValue());
assertEquals(80, json.get(0).get("remainingAllocatable").longValue());
}

@Test
Expand Down