This is an automated email from the ASF dual-hosted git repository.
hemant pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ozone.git
The following commit(s) were added to refs/heads/master by this push:
new cc293e6571 HDDS-8005. Fixed intermittent failure in
TestOmSnapshot.testSnapDiffWithMultipleSSTs (#6071)
cc293e6571 is described below
commit cc293e657194f20d242ba2a8abd233c2b50c0505
Author: Hemant Kumar <[email protected]>
AuthorDate: Tue Jan 23 11:38:38 2024 -0800
HDDS-8005. Fixed intermittent failure in
TestOmSnapshot.testSnapDiffWithMultipleSSTs (#6071)
---
.../hadoop/ozone/om/snapshot/TestOmSnapshot.java | 19 +++++++------------
1 file changed, 7 insertions(+), 12 deletions(-)
diff --git
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/snapshot/TestOmSnapshot.java
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/snapshot/TestOmSnapshot.java
index 6d8bc353eb..6b19c257de 100644
---
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/snapshot/TestOmSnapshot.java
+++
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/snapshot/TestOmSnapshot.java
@@ -87,7 +87,6 @@ import org.apache.log4j.Logger;
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;
@@ -1784,9 +1783,7 @@ public abstract class TestOmSnapshot {
* 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";
@@ -1800,29 +1797,27 @@ public abstract class TestOmSnapshot {
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());
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
