Skip to content

HDDS-16694. Count only loaded snapshots in NumSnapshotCacheSize #11400

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
rjgoyln wants to merge 1 commit into
base: master
Choose a base branch
from
+13 −1
Open

HDDS-16694. Count only loaded snapshots in NumSnapshotCacheSize #11400

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion ...-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/snapshot/SnapshotCache.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -227,6 +227,7 @@ public UncheckedAutoCloseableSupplier<OmSnapshot> get(UUID key) throws IOExcepti
LOG.info("Loading SnapshotId: '{}'", k);
try {
v = new ReferenceCounted<>(cacheLoader.load(key), false, this);
omMetrics.incNumSnapshotCacheSize();
} catch (OMException omEx) {
// Return null if the snapshot is no longer active
if (!omEx.getResult().equals(OMException.ResultCodes.FILE_NOT_FOUND)) {
Expand All @@ -239,7 +240,6 @@ public UncheckedAutoCloseableSupplier<OmSnapshot> get(UUID key) throws IOExcepti
// Unexpected and unknown exception thrown from CacheLoader#load
throw new IllegalStateException(ex);
}
omMetrics.incNumSnapshotCacheSize();
}
if (v != null) {
// When RC OmSnapshot is successfully loaded
Expand Down
12 changes: 12 additions & 0 deletions ...ne/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/snapshot/TestSnapshotCache.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,6 +170,18 @@ public void testGetReleasesReadLockOnLoadFailure() throws Exception {
verify(lock, times(1)).releaseReadLock(eq(SNAPSHOT_DB_LOCK), eq(dbKey.toString()));
}

@Test
@DisplayName("get() of an inactive snapshot does not count towards cache size")
void testGetInactiveSnapshotDoesNotIncrementCacheSize() throws Exception {
final UUID dbKey = UUID.randomUUID();
when(cacheLoader.load(eq(dbKey)))
.thenThrow(new OMException("Snapshot is no longer active", OMException.ResultCodes.FILE_NOT_FOUND));
OMException ex = assertThrows(OMException.class, () -> snapshotCache.get(dbKey));
assertEquals(OMException.ResultCodes.FILE_NOT_FOUND, ex.getResult());
assertEquals(0, snapshotCache.size());
assertEquals(0, omMetrics.getNumSnapshotCacheSize());
}

@ParameterizedTest
@ValueSource(ints = {0, 1, 5, 10})
@DisplayName("Tests get() holds a read lock")
Expand Down