showuon commented on code in PR #16079:
URL: https://github.com/apache/kafka/pull/16079#discussion_r1625880394
##########
raft/src/main/java/org/apache/kafka/raft/LeaderState.java:
##########
@@ -435,16 +438,40 @@ private DescribeQuorumResponseData.ReplicaState
describeReplicaState(
}
+ /**
+ * Clear observer states that have not been active for a while and are not
the leader.
+ */
private void clearInactiveObservers(final long currentTimeMs) {
observerStates.entrySet().removeIf(integerReplicaStateEntry ->
- currentTimeMs -
integerReplicaStateEntry.getValue().lastFetchTimestamp >=
OBSERVER_SESSION_TIMEOUT_MS
+ currentTimeMs -
integerReplicaStateEntry.getValue().lastFetchTimestamp >=
OBSERVER_SESSION_TIMEOUT_MS &&
+ integerReplicaStateEntry.getKey() != localId
);
}
private boolean isVoter(int remoteNodeId) {
return voterStates.containsKey(remoteNodeId);
}
+ private void updateVoterAndObserverStates(Set<Integer> lastVoterSet) {
Review Comment:
I didn't see we have any unit tests for this. Could we add some to verify
the observerState/voterState are changed as expected?
##########
raft/src/test/java/org/apache/kafka/raft/LeaderStateTest.java:
##########
@@ -272,20 +280,103 @@ public void testUpdateHighWatermarkQuorumSizeThree() {
assertEquals(Optional.empty(), state.highWatermark());
assertTrue(state.updateReplicaState(node2, 0, new
LogOffsetMetadata(15L)));
assertEquals(Optional.of(new LogOffsetMetadata(15L)),
state.highWatermark());
- assertFalse(state.updateLocalState(new LogOffsetMetadata(20L)));
+ assertFalse(state.updateLocalState(new LogOffsetMetadata(20L),
voterSet));
assertEquals(Optional.of(new LogOffsetMetadata(15L)),
state.highWatermark());
assertTrue(state.updateReplicaState(node1, 0, new
LogOffsetMetadata(20L)));
assertEquals(Optional.of(new LogOffsetMetadata(20L)),
state.highWatermark());
assertFalse(state.updateReplicaState(node2, 0, new
LogOffsetMetadata(20L)));
assertEquals(Optional.of(new LogOffsetMetadata(20L)),
state.highWatermark());
}
+ @Test
+ public void testUpdateHighWatermarkAddingFollowerToVoterStates() {
+ int node1 = 1;
+ int node2 = 2;
+ Set<Integer> originalVoterSet = mkSet(localId, node1);
+ LeaderState<?> state = newLeaderState(originalVoterSet, 10L);
+ assertFalse(state.updateLocalState(new LogOffsetMetadata(15L),
originalVoterSet));
+ assertFalse(state.updateReplicaState(node1, 0, new
LogOffsetMetadata(10L)));
+ assertEquals(Optional.empty(), state.highWatermark());
+
+ // updating replica state of 2 before it joins voterSet should not
increase HW to 15L
+ assertFalse(state.updateReplicaState(node2, 0, new
LogOffsetMetadata(15L)));
+ assertEquals(Optional.empty(), state.highWatermark());
+
+ // adding node2 to voterSet will cause HW to increase to 15L
+ Set<Integer> voterSetWithNode2 = mkSet(localId, node1, node2);
+ assertTrue(state.updateLocalState(new LogOffsetMetadata(15L),
voterSetWithNode2));
+ assertEquals(Optional.of(new LogOffsetMetadata(15L)),
state.highWatermark());
+
+ // HW will not update to 16L until a majority reaches it
+ assertFalse(state.updateLocalState(new LogOffsetMetadata(16L),
voterSetWithNode2));
+ assertEquals(Optional.of(new LogOffsetMetadata(15L)),
state.highWatermark());
+ assertTrue(state.updateReplicaState(node2, 0, new
LogOffsetMetadata(16L)));
+ assertEquals(Optional.of(new LogOffsetMetadata(16L)),
state.highWatermark());
+ }
+
+ @Test
+ public void testUpdateHighWatermarkRemovingFollowerFromVoterStates() {
+ int node1 = 1;
+ int node2 = 2;
+ Set<Integer> originalVoterSet = mkSet(localId, node1, node2);
+ LeaderState<?> state = newLeaderState(originalVoterSet, 10L);
+ assertFalse(state.updateLocalState(new LogOffsetMetadata(15L),
originalVoterSet));
+ assertTrue(state.updateReplicaState(node1, 0, new
LogOffsetMetadata(15L)));
+ assertFalse(state.updateReplicaState(node2, 0, new
LogOffsetMetadata(10L)));
+ assertEquals(Optional.of(new LogOffsetMetadata(15L)),
state.highWatermark());
+
+ // removing node1 should not decrement HW to 10L
+ Set<Integer> voterSetWithoutNode1 = mkSet(localId, node2);
+ assertFalse(state.updateLocalState(new LogOffsetMetadata(17L),
voterSetWithoutNode1));
+ assertEquals(Optional.of(new LogOffsetMetadata(15L)),
state.highWatermark());
+
+ // HW cannot change until after node2 catches up to last HW
+ assertFalse(state.updateReplicaState(node2, 0, new
LogOffsetMetadata(14L)));
Review Comment:
I think we can also increase leader's LEO to 16 and show that it doesn't
increase the HWM.
--
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: jira-unsubscr...@kafka.apache.org
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
