Repository: incubator-ratis Updated Branches: refs/heads/master 7255747a2 -> 6f3419ad8
Revert "RATIS-404. Deadlock in ratis between appendEntries and RaftLogWorker." This reverts commit 7255747a2b6b423a47ee82dd80728e52c7a05d6b. Project: http://git-wip-us.apache.org/repos/asf/incubator-ratis/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ratis/commit/2c40f8a0 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ratis/tree/2c40f8a0 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ratis/diff/2c40f8a0 Branch: refs/heads/master Commit: 2c40f8a0d50b6dc9e083df01e9f78b5c1ff85921 Parents: 7255747 Author: Tsz Wo Nicholas Sze <[email protected]> Authored: Fri Nov 9 13:13:03 2018 -0800 Committer: Tsz Wo Nicholas Sze <[email protected]> Committed: Fri Nov 9 13:13:03 2018 -0800 ---------------------------------------------------------------------- .../src/main/java/org/apache/ratis/server/impl/RaftServerImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ratis/blob/2c40f8a0/ratis-server/src/main/java/org/apache/ratis/server/impl/RaftServerImpl.java ---------------------------------------------------------------------- diff --git a/ratis-server/src/main/java/org/apache/ratis/server/impl/RaftServerImpl.java b/ratis-server/src/main/java/org/apache/ratis/server/impl/RaftServerImpl.java index 48a21ee..09e4550 100644 --- a/ratis-server/src/main/java/org/apache/ratis/server/impl/RaftServerImpl.java +++ b/ratis-server/src/main/java/org/apache/ratis/server/impl/RaftServerImpl.java @@ -920,7 +920,7 @@ public class RaftServerImpl implements RaftServerProtocol, RaftServerAsynchronou if (!isHeartbeat) { CodeInjectionForTesting.execute(RaftLog.LOG_SYNC, getId(), null); } - return JavaUtils.allOf(futures).thenApplyAsync(v -> { + return JavaUtils.allOf(futures).thenApply(v -> { final AppendEntriesReplyProto reply; synchronized(this) { if (lifeCycle.getCurrentState() == RUNNING && isFollower()
