Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

KAFKA-18379: Enforce resigned cannot transition to any other state in same epoch #19236

Open
wants to merge 10 commits into
base: trunk
Choose a base branch
from
+10 −4
Open

KAFKA-18379: Enforce resigned cannot transition to any other state in same epoch #19236

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
ed25f85
KAFKA-18379: Enforce resigned cannot transition to any other state in…
frankvicky Mar 19, 2025
9a4e1d4
Merge branch 'trunk' into KAFKA-18379-new
frankvicky Mar 20, 2025
9da7027
Merge branch 'trunk' into KAFKA-18379-new
frankvicky Mar 22, 2025
9514010
Merge branch 'trunk' into KAFKA-18379-new
frankvicky Mar 23, 2025
b840c6d
Merge branch 'trunk' into KAFKA-18379-new
frankvicky Mar 24, 2025
bb450af
Merge branch 'trunk' into KAFKA-18379-new
frankvicky Mar 25, 2025
0e4b759
Merge branch 'trunk' into KAFKA-18379-new
frankvicky Mar 26, 2025
0f272cb
Merge branch 'trunk' into KAFKA-18379-new
frankvicky Mar 27, 2025
afe9e72
Merge branch 'trunk' into KAFKA-18379-new
frankvicky Mar 29, 2025
96df25d
Merge branch 'trunk' into KAFKA-18379-new
frankvicky Mar 30, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 9 additions & 1 deletion raft/src/main/java/org/apache/kafka/raft/QuorumState.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -382,7 +382,7 @@ public void transitionToResigned(List<ReplicaKey> preferredSuccessors) {
*/
public void transitionToUnattached(int epoch, OptionalInt leaderId) {
int currentEpoch = state.epoch();
if (epoch < currentEpoch || (epoch == currentEpoch && !isProspective())) {
if (epoch < currentEpoch || (epoch == currentEpoch && (!isProspective() || isResigned()))) {
throw new IllegalStateException(
String.format(
"Cannot transition to Unattached with epoch %d from current state %s",
Expand Down Expand Up @@ -576,6 +576,14 @@ public void transitionToFollower(int epoch, int leaderId, Endpoints endpoints) {
state
)
);
} else if (isResigned()) {
throw new IllegalStateException(
String.format(
"Cannot transition to Follower within same epoch %s from state %s",
epoch,
state
)
);
}
}

Expand Down
4 changes: 1 addition & 3 deletions raft/src/test/java/org/apache/kafka/raft/QuorumStateTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2505,7 +2505,6 @@ public void testLeaderToAnyStateLowerEpoch(KRaftVersion kraftVersion) {
/**
* Test transitions from Resigned
*/
// KAFKA-18379 to fill in the rest of the cases
@ParameterizedTest
@EnumSource(value = KRaftVersion.class)
public void testResignedToFollowerInSameEpoch(KRaftVersion kraftVersion) {
Expand All @@ -2519,8 +2518,7 @@ public void testResignedToFollowerInSameEpoch(KRaftVersion kraftVersion) {
state.initialize(new OffsetAndEpoch(0L, logEndEpoch));
assertTrue(state.isResigned());
assertThrows(IllegalStateException.class, () -> state.transitionToFollower(epoch, localId, voters.listeners(localId)));
// KAFKA-18379 will fix this
state.transitionToFollower(epoch, node1, voters.listeners(node1));
assertThrows(IllegalStateException.class, () -> state.transitionToFollower(epoch, node1, voters.listeners(node1)));
}

@ParameterizedTest
Expand Down