Skip to content

HDDS-11911. Return consistent error code when snapshot is not found in the DB or Snapshot Chain. #7557

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
sadanand48 merged 4 commits into from
Dec 12, 2024
Merged

HDDS-11911. Return consistent error code when snapshot is not found in the DB or Snapshot Chain. #7557

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9d2e6d0
HDDS-11911. Fix ResultCode when snapshot is not found in the DB or Sn…
Dec 11, 2024
765ef30
fix findbugs
Dec 11, 2024
337b900
address comment
Dec 11, 2024
01a02f7
Merge branch 'master' into HDDS-11911
Dec 11, 2024
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: 5 additions & 4 deletions ...ne/integration-test/src/test/java/org/apache/hadoop/ozone/om/snapshot/TestOmSnapshot.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,6 +127,7 @@
import static org.apache.hadoop.ozone.om.OmUpgradeConfig.ConfigStrings.OZONE_OM_INIT_DEFAULT_LAYOUT_VERSION;
import static org.apache.hadoop.ozone.om.exceptions.OMException.ResultCodes.BUCKET_NOT_FOUND;
import static org.apache.hadoop.ozone.om.exceptions.OMException.ResultCodes.CONTAINS_SNAPSHOT;
import static org.apache.hadoop.ozone.om.exceptions.OMException.ResultCodes.FILE_NOT_FOUND;
import static org.apache.hadoop.ozone.om.exceptions.OMException.ResultCodes.KEY_NOT_FOUND;
import static org.apache.hadoop.ozone.om.exceptions.OMException.ResultCodes.NOT_SUPPORTED_OPERATION_PRIOR_FINALIZATION;
import static org.apache.hadoop.ozone.om.exceptions.OMException.ResultCodes.VOLUME_NOT_FOUND;
Expand Down Expand Up @@ -1602,13 +1603,13 @@ public void testSnapDiffNoSnapshot() throws Exception {
OMException omException = assertThrows(OMException.class,
() -> store.snapshotDiff(volume, bucket, snap1, snap2,
null, 0, false, disableNativeDiff));
assertEquals(KEY_NOT_FOUND, omException.getResult());
assertEquals(FILE_NOT_FOUND, omException.getResult());
// From snapshot is invalid
omException = assertThrows(OMException.class,
() -> store.snapshotDiff(volume, bucket, snap2, snap1,
null, 0, false, disableNativeDiff));

assertEquals(KEY_NOT_FOUND, omException.getResult());
assertEquals(FILE_NOT_FOUND, omException.getResult());
}

