You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ratis.apache.org by dr...@apache.org on 2023/02/01 14:55:03 UTC
[ratis] branch master updated: Revert "RATIS-1778. Fix NPE in readIndexHeartbeats (#817)" (#818)
This is an automated email from the ASF dual-hosted git repository.
dragonyliu pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ratis.git
The following commit(s) were added to refs/heads/master by this push:
new 1a19b0890 Revert "RATIS-1778. Fix NPE in readIndexHeartbeats (#817)" (#818)
1a19b0890 is described below
commit 1a19b08906034da1c0f7387e0e0c6f47cd7f9883
Author: Yaolong Liu <ly...@163.com>
AuthorDate: Wed Feb 1 22:54:57 2023 +0800
Revert "RATIS-1778. Fix NPE in readIndexHeartbeats (#817)" (#818)
This reverts commit e852362f30fc57a8123f1dbcb98d3870d5e186e8.
Co-authored-by: dragonyliu <dr...@tencent.com>
---
.../java/org/apache/ratis/server/impl/ReadIndexHeartbeats.java | 7 +------
1 file changed, 1 insertion(+), 6 deletions(-)
diff --git a/ratis-server/src/main/java/org/apache/ratis/server/impl/ReadIndexHeartbeats.java b/ratis-server/src/main/java/org/apache/ratis/server/impl/ReadIndexHeartbeats.java
index b07ccaa8e..f7671e2f6 100644
--- a/ratis-server/src/main/java/org/apache/ratis/server/impl/ReadIndexHeartbeats.java
+++ b/ratis-server/src/main/java/org/apache/ratis/server/impl/ReadIndexHeartbeats.java
@@ -28,7 +28,6 @@ import org.slf4j.LoggerFactory;
import java.util.Iterator;
import java.util.Map;
import java.util.NavigableMap;
-import java.util.Optional;
import java.util.TreeMap;
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.ConcurrentHashMap;
@@ -102,7 +101,7 @@ class ReadIndexHeartbeats {
final HeartbeatAck reply = replies.computeIfAbsent(
logAppender.getFollowerId(), key -> new HeartbeatAck(logAppender));
if (reply.receive(proto)) {
- if (hasMajority.test(this::isAcknowledged)) {
+ if (hasMajority.test(id -> replies.get(id).isAcknowledged())) {
future.complete(commitIndex);
return true;
}
@@ -111,10 +110,6 @@ class ReadIndexHeartbeats {
return isCompletedNormally();
}
- boolean isAcknowledged(RaftPeerId id) {
- return Optional.ofNullable(replies.get(id)).map(HeartbeatAck::isAcknowledged).isPresent();
- }
-
boolean isCompletedNormally() {
return future.isDone() && !future.isCancelled() && !future.isCompletedExceptionally();
}