This is an automated email from the ASF dual-hosted git repository. williamsong pushed a commit to branch snapshot-branch2 in repository https://gitbox.apache.org/repos/asf/ratis.git
commit 8d897eac9c12dd56d8dc457017ffc337a9e2e5ac Author: William Song <[email protected]> AuthorDate: Wed Jul 12 17:55:13 2023 +0800 RATIS-1856. Notify apply index change of all RaftLog entries (#893) --- .../src/main/java/org/apache/ratis/server/impl/StateMachineUpdater.java | 2 ++ ratis-server/src/test/java/org/apache/ratis/ReadOnlyRequestTests.java | 2 +- .../test/java/org/apache/ratis/ReadOnlyRequestWithLongTimeoutTests.java | 2 ++ 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/ratis-server/src/main/java/org/apache/ratis/server/impl/StateMachineUpdater.java b/ratis-server/src/main/java/org/apache/ratis/server/impl/StateMachineUpdater.java index fa9630b12..18f165198 100644 --- a/ratis-server/src/main/java/org/apache/ratis/server/impl/StateMachineUpdater.java +++ b/ratis-server/src/main/java/org/apache/ratis/server/impl/StateMachineUpdater.java @@ -245,6 +245,8 @@ class StateMachineUpdater implements Runnable { if (f != null) { futures.get().add(f); f.thenAccept(m -> notifyAppliedIndex(incremented)); + } else { + notifyAppliedIndex(incremented); } } else { LOG.debug("{}: logEntry {} is null. There may be snapshot to load. state:{}", diff --git a/ratis-server/src/test/java/org/apache/ratis/ReadOnlyRequestTests.java b/ratis-server/src/test/java/org/apache/ratis/ReadOnlyRequestTests.java index e4d32458a..c4c31cd22 100644 --- a/ratis-server/src/test/java/org/apache/ratis/ReadOnlyRequestTests.java +++ b/ratis-server/src/test/java/org/apache/ratis/ReadOnlyRequestTests.java @@ -288,7 +288,7 @@ public abstract class ReadOnlyRequestTests<CLUSTER extends MiniRaftCluster> } private void timeoutIncrement() { - sleepQuietly(2500); + sleepQuietly(5000); increment(); } diff --git a/ratis-server/src/test/java/org/apache/ratis/ReadOnlyRequestWithLongTimeoutTests.java b/ratis-server/src/test/java/org/apache/ratis/ReadOnlyRequestWithLongTimeoutTests.java index 61f2b9ec5..14aa1bca2 100644 --- a/ratis-server/src/test/java/org/apache/ratis/ReadOnlyRequestWithLongTimeoutTests.java +++ b/ratis-server/src/test/java/org/apache/ratis/ReadOnlyRequestWithLongTimeoutTests.java @@ -18,6 +18,7 @@ package org.apache.ratis; import org.apache.ratis.client.RaftClient; +import org.apache.ratis.client.RaftClientConfigKeys; import org.apache.ratis.conf.RaftProperties; import org.apache.ratis.protocol.Message; import org.apache.ratis.protocol.RaftClientReply; @@ -71,6 +72,7 @@ public abstract class ReadOnlyRequestWithLongTimeoutTests<CLUSTER extends MiniRa RaftServerConfigKeys.Rpc.setTimeoutMin(p, TimeDuration.valueOf(3, TimeUnit.SECONDS)); RaftServerConfigKeys.Rpc.setTimeoutMax(p, TimeDuration.valueOf(6, TimeUnit.SECONDS)); RaftServerConfigKeys.Rpc.setRequestTimeout(p, TimeDuration.valueOf(10, TimeUnit.SECONDS)); + RaftClientConfigKeys.Rpc.setRequestTimeout(p, TimeDuration.valueOf(10, TimeUnit.SECONDS)); } @Test
