Skip to content

fix(inkless:switch): bump leader epoch on classic-to-diskless switch #626

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

Merged
viktorsomogyi merged 1 commit into from
Jun 3, 2026
Merged

fix(inkless:switch): bump leader epoch on classic-to-diskless switch #626

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 6 additions & 1 deletion metadata/src/main/java/org/apache/kafka/controller/ReplicationControlManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2990,9 +2990,14 @@ List<ApiMessageAndVersion> markClassicToDisklessSwitchStarted(
for (Entry<Integer, PartitionRegistration> partEntry : topicInfo.parts.entrySet()) {
PartitionRegistration partition = partEntry.getValue();
if (partition.classicToDisklessStartOffset == PartitionRegistration.NO_CLASSIC_TO_DISKLESS_START_OFFSET) {
if (partition.leader == NO_LEADER) {
log.warn("Partition {}-{} has no leader; classic-to-diskless switch will " +
"remain pending until a leader is elected", topicName, partEntry.getKey());
}
PartitionChangeRecord record = new PartitionChangeRecord()
.setTopicId(topicId)
.setPartitionId(partEntry.getKey());
.setPartitionId(partEntry.getKey())
.setLeader(partition.leader); // Force leader epoch bump to trigger makeLeader on broker
record.unknownTaggedFields().add(
InitDisklessLogFields.encodeClassicToDisklessStartOffset(
PartitionRegistration.CLASSIC_TO_DISKLESS_SWITCH_PENDING));
Expand Down
11 changes: 11 additions & 0 deletions metadata/src/test/java/org/apache/kafka/controller/ReplicationControlManagerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6524,13 +6524,24 @@ public void testMarkClassicToDisklessSwitchStartedSuccess() {
assertEquals(topicId, record.topicId());
assertEquals(PartitionRegistration.CLASSIC_TO_DISKLESS_SWITCH_PENDING,
InitDisklessLogFields.decodeClassicToDisklessStartOffset(record.unknownTaggedFields()));
// Leader must be set to force epoch bump on broker
int partitionId = record.partitionId();
int expectedLeader = replicationControl.getPartition(topicId, partitionId).leader;
assertEquals(expectedLeader, record.leader());
}

int[] epochsBefore = new int[2];
for (int i = 0; i < 2; i++) {
epochsBefore[i] = replicationControl.getPartition(topicId, i).leaderEpoch;
}

ctx.replay(records);
for (int i = 0; i < 2; i++) {
PartitionRegistration partition = replicationControl.getPartition(topicId, i);
assertEquals(PartitionRegistration.CLASSIC_TO_DISKLESS_SWITCH_PENDING,
partition.classicToDisklessStartOffset);
// Leader epoch must be bumped to trigger makeLeader on broker
assertEquals(epochsBefore[i] + 1, partition.leaderEpoch);
}
}

Expand Down
Loading