This is an automated email from the ASF dual-hosted git repository.
bbejeck pushed a commit to branch 4.0
in repository https://gitbox.apache.org/repos/asf/kafka.git
The following commit(s) were added to refs/heads/4.0 by this push:
new 54ff9711d8f use version.py get_version to get version (#18563)
54ff9711d8f is described below
commit 54ff9711d8f466fa10f0b1d0f915dbed0ac86f5c
Author: Bill Bejeck <bbej...@apache.org>
AuthorDate: Wed Jan 15 15:14:24 2025 -0500
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 <mj...@apache.org>
---
tests/kafkatest/tests/streams/streams_relational_smoke_test.py | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/tests/kafkatest/tests/streams/streams_relational_smoke_test.py
b/tests/kafkatest/tests/streams/streams_relational_smoke_test.py
index a879d95c418..c174948ef00 100644
--- a/tests/kafkatest/tests/streams/streams_relational_smoke_test.py
+++ b/tests/kafkatest/tests/streams/streams_relational_smoke_test.py
@@ -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.tests.kafka_test import KafkaTest
from kafkatest.version import LATEST_4_0
+from kafkatest.version import get_version
class StreamsRelationalSmokeTestService(StreamsTestBaseService):
@@ -35,7 +36,7 @@ class
StreamsRelationalSmokeTestService(StreamsTestBaseService):
self.mode = mode
self.nodeId = nodeId
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):
return "( export KAFKA_LOG4J_OPTS=\"%(log4j_param)s%(log4j)s\"; " \
@@ -58,7 +59,7 @@ class
StreamsRelationalSmokeTestService(StreamsTestBaseService):
def start_node(self, node):
node.account.mkdirs(self.PERSISTENT_ROOT)
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))
self.logger.info("Starting process on " + str(node.account))
