From 172140b9b7b6e960e06e605230ea922d0302616b Mon Sep 17 00:00:00 2001 From: Robin Han Date: Wed, 24 Jan 2024 16:50:45 +0800 Subject: [PATCH 1/2] fix(E2E): fix santiy check E2E Signed-off-by: Robin Han --- tests/kafkatest/sanity_checks/test_console_consumer.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/tests/kafkatest/sanity_checks/test_console_consumer.py b/tests/kafkatest/sanity_checks/test_console_consumer.py index 675920ade8..7a21bdca21 100644 --- a/tests/kafkatest/sanity_checks/test_console_consumer.py +++ b/tests/kafkatest/sanity_checks/test_console_consumer.py @@ -15,7 +15,7 @@ import time -from ducktape.mark import matrix +from ducktape.mark import matrix, ignore from ducktape.mark.resource import cluster from ducktape.tests.test import Test from ducktape.utils.util import wait_until @@ -47,7 +47,7 @@ def setUp(self): @matrix(security_protocol=['PLAINTEXT', 'SSL'], metadata_quorum=quorum.all_kraft) @cluster(num_nodes=4) @matrix(security_protocol=['SASL_SSL'], sasl_mechanism=['PLAIN'], metadata_quorum=quorum.all_kraft) - @matrix(security_protocol=['SASL_SSL'], sasl_mechanism=['SCRAM-SHA-256', 'SCRAM-SHA-512']) # SCRAM not yet supported with KRaft + # @matrix(security_protocol=['SASL_SSL'], sasl_mechanism=['SCRAM-SHA-256', 'SCRAM-SHA-512']) # SCRAM not yet supported with KRaft @matrix(security_protocol=['SASL_PLAINTEXT', 'SASL_SSL'], metadata_quorum=quorum.all_kraft) def test_lifecycle(self, security_protocol, sasl_mechanism='GSSAPI', metadata_quorum=quorum.zk): """Check that console consumer starts/stops properly, and that we are capturing log output.""" @@ -78,6 +78,7 @@ def test_lifecycle(self, security_protocol, sasl_mechanism='GSSAPI', metadata_qu self.consumer.stop_node(node) + @ignore # AutoMQ doesn't support ZK mode @cluster(num_nodes=4) def test_version(self): """Check that console consumer v0.8.2.X successfully starts and consumes messages.""" From bdeffcb529e8e4ee76d8e5bf7a306d47ab96aace Mon Sep 17 00:00:00 2001 From: Robin Han Date: Wed, 24 Jan 2024 17:03:13 +0800 Subject: [PATCH 2/2] fix(E2E): autobalancer config Signed-off-by: Robin Han --- .../kafkatest/services/kafka/templates/kafka.properties | 9 --------- 1 file changed, 9 deletions(-) diff --git a/tests/kafkatest/services/kafka/templates/kafka.properties b/tests/kafkatest/services/kafka/templates/kafka.properties index e213b4f09a..e2512b8f26 100644 --- a/tests/kafkatest/services/kafka/templates/kafka.properties +++ b/tests/kafkatest/services/kafka/templates/kafka.properties @@ -24,15 +24,6 @@ process.roles=controller autobalancer.controller.enable=true autobalancer.controller.anomaly.detect.interval.ms=60000 autobalancer.controller.metrics.delay.ms=20000 -autobalancer.controller.network.in.usage.distribution.detect.threshold=0.2 -autobalancer.controller.network.in.distribution.detect.avg.deviation=0.2 -autobalancer.controller.network.out.usage.distribution.detect.threshold=0.2 -autobalancer.controller.network.out.distribution.detect.avg.deviation=0.2 -autobalancer.controller.network.in.utilization.threshold=0.8 -autobalancer.controller.network.out.utilization.threshold=0.8 -autobalancer.controller.execution.interval.ms=100 -autobalancer.controller.load.aggregation=true -autobalancer.controller.exclude.topics=__consumer_offsets {% else %} process.roles=broker {% endif %}