This is an automated email from the ASF dual-hosted git repository.
adoroszlai 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 a539f4968d3 HDDS-15222. Fix intermittent failure in
testSnapshotNameConsistency (#10555)
a539f4968d3 is described below
commit a539f4968d3bfb6577a28b19b5a7bed60f15db35
Author: Chi-Hsuan Huang <[email protected]>
AuthorDate: Sat Jun 20 18:20:32 2026 +0800
HDDS-15222. Fix intermittent failure in testSnapshotNameConsistency (#10555)
---
.../om/snapshot/TestOzoneManagerHASnapshot.java | 20 ++++++--------------
1 file changed, 6 insertions(+), 14 deletions(-)
diff --git
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/snapshot/TestOzoneManagerHASnapshot.java
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/snapshot/TestOzoneManagerHASnapshot.java
index f03598ce1d7..f444da964b5 100644
---
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/snapshot/TestOzoneManagerHASnapshot.java
+++
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/snapshot/TestOzoneManagerHASnapshot.java
@@ -18,7 +18,6 @@
package org.apache.hadoop.ozone.om.snapshot;
import static java.nio.charset.StandardCharsets.UTF_8;
-import static org.apache.hadoop.ozone.OzoneConsts.OM_KEY_PREFIX;
import static org.apache.hadoop.ozone.om.OmSnapshotManager.getSnapshotPath;
import static
org.apache.hadoop.ozone.snapshot.SnapshotDiffResponse.JobStatus.DONE;
import static
org.apache.hadoop.ozone.snapshot.SnapshotDiffResponse.JobStatus.IN_PROGRESS;
@@ -43,7 +42,6 @@
import org.apache.hadoop.hdds.conf.OzoneConfiguration;
import org.apache.hadoop.hdds.utils.IOUtils;
import org.apache.hadoop.hdds.utils.db.RDBCheckpointUtils;
-import org.apache.hadoop.hdds.utils.db.Table;
import org.apache.hadoop.ozone.MiniOzoneCluster;
import org.apache.hadoop.ozone.MiniOzoneHAClusterImpl;
import org.apache.hadoop.ozone.OzoneConfigKeys;
@@ -59,7 +57,6 @@
import org.apache.hadoop.ozone.om.ratis.OzoneManagerDoubleBuffer;
import org.apache.hadoop.ozone.snapshot.SnapshotDiffResponse;
import org.apache.ozone.test.GenericTestUtils;
-import org.apache.ozone.test.tag.Flaky;
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;
@@ -200,23 +197,18 @@ public void testSnapshotIdConsistency() throws Exception {
* passed or empty.
*/
@Test
- @Flaky("HDDS-15222")
public void testSnapshotNameConsistency() throws Exception {
- store.createSnapshot(volumeName, bucketName, "");
+ String snapshotName = store.createSnapshot(volumeName, bucketName, "");
List<OzoneManager> ozoneManagers = cluster.getOzoneManagersList();
List<String> snapshotNames = new ArrayList<>();
for (OzoneManager ozoneManager : ozoneManagers) {
await(120_000, 100, () -> {
- String snapshotPrefix = OM_KEY_PREFIX + volumeName +
- OM_KEY_PREFIX + bucketName;
- SnapshotInfo snapshotInfo = null;
- try (Table.KeyValueIterator<String, SnapshotInfo>
- iterator = ozoneManager.getMetadataManager()
- .getSnapshotInfoTable().iterator(snapshotPrefix)) {
- while (iterator.hasNext()) {
- snapshotInfo = iterator.next().getValue();
- }
+ SnapshotInfo snapshotInfo;
+ try {
+ snapshotInfo = ozoneManager.getMetadataManager()
+ .getSnapshotInfoTable()
+ .get(SnapshotInfo.getTableKey(volumeName, bucketName,
snapshotName));
} catch (IOException e) {
throw new RuntimeException(e);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
