Skip to content

HDDS-8005. Fixed intermittent failure in TestOmSnapshot.testSnapDiffWithMultipleSSTs #6071

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
hemantk-12 merged 1 commit into from
Jan 23, 2024
Merged

HDDS-8005. Fixed intermittent failure in TestOmSnapshot.testSnapDiffWithMultipleSSTs #6071

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
19 changes: 7 additions & 12 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 @@ -87,7 +87,6 @@
import org.apache.ozone.rocksdiff.CompactionNode;
import org.apache.ozone.test.GenericTestUtils;
import org.apache.ozone.test.tag.Slow;
import org.apache.ozone.test.tag.Unhealthy;
import org.jetbrains.annotations.NotNull;
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.Test;
Expand Down Expand Up @@ -1784,9 +1783,7 @@ public void testListSnapshotDiffWithInvalidParameters()
* sst filtering code path.
*/
@Test
@Unhealthy("HDDS-8005")
public void testSnapDiffWithMultipleSSTs()
throws Exception {
public void testSnapDiffWithMultipleSSTs() throws Exception {
// Create a volume and 2 buckets
String volumeName1 = "vol-" + counter.incrementAndGet();
String bucketName1 = "buck1";
Expand All @@ -1800,29 +1797,27 @@ public void testSnapDiffWithMultipleSSTs()
String keyPrefix = "key-";
// add file to bucket1 and take snapshot
createFileKeyWithPrefix(bucket1, keyPrefix);
int keyTableSize = getKeyTableSstFiles().size();
String snap1 = "snap" + counter.incrementAndGet();
createSnapshot(volumeName1, bucketName1, snap1); // 1.sst
assertEquals(1, getKeyTableSstFiles().size());
assertEquals(1, (getKeyTableSstFiles().size() - keyTableSize));
// add files to bucket2 and flush twice to create 2 sst files
for (int i = 0; i < 5; i++) {
createFileKeyWithPrefix(bucket2, keyPrefix);
}
flushKeyTable(); // 1.sst 2.sst
assertEquals(2, getKeyTableSstFiles().size());
assertEquals(2, (getKeyTableSstFiles().size() - keyTableSize));
for (int i = 0; i < 5; i++) {
createFileKeyWithPrefix(bucket2, keyPrefix);
}
flushKeyTable(); // 1.sst 2.sst 3.sst
assertEquals(3, getKeyTableSstFiles().size());
assertEquals(3, (getKeyTableSstFiles().size() - keyTableSize));
// add a file to bucket1 and take second snapshot
createFileKeyWithPrefix(bucket1, keyPrefix);
String snap2 = "snap" + counter.incrementAndGet();
createSnapshot(volumeName1, bucketName1, snap2); // 1.sst 2.sst 3.sst 4.sst
assertEquals(4, getKeyTableSstFiles().size());
SnapshotDiffReportOzone diff1 =
store.snapshotDiff(volumeName1, bucketName1, snap1, snap2,
null, 0, forceFullSnapshotDiff, disableNativeDiff)
.getSnapshotDiffReport();
assertEquals(4, (getKeyTableSstFiles().size() - keyTableSize));
SnapshotDiffReportOzone diff1 = getSnapDiffReport(volumeName1, bucketName1, snap1, snap2);
assertEquals(1, diff1.getDiffList().size());
}

Expand Down