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 3117c6d8ae HDDS-9434. Intermittent failure in
TestSnapshotDiffManager#testLoadJobsOnStartUp (#5424)
3117c6d8ae is described below
commit 3117c6d8ae5c5a0097bd55e3501d82de384124e7
Author: Sadanand Shenoy <[email protected]>
AuthorDate: Sat Oct 21 15:14:41 2023 +0530
HDDS-9434. Intermittent failure in
TestSnapshotDiffManager#testLoadJobsOnStartUp (#5424)
---
.../hadoop/ozone/om/snapshot/TestSnapshotDiffManager.java | 13 ++++++++++++-
1 file changed, 12 insertions(+), 1 deletion(-)
diff --git
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/snapshot/TestSnapshotDiffManager.java
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/snapshot/TestSnapshotDiffManager.java
index d6dc2551e4..cd67b89559 100644
---
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/snapshot/TestSnapshotDiffManager.java
+++
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/snapshot/TestSnapshotDiffManager.java
@@ -72,6 +72,7 @@ import org.apache.ozone.rocksdiff.RocksDBCheckpointDiffer;
import org.apache.ozone.rocksdiff.RocksDiffUtils;
import org.apache.ozone.test.tag.Unhealthy;
import org.apache.ratis.util.ExitUtils;
+import org.awaitility.Awaitility;
import org.jetbrains.annotations.NotNull;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.Assertions;
@@ -171,12 +172,14 @@ import static org.mockito.ArgumentMatchers.anySet;
import static org.mockito.ArgumentMatchers.anyString;
import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.any;
+import static org.mockito.Mockito.atLeast;
import static org.mockito.Mockito.doAnswer;
import static org.mockito.Mockito.doNothing;
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.doThrow;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
/**
@@ -1309,7 +1312,15 @@ public class TestSnapshotDiffManager {
spy.loadJobsOnStartUp();
// Wait for sometime to make sure that job finishes.
- Thread.sleep(1000L);
+ Awaitility.await()
+ .atMost(10, TimeUnit.SECONDS)
+ .untilAsserted(() -> {
+ verify(spy, atLeast(1))
+ .generateSnapshotDiffReport(anyString(), anyString(),
+ eq(VOLUME_NAME), eq(BUCKET_NAME), eq(snapshotInfo.getName()),
+ eq(snapshotInfoList.get(1).getName()), eq(false),
+ eq(false));
+ });
SnapshotDiffJob snapDiffJob = getSnapshotDiffJobFromDb(snapshotInfo,
snapshotInfoList.get(1));
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
