cmccabe commented on a change in pull request #10753:
URL: https://github.com/apache/kafka/pull/10753#discussion_r667726212
##########
File path:
metadata/src/main/java/org/apache/kafka/controller/ReplicationControlManager.java
##########
@@ -711,56 +830,73 @@ BrokersToIsrs brokersToIsrs() {
}
TopicControlInfo topic = topics.get(topicId);
for (AlterIsrRequestData.PartitionData partitionData :
topicData.partitions()) {
- PartitionControlInfo partition =
topic.parts.get(partitionData.partitionIndex());
+ int partitionId = partitionData.partitionIndex();
+ PartitionControlInfo partition = topic.parts.get(partitionId);
if (partition == null) {
responseTopicData.partitions().add(new
AlterIsrResponseData.PartitionData().
- setPartitionIndex(partitionData.partitionIndex()).
+ setPartitionIndex(partitionId).
setErrorCode(UNKNOWN_TOPIC_OR_PARTITION.code()));
continue;
}
if (request.brokerId() != partition.leader) {
responseTopicData.partitions().add(new
AlterIsrResponseData.PartitionData().
- setPartitionIndex(partitionData.partitionIndex()).
+ setPartitionIndex(partitionId).
setErrorCode(INVALID_REQUEST.code()));
continue;
}
if (partitionData.leaderEpoch() != partition.leaderEpoch) {
responseTopicData.partitions().add(new
AlterIsrResponseData.PartitionData().
- setPartitionIndex(partitionData.partitionIndex()).
- setErrorCode(Errors.FENCED_LEADER_EPOCH.code()));
+ setPartitionIndex(partitionId).
+ setErrorCode(FENCED_LEADER_EPOCH.code()));
continue;
}
if (partitionData.currentIsrVersion() !=
partition.partitionEpoch) {
responseTopicData.partitions().add(new
AlterIsrResponseData.PartitionData().
- setPartitionIndex(partitionData.partitionIndex()).
+ setPartitionIndex(partitionId).
setErrorCode(Errors.INVALID_UPDATE_VERSION.code()));
continue;
}
int[] newIsr = Replicas.toArray(partitionData.newIsr());
if (!Replicas.validateIsr(partition.replicas, newIsr)) {
responseTopicData.partitions().add(new
AlterIsrResponseData.PartitionData().
- setPartitionIndex(partitionData.partitionIndex()).
+ setPartitionIndex(partitionId).
setErrorCode(INVALID_REQUEST.code()));
continue;
}
if (!Replicas.contains(newIsr, partition.leader)) {
// An alterIsr request can't remove the current leader.
responseTopicData.partitions().add(new
AlterIsrResponseData.PartitionData().
- setPartitionIndex(partitionData.partitionIndex()).
+ setPartitionIndex(partitionId).
setErrorCode(INVALID_REQUEST.code()));
continue;
}
- records.add(new ApiMessageAndVersion(new
PartitionChangeRecord().
- setPartitionId(partitionData.partitionIndex()).
- setTopicId(topic.id).
- setIsr(partitionData.newIsr()), (short) 0));
- responseTopicData.partitions().add(new
AlterIsrResponseData.PartitionData().
- setPartitionIndex(partitionData.partitionIndex()).
- setErrorCode(Errors.NONE.code()).
- setLeaderId(partition.leader).
- setLeaderEpoch(partition.leaderEpoch).
- setCurrentIsrVersion(partition.partitionEpoch + 1).
- setIsr(partitionData.newIsr()));
+ PartitionChangeRecord record =
generateLeaderAndIsrUpdate(topic,
Review comment:
Yes, let's bump up the leader epoch here. Should be fixed now.
--
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]
