Skip to content

Commit a628d9b

Browse files
m1a2stm1a2st
authored
KAFKA-18365 Remove zookeeper.connect in Test (apache#18353)
Reviewers: TaiJuWu <[email protected]>, PoAn Yang <[email protected]>, Chia-Ping Tsai <[email protected]>
1 parent 409a43e commit a628d9b

File tree

4 files changed

+35
-35
lines changed

4 files changed

+35
-35
lines changed

‎core/src/test/scala/unit/kafka/KafkaConfigTest.scala

Lines changed: 15 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ import org.apache.kafka.common.internals.FatalExitError
2929
import org.apache.kafka.common.utils.Exit
3030
import org.apache.kafka.network.SocketServerConfigs
3131
import org.apache.kafka.raft.QuorumConfig
32-
import org.apache.kafka.server.config.{KRaftConfigs, ReplicationConfigs, ZkConfigs}
32+
import org.apache.kafka.server.config.{KRaftConfigs, ReplicationConfigs}
3333
import org.junit.jupiter.api.{AfterEach, BeforeEach, Test}
3434
import org.junit.jupiter.api.Assertions._
3535

@@ -47,20 +47,20 @@ class KafkaConfigTest {
4747

4848
// We should load configuration file without any arguments
4949
val config1 = KafkaConfig.fromProps(Kafka.getPropsFromArgs(Array(propertiesFile)))
50-
assertEquals(1, config1.brokerId)
50+
assertEquals(1, config1.nodeId)
5151

5252
// We should be able to override given property on command line
53-
val config2 = KafkaConfig.fromProps(Kafka.getPropsFromArgs(Array(propertiesFile, "--override", "broker.id=2")))
54-
assertEquals(2, config2.brokerId)
53+
val config2 = KafkaConfig.fromProps(Kafka.getPropsFromArgs(Array(propertiesFile, "--override", "node.id=2")))
54+
assertEquals(2, config2.nodeId)
5555

5656
// We should be also able to set completely new property
5757
val config3 = KafkaConfig.fromProps(Kafka.getPropsFromArgs(Array(propertiesFile, "--override", "log.cleanup.policy=compact")))
58-
assertEquals(1, config3.brokerId)
58+
assertEquals(1, config3.nodeId)
5959
assertEquals(util.Arrays.asList("compact"), config3.logCleanupPolicy)
6060

6161
// We should be also able to set several properties
62-
val config4 = KafkaConfig.fromProps(Kafka.getPropsFromArgs(Array(propertiesFile, "--override", "log.cleanup.policy=compact,delete", "--override", "broker.id=2")))
63-
assertEquals(2, config4.brokerId)
62+
val config4 = KafkaConfig.fromProps(Kafka.getPropsFromArgs(Array(propertiesFile, "--override", "log.cleanup.policy=compact,delete", "--override", "node.id=2")))
63+
assertEquals(2, config4.nodeId)
6464
assertEquals(util.Arrays.asList("compact","delete"), config4.logCleanupPolicy)
6565
}
6666

@@ -155,16 +155,6 @@ class KafkaConfigTest {
155155
|must contain the set of bootstrap controllers or controller.quorum.voters must contain a
156156
|parseable set of controllers.""".stripMargin.replace("\n", " ")
157157
)
158-
159-
// Ensure that if neither process.roles nor controller.quorum.voters is populated, then an exception is thrown if zookeeper.connect is not defined
160-
propertiesFile.setProperty(KRaftConfigs.PROCESS_ROLES_CONFIG, "")
161-
assertBadConfigContainingMessage(propertiesFile,
162-
"Missing required configuration `zookeeper.connect` which has no default value.")
163-
164-
// Ensure that no exception is thrown once zookeeper.connect is defined (and we clear controller.listener.names)
165-
propertiesFile.setProperty(ZkConfigs.ZK_CONNECT_CONFIG, "localhost:2181")
166-
propertiesFile.setProperty(KRaftConfigs.CONTROLLER_LISTENER_NAMES_CONFIG, "")
167-
KafkaConfig.fromProps(propertiesFile)
168158
}
169159

170160
private def setListenerProps(props: Properties): Unit = {
@@ -244,7 +234,14 @@ class KafkaConfigTest {
244234
}
245235

246236
def prepareDefaultConfig(): String = {
247-
prepareConfig(Array("broker.id=1", "zookeeper.connect=somewhere"))
237+
prepareConfig(Array(
238+
"node.id=1",
239+
"process.roles=controller",
240+
"controller.listener.names=CONTROLLER",
241+
"controller.quorum.voters=1@localhost:9093,2@localhost:9093",
242+
"listeners=CONTROLLER://:9093",
243+
"advertised.listeners=CONTROLLER://127.0.0.1:9093"
244+
))
248245
}
249246

250247
def prepareConfig(lines : Array[String]): String = {

‎core/src/test/scala/unit/kafka/log/UnifiedLogTest.scala

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ import org.apache.kafka.common.record._
3333
import org.apache.kafka.common.requests.{ListOffsetsRequest, ListOffsetsResponse}
3434
import org.apache.kafka.common.utils.{BufferSupplier, Time, Utils}
3535
import org.apache.kafka.coordinator.transaction.TransactionLogConfig
36+
import org.apache.kafka.server.config.KRaftConfigs
3637
import org.apache.kafka.server.log.remote.metadata.storage.TopicBasedRemoteLogMetadataManagerConfig
3738
import org.apache.kafka.server.log.remote.storage.{NoOpRemoteLogMetadataManager, NoOpRemoteStorageManager, RemoteLogManagerConfig}
3839
import org.apache.kafka.server.metrics.KafkaYammerMetrics
@@ -2270,7 +2271,12 @@ class UnifiedLogTest {
22702271

22712272
private def createKafkaConfigWithRLM: KafkaConfig = {
22722273
val props = new Properties()
2273-
props.put("zookeeper.connect", "test")
2274+
props.setProperty(KRaftConfigs.PROCESS_ROLES_CONFIG, "controller")
2275+
props.setProperty(KRaftConfigs.NODE_ID_CONFIG, "0")
2276+
props.setProperty(KRaftConfigs.CONTROLLER_LISTENER_NAMES_CONFIG, "CONTROLLER")
2277+
props.setProperty("controller.quorum.bootstrap.servers", "localhost:9093")
2278+
props.setProperty("listeners", "CONTROLLER://:9093")
2279+
props.setProperty("advertised.listeners", "CONTROLLER://127.0.0.1:9093")
22742280
props.put(RemoteLogManagerConfig.REMOTE_LOG_STORAGE_SYSTEM_ENABLE_PROP, "true")
22752281
props.put(RemoteLogManagerConfig.REMOTE_STORAGE_MANAGER_CLASS_NAME_PROP, classOf[NoOpRemoteStorageManager].getName)
22762282
props.put(RemoteLogManagerConfig.REMOTE_LOG_METADATA_MANAGER_CLASS_NAME_PROP, classOf[NoOpRemoteLogMetadataManager].getName)

‎core/src/test/scala/unit/kafka/server/ReplicaManagerTest.scala

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ import org.apache.kafka.metadata.LeaderConstants.NO_LEADER
5858
import org.apache.kafka.metadata.{LeaderAndIsr, LeaderRecoveryState}
5959
import org.apache.kafka.metadata.properties.{MetaProperties, MetaPropertiesEnsemble, MetaPropertiesVersion, PropertiesUtils}
6060
import org.apache.kafka.server.common.{DirectoryEventHandler, KRaftVersion, MetadataVersion, OffsetAndEpoch, RequestLocal, StopPartition}
61-
import org.apache.kafka.server.config.{ReplicationConfigs, ServerLogConfigs}
61+
import org.apache.kafka.server.config.{KRaftConfigs, ReplicationConfigs, ServerLogConfigs}
6262
import org.apache.kafka.server.log.remote.storage._
6363
import org.apache.kafka.server.metrics.{KafkaMetricsGroup, KafkaYammerMetrics}
6464
import org.apache.kafka.server.network.BrokerEndPoint
@@ -4101,7 +4101,12 @@ class ReplicaManagerTest {
41014101
val tidp0 = new TopicIdPartition(topicId, tp0)
41024102

41034103
val props = new Properties()
4104-
props.put("zookeeper.connect", "test")
4104+
props.setProperty(KRaftConfigs.PROCESS_ROLES_CONFIG, "controller")
4105+
props.setProperty(KRaftConfigs.NODE_ID_CONFIG, "0")
4106+
props.setProperty(KRaftConfigs.CONTROLLER_LISTENER_NAMES_CONFIG, "CONTROLLER")
4107+
props.setProperty("controller.quorum.bootstrap.servers", "localhost:9093")
4108+
props.setProperty("listeners", "CONTROLLER://:9093")
4109+
props.setProperty("advertised.listeners", "CONTROLLER://127.0.0.1:9093")
41054110
props.put(RemoteLogManagerConfig.REMOTE_LOG_STORAGE_SYSTEM_ENABLE_PROP, true.toString)
41064111
props.put(RemoteLogManagerConfig.REMOTE_STORAGE_MANAGER_CLASS_NAME_PROP, classOf[NoOpRemoteStorageManager].getName)
41074112
props.put(RemoteLogManagerConfig.REMOTE_LOG_METADATA_MANAGER_CLASS_NAME_PROP, classOf[NoOpRemoteLogMetadataManager].getName)
@@ -4209,7 +4214,12 @@ class ReplicaManagerTest {
42094214
val tidp0 = new TopicIdPartition(topicId, tp0)
42104215

42114216
val props = new Properties()
4212-
props.put("zookeeper.connect", "test")
4217+
props.setProperty("process.roles", "controller")
4218+
props.setProperty("node.id", "0")
4219+
props.setProperty("controller.listener.names", "CONTROLLER")
4220+
props.setProperty("controller.quorum.bootstrap.servers", "localhost:9093")
4221+
props.setProperty("listeners", "CONTROLLER://:9093")
4222+
props.setProperty("advertised.listeners", "CONTROLLER://127.0.0.1:9093")
42134223
props.put(RemoteLogManagerConfig.REMOTE_LOG_STORAGE_SYSTEM_ENABLE_PROP, true.toString)
42144224
props.put(RemoteLogManagerConfig.REMOTE_STORAGE_MANAGER_CLASS_NAME_PROP, classOf[NoOpRemoteStorageManager].getName)
42154225
props.put(RemoteLogManagerConfig.REMOTE_LOG_METADATA_MANAGER_CLASS_NAME_PROP, classOf[NoOpRemoteLogMetadataManager].getName)

‎core/src/test/scala/unit/kafka/tools/StorageToolTest.scala

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -294,19 +294,6 @@ Found problem:
294294
"Failed to find content in output: " + stream.toString())
295295
}
296296

297-
@Test
298-
def testFormatFailsInZkMode(): Unit = {
299-
val availableDirs = Seq(TestUtils.tempDir())
300-
val properties = new Properties()
301-
properties.setProperty("log.dirs", availableDirs.mkString(","))
302-
properties.setProperty("zookeeper.connect", "localhost:2181")
303-
val stream = new ByteArrayOutputStream()
304-
assertEquals("The kafka configuration file appears to be for a legacy cluster. " +
305-
"Formatting is only supported for clusters in KRaft mode.",
306-
assertThrows(classOf[TerseFailure],
307-
() => runFormatCommand(stream, properties)).getMessage)
308-
}
309-
310297
@Test
311298
def testFormatWithReleaseVersion(): Unit = {
312299
val availableDirs = Seq(TestUtils.tempDir())

0 commit comments

Comments
 (0)