This is an automated email from the ASF dual-hosted git repository.

kkarantasis pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/kafka.git


The following commit(s) were added to refs/heads/trunk by this push:
     new f7502f430a MINOR: fix Connect system test runs with JDK 10+ (#12202)
f7502f430a is described below

commit f7502f430aaf33bdfa0d9801254eba4fc078cbde
Author: Lucas Bradstreet <lucasbradstr...@gmail.com>
AuthorDate: Wed May 25 10:25:00 2022 -0700

    MINOR: fix Connect system test runs with JDK 10+ (#12202)
    
    When running our Connect system tests with JDK 10+, we hit the error
        AttributeError: 'ClusterNode' object has no attribute 'version'
    because util.py attempts to check the version variable for non-Kafka 
service objects.
    
    Reviewers: Konstantine Karantasis <k.karanta...@gmail.com>
---
 tests/kafkatest/services/kafka/util.py | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/tests/kafkatest/services/kafka/util.py 
b/tests/kafkatest/services/kafka/util.py
index 8782ebe7b4..de6b85ff3c 100644
--- a/tests/kafkatest/services/kafka/util.py
+++ b/tests/kafkatest/services/kafka/util.py
@@ -22,7 +22,6 @@ TopicPartition = namedtuple('TopicPartition', ['topic', 
'partition'])
 
 new_jdk_not_supported = frozenset([str(LATEST_0_8_2), str(LATEST_0_9), 
str(LATEST_0_10_0), str(LATEST_0_10_1), str(LATEST_0_10_2), str(LATEST_0_11_0), 
str(LATEST_1_0)])
 
-
 def fix_opts_for_new_jvm(node):
     # Startup scripts for early versions of Kafka contains options
     # that not supported on latest versions of JVM like -XX:+PrintGCDateStamps 
or -XX:UseParNewGC.
@@ -33,9 +32,11 @@ def fix_opts_for_new_jvm(node):
         return ""
 
     cmd = ""
-    if node.version == LATEST_0_8_2 or node.version == LATEST_0_9 or 
node.version == LATEST_0_10_0 or node.version == LATEST_0_10_1 or node.version 
== LATEST_0_10_2 or node.version == LATEST_0_11_0 or node.version == LATEST_1_0:
-        cmd += "export 
KAFKA_GC_LOG_OPTS=\"-Xlog:gc*:file=kafka-gc.log:time,tags:filecount=10,filesize=102400\";
 "
-        cmd += "export KAFKA_JVM_PERFORMANCE_OPTS=\"-server -XX:+UseG1GC 
-XX:MaxGCPauseMillis=20 -XX:InitiatingHeapOccupancyPercent=35 
-XX:+ExplicitGCInvokesConcurrent -XX:MaxInlineLevel=15 
-Djava.awt.headless=true\"; "
+    # check kafka version for kafka node types
+    if hasattr(node, 'version'):
+        if node.version == LATEST_0_8_2 or node.version == LATEST_0_9 or 
node.version == LATEST_0_10_0 or node.version == LATEST_0_10_1 or node.version 
== LATEST_0_10_2 or node.version == LATEST_0_11_0 or node.version == LATEST_1_0:
+            cmd += "export 
KAFKA_GC_LOG_OPTS=\"-Xlog:gc*:file=kafka-gc.log:time,tags:filecount=10,filesize=102400\";
 "
+            cmd += "export KAFKA_JVM_PERFORMANCE_OPTS=\"-server -XX:+UseG1GC 
-XX:MaxGCPauseMillis=20 -XX:InitiatingHeapOccupancyPercent=35 
-XX:+ExplicitGCInvokesConcurrent -XX:MaxInlineLevel=15 
-Djava.awt.headless=true\"; "
     return cmd
 
 

Reply via email to