Skip to content

HDDS-13150. Fixed SnapshotLimitCheck when failures occur. #8532

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
jojochuang merged 3 commits into from
Jun 10, 2025
Merged

HDDS-13150. Fixed SnapshotLimitCheck when failures occur. #8532

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
3443c03
HDDS-13150. Fixed SnapshotLimitCheck when failures occur.
May 30, 2025
361c1d7
Add display name to test
SaketaChalamchala Jun 6, 2025
8bd1ece
HDDS-13150. Added missing import.
Jun 9, 2025
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
3 changes: 1 addition & 2 deletions ...er/src/main/java/org/apache/hadoop/ozone/om/request/snapshot/OMSnapshotCreateRequest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -202,6 +202,7 @@ public OMClientResponse validateAndUpdateCache(OzoneManager ozoneManager, Execut
omClientResponse = new OMSnapshotCreateResponse(
createErrorOMResponse(omResponse, exception));
} finally {
ozoneManager.getOmSnapshotManager().decrementInFlightSnapshotCount();
if (acquiredSnapshotLock) {
mergeOmLockDetails(
omMetadataManager.getLock().releaseWriteLock(SNAPSHOT_LOCK,
Expand Down Expand Up @@ -291,8 +292,6 @@ private void addSnapshotInfoToSnapshotChainAndCache(
removeSnapshotInfoFromSnapshotChainManager(snapshotChainManager,
snapshotInfo);
throw new IOException(exception.getMessage(), exception);
} finally {
ozoneManager.getOmSnapshotManager().decrementInFlightSnapshotCount();
}
}
}
Expand Down
46 changes: 46 additions & 0 deletions ...rc/test/java/org/apache/hadoop/ozone/om/request/snapshot/TestOMSnapshotCreateRequest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@
import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.OMRequest;
import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.OMResponse;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.DisplayName;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.ValueSource;
Expand Down Expand Up @@ -318,6 +319,51 @@ public void testSnapshotLimit() throws Exception {
assertEquals(OMException.ResultCodes.TOO_MANY_SNAPSHOTS, omException.getResult());
}

@DisplayName("Snapshot limit is enforced even after failed creation attempts")
@Test
public void testSnapshotLimitWithFailures() throws Exception {
when(getOzoneManager().isAdmin(any())).thenReturn(true);
getOzoneManager().getOmSnapshotManager().close();
getOzoneManager().getConfiguration().setInt(OZONE_OM_FS_SNAPSHOT_MAX_LIMIT, 2);
OmSnapshotManager omSnapshotManager = new OmSnapshotManager(getOzoneManager());
when(getOzoneManager().getOmSnapshotManager()).thenReturn(omSnapshotManager);

// Create first snapshot successfully
String key1 = getTableKey(getVolumeName(), getBucketName(), snapshotName1);
OMRequest omRequest = createSnapshotRequest(getVolumeName(), getBucketName(), snapshotName1);
OMSnapshotCreateRequest omSnapshotCreateRequest = doPreExecute(omRequest);
omSnapshotCreateRequest.validateAndUpdateCache(getOzoneManager(), 1);
assertNotNull(getOmMetadataManager().getSnapshotInfoTable().get(key1));

// Snapshot creation failure
OMRequest snapshotRequestFail = createSnapshotRequest(getVolumeName(), getBucketName(), snapshotName1);
OMSnapshotCreateRequest omSnapshotCreateRequestFail = doPreExecute(snapshotRequestFail);
OMClientResponse omClientResponse =
omSnapshotCreateRequestFail.validateAndUpdateCache(getOzoneManager(), 2);
OMResponse omResponse = omClientResponse.getOMResponse();
assertNotNull(omResponse.getCreateSnapshotResponse());
assertEquals(OzoneManagerProtocolProtos.Status.FILE_ALREADY_EXISTS, omResponse.getStatus());

// Second snapshot in-flight
String key2 = getTableKey(getVolumeName(), getBucketName(), snapshotName2);
OMRequest snapshotRequest2 = createSnapshotRequest(getVolumeName(), getBucketName(), snapshotName2);
OMSnapshotCreateRequest omSnapshotCreateRequest2 = doPreExecute(snapshotRequest2);

// Third snapshot should fail as total 3 > limit 2 (1 in chain + 1 in-flight + 1 new)
OMRequest snapshotRequest3 = createSnapshotRequest(getVolumeName(), getBucketName(), snapshotName3);
OMException omException = assertThrows(OMException.class, () -> doPreExecute(snapshotRequest3));
assertEquals(OMException.ResultCodes.TOO_MANY_SNAPSHOTS, omException.getResult());

// Complete the in-flight snapshot successfully
omSnapshotCreateRequest2.validateAndUpdateCache(getOzoneManager(), 3);
assertNotNull(getOmMetadataManager().getSnapshotInfoTable().get(key2));

// Another snapshot should fail as total 3 > limit 2 (2 in chain + 1 new)
OMRequest snapshotRequest4 = createSnapshotRequest(getVolumeName(), getBucketName(), snapshotName4);
omException = assertThrows(OMException.class, () -> doPreExecute(snapshotRequest4));
assertEquals(OMException.ResultCodes.TOO_MANY_SNAPSHOTS, omException.getResult());
}

private void renameKey(String fromKey, String toKey, long offset)
throws IOException {
OmKeyInfo toKeyInfo = addKey(toKey, offset + 1L);
Expand Down
Loading