Skip to content

HDDS-15112. Handle negative space usage values gracefully in CachingSpaceUsageSource #10130

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
aryangupta1998 merged 2 commits into from
Apr 28, 2026
+45 −2
Merged

HDDS-15112. Handle negative space usage values gracefully in CachingSpaceUsageSource #10130

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
a3b1773
HDDS-15112. Handle negative space usage values gracefully in `Caching…
ptlrs Apr 24, 2026
cb71f04
HDDS-15112. Add tests to validate handling of negative space usage va…
ptlrs Apr 28, 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: 10 additions & 2 deletions hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/fs/CachingSpaceUsageSource.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,11 @@ public void incrementUsedSpace(long usedSpace) {
if (usedSpace == 0) {
return;
}
Preconditions.assertTrue(usedSpace > 0, () -> usedSpace + " < 0");
if (usedSpace < 0) {
Comment thread
errose28 marked this conversation as resolved.
LOG.warn("Ignoring negative incrementUsedSpace({}) for {}", usedSpace, source);
return;
}

final long current, change;
try (AutoCloseableLock ignored = lock.writeLock(null, null)) {
current = cachedAvailable;
Expand All @@ -140,7 +144,11 @@ public void decrementUsedSpace(long reclaimedSpace) {
if (reclaimedSpace == 0) {
return;
}
Preconditions.assertTrue(reclaimedSpace > 0, () -> reclaimedSpace + " < 0");
if (reclaimedSpace < 0) {
LOG.warn("Ignoring negative reclaimedSpace({}) for {}", reclaimedSpace, source);
return;
}

final long current, change;
try (AutoCloseableLock ignored = lock.writeLock(null, null)) {
current = cachedUsedSpace;
Expand Down
35 changes: 35 additions & 0 deletions ...p-hdds/framework/src/test/java/org/apache/hadoop/hdds/fs/TestCachingSpaceUsageSource.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,6 +182,41 @@ void decrementAvailableSpaceMoreThanCurrent() {
assertSnapshotIsUpToDate(subject);
}

// If negative values are passed, check that the state is unchanged
@Test
void incrementUsedSpaceIgnoresNegativeValue() {
SpaceUsageCheckParams params = paramsBuilder(new AtomicLong(50))
.withRefresh(Duration.ZERO)
.build();
CachingSpaceUsageSource subject = new CachingSpaceUsageSource(params);
SpaceUsageSource original = subject.snapshot();

subject.incrementUsedSpace(-1L);

// negative value should be ignored, leaving cached state unchanged
assertEquals(original.getUsedSpace(), subject.getUsedSpace());
assertEquals(original.getAvailable(), subject.getAvailable());
assertEquals(original.getCapacity(), subject.getCapacity());
assertSnapshotIsUpToDate(subject);
}

@Test
void decrementUsedSpaceIgnoresNegativeValue() {
SpaceUsageCheckParams params = paramsBuilder(new AtomicLong(50))
.withRefresh(Duration.ZERO)
.build();
CachingSpaceUsageSource subject = new CachingSpaceUsageSource(params);
SpaceUsageSource original = subject.snapshot();

subject.decrementUsedSpace(-1L);

// negative value should be ignored, leaving cached state unchanged
assertEquals(original.getUsedSpace(), subject.getUsedSpace());
assertEquals(original.getAvailable(), subject.getAvailable());
assertEquals(original.getCapacity(), subject.getCapacity());
assertSnapshotIsUpToDate(subject);
}

private static void assertSnapshotIsUpToDate(SpaceUsageSource subject) {
SpaceUsageSource snapshot = subject.snapshot();
assertEquals(subject.getCapacity(), snapshot.getCapacity());
Expand Down