root
/
kafka
mirror of https://github.com/apache/kafka.git
1
0
Fork 0
Code Issues Actions 2 Packages Projects Releases Wiki Activity

use version.py get_version to get version (#18563) 

A prior commit introduced checking for the version of a node related to move to log4j2 but it was causing an error
AttributeError("'ClusterNode' object has no attribute 'version'") This PR uses the get_version method from version.py which checks if the Node has a version attribute preventing an error.

Reviewers: Matthias Sax <mjsax@apache.org>
This commit is contained in:
Bill Bejeck 2025-01-15 15:14:24 -05:00 committed by GitHub
parent 3f3bc90509
commit f4fca746cc
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
tests/kafkatest/tests/streams/streams_relational_smoke_test.py
View File

@ -22,6 +22,7 @@ from kafkatest.services.kafka.util import get_log4j_config_param, get_log4j_conf
from kafkatest.services.streams import StreamsTestBaseService from kafkatest.services.streams import StreamsTestBaseService
from kafkatest.tests.kafka_test import KafkaTest from kafkatest.tests.kafka_test import KafkaTest
from kafkatest.version import LATEST_4_0 from kafkatest.version import LATEST_4_0
from kafkatest.version import get_version
class StreamsRelationalSmokeTestService(StreamsTestBaseService): class StreamsRelationalSmokeTestService(StreamsTestBaseService):
@ -35,7 +36,7 @@ class StreamsRelationalSmokeTestService(StreamsTestBaseService):
self.mode = mode self.mode = mode
self.nodeId = nodeId self.nodeId = nodeId
self.processing_guarantee = processing_guarantee self.processing_guarantee = processing_guarantee
self.log4j_template = "log4j2_template.yaml" if (self.node.version >= LATEST_4_0) else "log4j_template.properties" self.log4j_template = "log4j2_template.yaml" if (get_version(self.node) >= LATEST_4_0) else "log4j_template.properties"
def start_cmd(self, node): def start_cmd(self, node):
return "( export KAFKA_LOG4J_OPTS=\"%(log4j_param)s%(log4j)s\"; " \ return "( export KAFKA_LOG4J_OPTS=\"%(log4j_param)s%(log4j)s\"; " \
@ -58,7 +59,7 @@ class StreamsRelationalSmokeTestService(StreamsTestBaseService):
def start_node(self, node): def start_node(self, node):
node.account.mkdirs(self.PERSISTENT_ROOT) node.account.mkdirs(self.PERSISTENT_ROOT)
node.account.create_file(get_log4j_config_for_tools(node), node.account.create_file(get_log4j_config_for_tools(node),
self.render("log4j2_template.yaml" if node.version >= LATEST_4_0 else "log4j_template.properties", self.render("log4j2_template.yaml" if get_version(node) >= LATEST_4_0 else "log4j_template.properties",
log_file=self.LOG_FILE)) log_file=self.LOG_FILE))
self.logger.info("Starting process on " + str(node.account)) self.logger.info("Starting process on " + str(node.account))