Skip to content

HDDS-7861. [Snapshot] Delete keys from the source bucket to fix the flakiness of snapshot restore tests #4230

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
smengcl merged 4 commits into from
Feb 1, 2023
Merged

HDDS-7861. [Snapshot] Delete keys from the source bucket to fix the flakiness of snapshot restore tests #4230

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
100c547
HDDS-7845. Append the slash to copy to bucket path to fix the flaky s…
hemantk-12 Jan 31, 2023
f51e35e
Delete the keys from source bucket to make sure that key doesn't exis…
hemantk-12 Feb 1, 2023
e1fee03
Minor comment fix
hemantk-12 Feb 1, 2023
928ab17
Updated the comment
hemantk-12 Feb 1, 2023
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
30 changes: 24 additions & 6 deletions ...tion-test/src/test/java/org/apache/hadoop/ozone/om/snapshot/TestOzoneSnapshotRestore.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -220,8 +220,9 @@ public void testRestoreSnapshot(BucketLayout bucketLayoutTest)
Assertions.assertEquals(0, delKeyCount);

String sourcePath = OM_KEY_PREFIX + volume + OM_KEY_PREFIX + bucket
+ OM_KEY_PREFIX + snapshotKeyPrefix;
String destPath = OM_KEY_PREFIX + volume + OM_KEY_PREFIX + bucket;
+ OM_KEY_PREFIX + snapshotKeyPrefix;
String destPath = OM_KEY_PREFIX + volume + OM_KEY_PREFIX + bucket
+ OM_KEY_PREFIX;

for (int i = 0; i < 5; i++) {
keyCopy(sourcePath + keyPrefix + i, destPath);
Expand Down Expand Up @@ -258,9 +259,25 @@ public void testRestoreSnapshotDifferentBucket(BucketLayout bucketLayoutTest)
int volBucketKeyCount = keyCount(buck, snapshotKeyPrefix + keyPrefix);
Assertions.assertEquals(5, volBucketKeyCount);

// Delete keys from the source bucket.
// This is temporary fix to make sure that test passes all the time.
// If we don't delete keys from the source bucket, copy command
// will fail. In copy command, there is a check to make sure that key
// doesn't exist in the destination bucket.
// Problem is that RocksDB's seek operation doesn't 100% guarantee that
// item key is available. Tho we believe that it is in
// `createFakeDirIfShould` function. When we seek if there is a directory
// for the key name, sometime it returns non-null response but in reality
// item doesn't exist.
// In the case when seek returns non-null response, "key doesn't exist in
// the destination bucket" check fails because getFileStatus returns
// dir with key name exists.
deleteKeys(buck);

String sourcePath = OM_KEY_PREFIX + volume + OM_KEY_PREFIX + bucket
+ OM_KEY_PREFIX + snapshotKeyPrefix;
String destPath = OM_KEY_PREFIX + volume + OM_KEY_PREFIX + bucket2;
+ OM_KEY_PREFIX + snapshotKeyPrefix;
String destPath = OM_KEY_PREFIX + volume + OM_KEY_PREFIX + bucket2
+ OM_KEY_PREFIX;

for (int i = 0; i < 5; i++) {
keyCopy(sourcePath + keyPrefix + i, destPath);
Expand Down Expand Up @@ -302,8 +319,9 @@ public void testRestoreSnapshotDifferentBucketLayout(
Assertions.assertEquals(5, volBucketKeyCount);

String sourcePath = OM_KEY_PREFIX + volume + OM_KEY_PREFIX + bucket
+ OM_KEY_PREFIX + snapshotKeyPrefix;
String destPath = OM_KEY_PREFIX + volume + OM_KEY_PREFIX + bucket2;
+ OM_KEY_PREFIX + snapshotKeyPrefix;
String destPath = OM_KEY_PREFIX + volume + OM_KEY_PREFIX + bucket2
+ OM_KEY_PREFIX;

for (int i = 0; i < 5; i++) {
keyCopy(sourcePath + keyPrefix + i, destPath);
Expand Down