[rocketmq] branch 5.0.0-alpha updated: [ISSUE #3741] Use wait-until-${async-complete}-reaches DSL instead of sleep(n) to to reduce invalid wait time. (#3829)

[jinrongtong]

This is an automated email from the ASF dual-hosted git repository.

jinrongtong pushed a commit to branch 5.0.0-alpha
in repository https://gitbox.apache.org/repos/asf/rocketmq.git


The following commit(s) were added to refs/heads/5.0.0-alpha by this push:
     new 631405e  [ISSUE #3741] Use wait-until-${async-complete}-reaches DSL 
instead of sleep(n) to to reduce invalid wait time. (#3829)
631405e is described below

commit 631405e2fba8849f9bce5e275825aa16944b8097
Author: Hongjian Fei <erikfei1...@163.com>
AuthorDate: Wed Feb 9 11:20:50 2022 +0800

    [ISSUE #3741] Use wait-until-${async-complete}-reaches DSL instead of 
sleep(n) to to reduce invalid wait time. (#3829)
---
 .../rocketmq/store/dledger/DLedgerCommitlogTest.java       | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git 
a/store/src/test/java/org/apache/rocketmq/store/dledger/DLedgerCommitlogTest.java
 
b/store/src/test/java/org/apache/rocketmq/store/dledger/DLedgerCommitlogTest.java
index 9769b79..1c0e54c 100644
--- 
a/store/src/test/java/org/apache/rocketmq/store/dledger/DLedgerCommitlogTest.java
+++ 
b/store/src/test/java/org/apache/rocketmq/store/dledger/DLedgerCommitlogTest.java
@@ -24,6 +24,7 @@ import java.nio.ByteBuffer;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.UUID;
+import java.util.concurrent.Callable;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.TimeUnit;
 
@@ -39,6 +40,9 @@ import org.apache.rocketmq.store.PutMessageStatus;
 import org.junit.Assert;
 import org.junit.Test;
 
+import static java.util.concurrent.TimeUnit.SECONDS;
+import static org.awaitility.Awaitility.await;
+
 public class DLedgerCommitlogTest extends MessageStoreTestBase {
 
 
@@ -330,10 +334,9 @@ public class DLedgerCommitlogTest extends 
MessageStoreTestBase {
 
 
         DefaultMessageStore followerStore = 
createDledgerMessageStore(createBaseDir(), group, "n1", peers, "n0", false, 0);
-        Thread.sleep(10000);
+        await().atMost(10, SECONDS).until(followerCatchesUp(followerStore, 
topic));
 
         Assert.assertEquals(1, leaderStore.getMaxOffsetInQueue(topic, 0));
-        Assert.assertEquals(1, followerStore.getMaxOffsetInQueue(topic, 0));
         Assert.assertTrue(leaderStore.getCommitLog().getMaxOffset() > 0);
 
 
@@ -364,10 +367,9 @@ public class DLedgerCommitlogTest extends 
MessageStoreTestBase {
 
 
         DefaultMessageStore followerStore = 
createDledgerMessageStore(createBaseDir(), group, "n1", peers, "n0", false, 0);
-        Thread.sleep(10000);
+        await().atMost(10, SECONDS).until(followerCatchesUp(followerStore, 
topic));
 
         Assert.assertEquals(1, leaderStore.getMaxOffsetInQueue(topic, 0));
-        Assert.assertEquals(1, followerStore.getMaxOffsetInQueue(topic, 0));
         Assert.assertTrue(leaderStore.getCommitLog().getMaxOffset() > 0);
 
 
@@ -378,5 +380,7 @@ public class DLedgerCommitlogTest extends 
MessageStoreTestBase {
         followerStore.shutdown();
     }
 
-
+    private Callable<Boolean> followerCatchesUp(DefaultMessageStore 
followerStore, String topic) {
+        return () -> followerStore.getMaxOffsetInQueue(topic, 0) == 1;
+    }
 }