From 803d8855183f29066a6174d7c4285b57fc9545df Mon Sep 17 00:00:00 2001 From: Curtis Wan Date: Fri, 1 Mar 2024 11:11:16 +0800 Subject: [PATCH 1/2] refactor(tests): show RemoteCommandError when starting kakfa Signed-off-by: Curtis Wan --- tests/kafkatest/services/kafka/kafka.py | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/tests/kafkatest/services/kafka/kafka.py b/tests/kafkatest/services/kafka/kafka.py index 89aeb0cfdc..89eb8791d3 100644 --- a/tests/kafkatest/services/kafka/kafka.py +++ b/tests/kafkatest/services/kafka/kafka.py @@ -612,6 +612,17 @@ def alive(self, node): return len(self.pids(node)) > 0 def start(self, add_principals="", nodes_to_skip=[], timeout_sec=60, **kwargs): + """ + Start the Kafka broker and wait until it registers its ID in ZooKeeper + Startup will be skipped for any nodes in nodes_to_skip. These nodes can be started later via add_broker + """ + try: + self.start0(add_principals=add_principals, nodes_to_skip=nodes_to_skip, timeout_sec=timeout_sec, **kwargs) + except RemoteCommandError as e: + self.logger.error("RemoteCommandError when starting Kafka service: %s", e) + raise + + def start0(self, add_principals="", nodes_to_skip=[], timeout_sec=60, **kwargs): """ Start the Kafka broker and wait until it registers its ID in ZooKeeper Startup will be skipped for any nodes in nodes_to_skip. These nodes can be started later via add_broker @@ -863,6 +874,7 @@ def start_node(self, node, timeout_sec=60, **kwargs): node.account.create_file(KafkaService.CONFIG_FILE, prop_file) node.account.create_file(self.LOG4J_CONFIG, self.render('log4j.properties', log_dir=KafkaService.OPERATIONAL_LOG_DIR)) if self.quorum_info.using_kraft: + node.account.ssh("feddd -h") # format log directories if necessary kafka_storage_script = self.path.script("kafka-storage.sh", node) cmd = "%s format --ignore-formatted --config %s --cluster-id %s" % (kafka_storage_script, KafkaService.CONFIG_FILE, config_property.CLUSTER_ID) From dff0851ce41a987d8173cb0788fc35718ca6a4ba Mon Sep 17 00:00:00 2001 From: Curtis Wan Date: Fri, 1 Mar 2024 11:12:22 +0800 Subject: [PATCH 2/2] remove testing codes Signed-off-by: Curtis Wan --- tests/kafkatest/services/kafka/kafka.py | 1 - 1 file changed, 1 deletion(-) diff --git a/tests/kafkatest/services/kafka/kafka.py b/tests/kafkatest/services/kafka/kafka.py index 89eb8791d3..39556b7d29 100644 --- a/tests/kafkatest/services/kafka/kafka.py +++ b/tests/kafkatest/services/kafka/kafka.py @@ -874,7 +874,6 @@ def start_node(self, node, timeout_sec=60, **kwargs): node.account.create_file(KafkaService.CONFIG_FILE, prop_file) node.account.create_file(self.LOG4J_CONFIG, self.render('log4j.properties', log_dir=KafkaService.OPERATIONAL_LOG_DIR)) if self.quorum_info.using_kraft: - node.account.ssh("feddd -h") # format log directories if necessary kafka_storage_script = self.path.script("kafka-storage.sh", node) cmd = "%s format --ignore-formatted --config %s --cluster-id %s" % (kafka_storage_script, KafkaService.CONFIG_FILE, config_property.CLUSTER_ID)