szetszwo commented on code in PR #1033:
URL: https://github.com/apache/ratis/pull/1033#discussion_r1470254593
##########
ratis-server/src/main/java/org/apache/ratis/server/impl/LeaderStateImpl.java:
##########
@@ -310,20 +310,23 @@ CompletableFuture<Long> getAppliedIndexFuture() {
return appliedIndexFuture;
}
- boolean isApplied(LogEntryProto logEntry) {
+ boolean isFirstLogInCurrentTerm(LogEntryProto logEntry) {
if (appliedIndexFuture.isDone()) {
- return true;
+ return false;
}
- final long appliedIndex = logEntry != null? logEntry.getIndex():
server.getState().getLastAppliedIndex();
- if (appliedIndex >= startIndex) {
+ final long appliedIndex = logEntry.getIndex();
+ if (appliedIndex == startIndex) {
appliedIndexFuture.complete(appliedIndex);
- LOG.info("leader is ready since appliedIndex == {} >= startIndex ==
{}",
- appliedIndex, startIndex);
+ LOG.info("leader is ready since appliedIndex == startIndex == {}",
startIndex);
return true;
} else {
return false;
}
}
+
+ boolean isApplied() {
+ return appliedIndexFuture.isDone();
Review Comment:
Need to check cancelation and exception.
```java
return JavaUtils.isCompletedNormally(appliedIndexFuture);
```
```java
//JavaUtils
static boolean isCompletedNormally(CompletableFuture<?> future) {
return future.isDone() && !future.isCancelled() &&
!future.isCompletedExceptionally();
}
```
##########
ratis-server/src/main/java/org/apache/ratis/server/impl/LeaderStateImpl.java:
##########
@@ -310,20 +310,23 @@ CompletableFuture<Long> getAppliedIndexFuture() {
return appliedIndexFuture;
}
- boolean isApplied(LogEntryProto logEntry) {
+ boolean isFirstLogInCurrentTerm(LogEntryProto logEntry) {
if (appliedIndexFuture.isDone()) {
- return true;
+ return false;
}
- final long appliedIndex = logEntry != null? logEntry.getIndex():
server.getState().getLastAppliedIndex();
- if (appliedIndex >= startIndex) {
+ final long appliedIndex = logEntry.getIndex();
+ if (appliedIndex == startIndex) {
appliedIndexFuture.complete(appliedIndex);
- LOG.info("leader is ready since appliedIndex == {} >= startIndex ==
{}",
- appliedIndex, startIndex);
+ LOG.info("leader is ready since appliedIndex == startIndex == {}",
startIndex);
return true;
} else {
return false;
}
}
Review Comment:
Let's call it `checkStartIndex`. We may simplify this method as below:
```java
boolean checkStartIndex(LogEntryProto logEntry) {
final boolean completed = logEntry.getIndex() == startIndex &&
appliedIndexFuture.complete(startIndex);
if (completed) {
LOG.info("Leader {} is ready since appliedIndex == startIndex ==
{}", LeaderStateImpl.this, startIndex);
}
return completed;
}
```
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
