RATIS-707. Test failures caused by minTimeout set to zero. Contributed by Siddharth Wagle

Author: szetszwo

ratis-server/src/main/java/org/apache/ratis/server/impl/RaftServerImpl.java

@@ -50,7 +50,6 @@
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.ThreadLocalRandom;
 import java.util.concurrent.TimeUnit;
-import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicReference;
 import java.util.function.Function;
 import java.util.function.Supplier;
@@ -97,8 +96,6 @@ public class RaftServerImpl implements RaftServerProtocol, RaftServerAsynchronou
 
   private AtomicReference<TermIndex> inProgressInstallSnapshotRequest;
 
-  private final AtomicBoolean honorMinTimeoutMs = new AtomicBoolean();
-
   RaftServerImpl(RaftGroup group, StateMachine stateMachine, RaftServerProxy proxy) throws IOException {
     final RaftPeerId id = proxy.getId();
     LOG.info("{}: new RaftServerImpl for {} with {}", id, group, stateMachine);
@@ -151,12 +148,7 @@ int getMaxTimeoutMs() {
   }
 
   int getRandomTimeoutMs() {
-    return (honorMinTimeoutMs.get() ? minTimeoutMs : 0) +
-        ThreadLocalRandom.current().nextInt(maxTimeoutMs - minTimeoutMs + 1);
-  }
-
-  void honorMinTimeoutMs() {
-    honorMinTimeoutMs.set(Boolean.TRUE);
+    return minTimeoutMs + ThreadLocalRandom.current().nextInt(maxTimeoutMs - minTimeoutMs + 1);
   }
 
   int getSleepDeviationThresholdMs() {

ratis-server/src/main/java/org/apache/ratis/server/impl/ServerState.java

@@ -251,7 +251,6 @@ void setLeader(RaftPeerId newLeaderId, String op) {
         lastNoLeaderTime = null;
         suffix = ", leader elected after " + previous.elapsedTimeMs() + "ms";
         server.getStateMachine().notifyLeaderChanged(getMemberId(), newLeaderId);
-        server.honorMinTimeoutMs();
       }
       LOG.info("{}: change Leader from {} to {} at term {} for {}{}",
           getMemberId(), leaderId, newLeaderId, getCurrentTerm(), op, suffix);