dengziming commented on a change in pull request #9769:
URL: https://github.com/apache/kafka/pull/9769#discussion_r563708864



##########
File path: 
core/src/test/scala/integration/kafka/server/MetadataRequestBetweenDifferentIbpTest.scala
##########
@@ -0,0 +1,117 @@
+/**
+  * Licensed to the Apache Software Foundation (ASF) under one or more
+  * contributor license agreements.  See the NOTICE file distributed with
+  * this work for additional information regarding copyright ownership.
+  * The ASF licenses this file to You under the Apache License, Version 2.0
+  * (the "License"); you may not use this file except in compliance with
+  * the License.  You may obtain a copy of the License at
+  *
+  *    http://www.apache.org/licenses/LICENSE-2.0
+  *
+  * Unless required by applicable law or agreed to in writing, software
+  * distributed under the License is distributed on an "AS IS" BASIS,
+  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  * See the License for the specific language governing permissions and
+  * limitations under the License.
+  */
+
+package integration.kafka.server
+
+import kafka.api.{ApiVersion, KAFKA_2_8_IV0, KAFKA_2_8_IV1}
+import kafka.network.SocketServer
+import kafka.server.{BaseRequestTest, KafkaConfig}
+import kafka.utils.TestUtils
+import org.apache.kafka.common.Uuid
+import org.apache.kafka.common.message.MetadataRequestData
+import org.apache.kafka.common.protocol.Errors
+import org.apache.kafka.common.requests.{MetadataRequest, MetadataResponse}
+import org.junit.jupiter.api.Assertions._
+import org.junit.jupiter.api.Test
+
+import scala.collection.{Map, Seq}
+
+class MetadataRequestBetweenDifferentIbpTest extends BaseRequestTest {
+
+  override def brokerCount: Int = 3
+  override def generateConfigs: Seq[KafkaConfig] = {
+    Seq(
+      createConfig(0, KAFKA_2_8_IV0),
+      createConfig(1, KAFKA_2_8_IV1)

Review comment:
       Firstly I add 2 brokers to ensure faster election after killing broker, 
now I added a broker since we need not kill broker to trigger election.

##########
File path: 
core/src/test/scala/integration/kafka/server/MetadataRequestBetweenDifferentIbpTest.scala
##########
@@ -0,0 +1,117 @@
+/**
+  * Licensed to the Apache Software Foundation (ASF) under one or more
+  * contributor license agreements.  See the NOTICE file distributed with
+  * this work for additional information regarding copyright ownership.
+  * The ASF licenses this file to You under the Apache License, Version 2.0
+  * (the "License"); you may not use this file except in compliance with
+  * the License.  You may obtain a copy of the License at
+  *
+  *    http://www.apache.org/licenses/LICENSE-2.0
+  *
+  * Unless required by applicable law or agreed to in writing, software
+  * distributed under the License is distributed on an "AS IS" BASIS,
+  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  * See the License for the specific language governing permissions and
+  * limitations under the License.
+  */
+
+package integration.kafka.server
+
+import kafka.api.{ApiVersion, KAFKA_2_8_IV0, KAFKA_2_8_IV1}
+import kafka.network.SocketServer
+import kafka.server.{BaseRequestTest, KafkaConfig}
+import kafka.utils.TestUtils
+import org.apache.kafka.common.Uuid
+import org.apache.kafka.common.message.MetadataRequestData
+import org.apache.kafka.common.protocol.Errors
+import org.apache.kafka.common.requests.{MetadataRequest, MetadataResponse}
+import org.junit.jupiter.api.Assertions._
+import org.junit.jupiter.api.Test
+
+import scala.collection.{Map, Seq}
+
+class MetadataRequestBetweenDifferentIbpTest extends BaseRequestTest {
+
+  override def brokerCount: Int = 3
+  override def generateConfigs: Seq[KafkaConfig] = {
+    Seq(
+      createConfig(0, KAFKA_2_8_IV0),
+      createConfig(1, KAFKA_2_8_IV1)

Review comment:
       Firstly I add 2 brokers to ensure faster election after killing the 
broker, now I added a broker since we need not kill broker to trigger election.

##########
File path: 
core/src/test/scala/integration/kafka/server/MetadataRequestBetweenDifferentIbpTest.scala
##########
@@ -0,0 +1,117 @@
+/**
+  * Licensed to the Apache Software Foundation (ASF) under one or more
+  * contributor license agreements.  See the NOTICE file distributed with
+  * this work for additional information regarding copyright ownership.
+  * The ASF licenses this file to You under the Apache License, Version 2.0
+  * (the "License"); you may not use this file except in compliance with
+  * the License.  You may obtain a copy of the License at
+  *
+  *    http://www.apache.org/licenses/LICENSE-2.0
+  *
+  * Unless required by applicable law or agreed to in writing, software
+  * distributed under the License is distributed on an "AS IS" BASIS,
+  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  * See the License for the specific language governing permissions and
+  * limitations under the License.
+  */
+
+package integration.kafka.server
+
+import kafka.api.{ApiVersion, KAFKA_2_8_IV0, KAFKA_2_8_IV1}
+import kafka.network.SocketServer
+import kafka.server.{BaseRequestTest, KafkaConfig}
+import kafka.utils.TestUtils
+import org.apache.kafka.common.Uuid
+import org.apache.kafka.common.message.MetadataRequestData
+import org.apache.kafka.common.protocol.Errors
+import org.apache.kafka.common.requests.{MetadataRequest, MetadataResponse}
+import org.junit.jupiter.api.Assertions._
+import org.junit.jupiter.api.Test
+
+import scala.collection.{Map, Seq}
+
+class MetadataRequestBetweenDifferentIbpTest extends BaseRequestTest {
+
+  override def brokerCount: Int = 3
+  override def generateConfigs: Seq[KafkaConfig] = {
+    Seq(
+      createConfig(0, KAFKA_2_8_IV0),
+      createConfig(1, KAFKA_2_8_IV1)
+    )
+  }
+
+  @Test
+  def testTopicIdUnsupported(): Unit = {
+
+    val topic = "topic"
+
+    // Ensure controller version = KAFKA_2_8_IV1, and then create a topic
+    ensureControllerIn(Seq(1))
+    createTopic(topic,  Map(0 -> Seq(1, 2, 0), 1 -> Seq(2, 0, 1)))
+
+    // We can get topicId from the controller
+    val resp1 = sendMetadataRequest(new MetadataRequest(requestData(topic, 
Uuid.ZERO_UUID), 10.toShort), brokerSocketServer(1))
+    val topicId = resp1.topicMetadata.iterator().next().topicId()
+    assertNotEquals(Uuid.ZERO_UUID, topicId)
+    assertNotNull(topicId)
+
+    // Send request to a broker whose version=KAFKA_2_8_IV0
+    val resp2 = sendMetadataRequest(new MetadataRequest(requestData(topic, 
topicId), 10.toShort), brokerSocketServer(0))
+    assertEquals(Errors.UNSUPPORTED_VERSION, 
resp2.topicMetadata.iterator().next().error())
+  }
+
+  @Test
+  def testUnknownTopicId(): Unit = {
+
+    val topic = "topic"
+
+    // Kill controller and restart until broker 2 become controller
+    ensureControllerIn(Seq(1))
+    createTopic(topic, Map(0 -> Seq(1, 2, 0), 1 -> Seq(2, 0, 1)))
+
+    val resp1 = sendMetadataRequest(new MetadataRequest(requestData(topic, 
Uuid.ZERO_UUID), 10.toShort), brokerSocketServer(1))
+    val topicId = resp1.topicMetadata.iterator().next().topicId()
+
+    // We could still get topic metadata by topicId
+    val topicMetadata = sendMetadataRequest(new 
MetadataRequest(requestData(null, topicId), 10.toShort), brokerSocketServer(1))
+      .topicMetadata.iterator().next()
+    assertEquals(topicId, topicMetadata.topicId())
+    assertEquals(topic, topicMetadata.topic())
+
+    // Make the broker whose version=KAFKA_2_8_IV0 controller
+    ensureControllerIn(Seq(0))
+
+    // Restart the broker whose version=KAFKA_2_8_IV1, and the controller will 
send metadata request to it
+    killBroker(1)
+    restartDeadBrokers()
+
+    // Send request to a broker whose version=KAFKA_2_8_IV1
+    val resp2 = sendMetadataRequest(new MetadataRequest(requestData(topic, 
topicId), 10.toShort), brokerSocketServer(1))
+    assertEquals(Errors.UNKNOWN_TOPIC_ID, 
resp2.topicMetadata.iterator().next().error())
+  }
+
+  private def ensureControllerIn(brokerIds: Seq[Int]): Unit = {
+    while (!brokerIds.contains(controllerSocketServer.config.brokerId)) {
+      killBroker(controllerSocketServer.config.brokerId)

Review comment:
       Good catch, updated.




----------------------------------------------------------------
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.

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org


Reply via email to