@Test
Expand Down Expand Up @@ -1699,12 +1700,12 @@ public void testSnapDiffMissingMandatoryParams() throws Exception {
OMException omException = assertThrows(OMException.class,
() -> store.snapshotDiff(volume, bucket, snap1, nullstr,
null, 0, forceFullSnapshotDiff, disableNativeDiff));
assertEquals(KEY_NOT_FOUND, omException.getResult());
assertEquals(FILE_NOT_FOUND, omException.getResult());
// From snapshot is empty
omException = assertThrows(OMException.class,
() -> store.snapshotDiff(volume, bucket, nullstr, snap1,
null, 0, forceFullSnapshotDiff, disableNativeDiff));
assertEquals(KEY_NOT_FOUND, omException.getResult());
assertEquals(FILE_NOT_FOUND, omException.getResult());
// Bucket is empty
assertThrows(IllegalArgumentException.class,
() -> store.snapshotDiff(volume, nullstr, snap1, snap2,
Expand Down
7 changes: 4 additions & 3 deletions hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/OmSnapshotManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,8 +99,8 @@
import static org.apache.hadoop.ozone.om.OMConfigKeys.OZONE_OM_SNAPSHOT_DIFF_DB_DIR;
import static org.apache.hadoop.ozone.om.OMConfigKeys.OZONE_OM_SNAPSHOT_DIFF_REPORT_MAX_PAGE_SIZE;
import static org.apache.hadoop.ozone.om.OMConfigKeys.OZONE_OM_SNAPSHOT_DIFF_REPORT_MAX_PAGE_SIZE_DEFAULT;
import static org.apache.hadoop.ozone.om.exceptions.OMException.ResultCodes.FILE_NOT_FOUND;
import static org.apache.hadoop.ozone.om.exceptions.OMException.ResultCodes.INVALID_KEY_NAME;
import static org.apache.hadoop.ozone.om.exceptions.OMException.ResultCodes.INVALID_SNAPSHOT_ERROR;
import static org.apache.hadoop.ozone.om.snapshot.SnapshotDiffManager.getSnapshotRootPath;
import static org.apache.hadoop.ozone.om.snapshot.SnapshotUtils.checkSnapshotActive;
import static org.apache.hadoop.ozone.om.snapshot.SnapshotUtils.dropColumnFamilyHandle;
Expand Down Expand Up @@ -352,7 +352,8 @@ public OmSnapshot load(@Nonnull UUID snapshotId) throws IOException {
// If it happens, then either snapshot has been purged in between or SnapshotChain is corrupted
// and missing some entries which needs investigation.
if (snapshotTableKey == null) {
throw new IOException("No snapshot exist with snapshotId: " + snapshotId);
throw new OMException("Snapshot " + snapshotId +
" is not found in the snapshot chain.", FILE_NOT_FOUND);
}

final SnapshotInfo snapshotInfo = getSnapshotInfo(snapshotTableKey);
Expand Down Expand Up @@ -745,7 +746,7 @@ private SnapshotInfo getSnapshotInfo(String snapshotKey) throws IOException {
snapshotInfo = ozoneManager.getMetadataManager().getSnapshotInfoTable().getSkipCache(snapshotKey);
}
if (snapshotInfo == null) {
throw new OMException("Snapshot '" + snapshotKey + "' is not found.", INVALID_SNAPSHOT_ERROR);
throw new OMException("Snapshot '" + snapshotKey + "' is not found.", FILE_NOT_FOUND);
}
return snapshotInfo;
}
Expand Down
8 changes: 3 additions & 5 deletions ...-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/snapshot/SnapshotUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,12 +46,10 @@
import java.util.UUID;

import static org.apache.hadoop.ozone.OzoneConsts.OM_KEY_PREFIX;
import static org.apache.hadoop.ozone.om.exceptions.OMException.ResultCodes.INVALID_SNAPSHOT_ERROR;
import static org.apache.hadoop.ozone.om.OmMetadataManagerImpl.DIRECTORY_TABLE;
import static org.apache.hadoop.ozone.om.OmMetadataManagerImpl.FILE_TABLE;
import static org.apache.hadoop.ozone.om.OmMetadataManagerImpl.KEY_TABLE;
import static org.apache.hadoop.ozone.om.exceptions.OMException.ResultCodes.FILE_NOT_FOUND;
import static org.apache.hadoop.ozone.om.exceptions.OMException.ResultCodes.KEY_NOT_FOUND;
import static org.apache.hadoop.ozone.om.exceptions.OMException.ResultCodes.TIMEOUT;

/**
Expand Down Expand Up @@ -88,7 +86,7 @@ public static SnapshotInfo getSnapshotInfo(final OzoneManager ozoneManager,
}
if (snapshotInfo == null) {
throw new OMException("Snapshot '" + snapshotKey + "' is not found.",
KEY_NOT_FOUND);
FILE_NOT_FOUND);
}
return snapshotInfo;
}
Expand Down Expand Up @@ -164,7 +162,7 @@ public static SnapshotInfo getNextSnapshot(OzoneManager ozoneManager,
// is removed in-memory but OMDoubleBuffer has not flushed yet.
if (snapInfo == null) {
throw new OMException("Provided Snapshot Info argument is null. Cannot get the next snapshot for a null value",
INVALID_SNAPSHOT_ERROR);
FILE_NOT_FOUND);
}
try {
if (chainManager.hasNextPathSnapshot(snapInfo.getSnapshotPath(),
Expand Down Expand Up @@ -201,7 +199,7 @@ private static UUID getPreviousSnapshotId(SnapshotInfo snapInfo, SnapshotChainMa
// is removed in-memory but OMDoubleBuffer has not flushed yet.
if (snapInfo == null) {
throw new OMException("Provided Snapshot Info argument is null. Cannot get the previous snapshot for a null " +
"value", INVALID_SNAPSHOT_ERROR);
"value", FILE_NOT_FOUND);
}
try {
if (chainManager.hasPreviousPathSnapshot(snapInfo.getSnapshotPath(),
Expand Down
25 changes: 25 additions & 0 deletions ...p-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/TestOmSnapshotManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
import org.apache.hadoop.hdds.utils.db.DBStore;
import org.apache.hadoop.hdds.utils.db.RDBBatchOperation;
import org.apache.hadoop.hdds.utils.db.Table;
import org.apache.hadoop.ozone.om.exceptions.OMException;
import org.apache.hadoop.ozone.om.helpers.OmBucketInfo;
import org.apache.hadoop.ozone.om.helpers.OmVolumeArgs;
import org.apache.hadoop.ozone.om.helpers.SnapshotInfo;
Expand Down Expand Up @@ -72,6 +73,7 @@
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.timeout;
import static org.mockito.Mockito.times;
Expand Down Expand Up @@ -314,6 +316,29 @@ public void testHardLinkCreation() throws IOException {
getINode(f1FileLink.toPath()), "link matches original file");
}


@Test
public void testGetSnapshotInfo() throws IOException {
SnapshotInfo s1 = createSnapshotInfo("vol", "buck");
UUID latestGlobalSnapId =
((OmMetadataManagerImpl) om.getMetadataManager()).getSnapshotChainManager()
.getLatestGlobalSnapshotId();
UUID latestPathSnapId =
((OmMetadataManagerImpl) om.getMetadataManager()).getSnapshotChainManager()
.getLatestPathSnapshotId(String.join("/", "vol", "buck"));
s1.setPathPreviousSnapshotId(latestPathSnapId);
s1.setGlobalPreviousSnapshotId(latestGlobalSnapId);
((OmMetadataManagerImpl) om.getMetadataManager()).getSnapshotChainManager()
.addSnapshot(s1);
OMException ome = assertThrows(OMException.class,
() -> om.getOmSnapshotManager().getSnapshot(s1.getSnapshotId()));
assertEquals(OMException.ResultCodes.FILE_NOT_FOUND, ome.getResult());
// not present in snapshot chain too
SnapshotInfo s2 = createSnapshotInfo("vol", "buck");
ome = assertThrows(OMException.class,
() -> om.getOmSnapshotManager().getSnapshot(s2.getSnapshotId()));
assertEquals(OMException.ResultCodes.FILE_NOT_FOUND, ome.getResult());
}
/*
* Test that exclude list is generated correctly.
*/
Expand Down
Loading