hachikuji commented on a change in pull request #11171: URL: https://github.com/apache/kafka/pull/11171#discussion_r683019148
########## File path: core/src/main/scala/kafka/log/Log.scala ########## @@ -553,6 +553,14 @@ class Log(@volatile var logStartOffset: Long, /** Only used for ZK clusters when we update and start using topic IDs on existing topics */ def assignTopicId(topicId: Uuid): Unit = { + // defensively check that any newly assign topic ID matches any that is already set + _topicId.foreach { current => + if (!current.equals(topicId)) Review comment: Can we shortcut return if the current topicId is already defined and matches the provided topicId? ########## File path: core/src/main/scala/kafka/log/Log.scala ########## @@ -553,6 +553,14 @@ class Log(@volatile var logStartOffset: Long, /** Only used for ZK clusters when we update and start using topic IDs on existing topics */ def assignTopicId(topicId: Uuid): Unit = { + // defensively check that any newly assign topic ID matches any that is already set + _topicId.foreach { current => + if (!current.equals(topicId)) + // we should never get here as the topic IDs should have been checked in becomeLeaderOrFollower Review comment: nit: fix alignment (just use braces 😉 . I won't tell anyone) -- 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