Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

KAFKA-17625: Removing explicit ZK test parameterizations #17638

Merged
merged 4 commits into from
Nov 4, 2024
Merged

KAFKA-17625: Removing explicit ZK test parameterizations #17638

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
25ef7ea
removing explicit ZK test parameterizations
kevin-wu24 Oct 30, 2024
e5c3d06
cleanup
kevin-wu24 Oct 30, 2024
296031f
changing vagrant to jdk11 for test run
kevin-wu24 Nov 3, 2024
3ff0ae2
Revert "changing vagrant to jdk11 for test run"
kevin-wu24 Nov 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions tests/kafkatest/services/kafka/quorum.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,8 @@
# How we will parameterize tests that exercise all KRaft quorum styles
all_kraft = [isolated_kraft, combined_kraft]
# How we will parameterize tests that are unrelated to upgrades:
# [“ZK”] before the KIP-500 bridge release(s)
# [“ZK”, “ISOLATED_KRAFT”] during the KIP-500 bridge release(s) and in preview releases
# [“ISOLATED_KRAFT”] after the KIP-500 bridge release(s)
all_non_upgrade = [zk, isolated_kraft]
all_non_upgrade = [isolated_kraft]

def for_test(test_context):
# A test uses ZooKeeper if it doesn't specify a metadata quorum or if it explicitly specifies ZooKeeper
Expand Down
4 changes: 0 additions & 4 deletions tests/kafkatest/tests/client/consumer_rolling_upgrade_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,10 +48,6 @@ def _verify_roundrobin_assignment(self, consumer):
"Mismatched assignment: %s" % assignment

@cluster(num_nodes=4)
@matrix(
metadata_quorum=[quorum.zk],
use_new_coordinator=[False]
)
@matrix(
metadata_quorum=[quorum.isolated_kraft],
use_new_coordinator=[True, False]
Expand Down
22 changes: 8 additions & 14 deletions tests/kafkatest/tests/client/consumer_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ def setup_consumer(self, topic, **kwargs):

@cluster(num_nodes=7)
@matrix(
metadata_quorum=[quorum.zk, quorum.isolated_kraft],
metadata_quorum=[quorum.isolated_kraft],
use_new_coordinator=[False]
)
@matrix(
Expand Down Expand Up @@ -138,7 +138,7 @@ def test_broker_rolling_bounce(self, metadata_quorum=quorum.zk, use_new_coordina
@matrix(
clean_shutdown=[True],
bounce_mode=["all", "rolling"],
metadata_quorum=[quorum.zk, quorum.isolated_kraft],
metadata_quorum=[quorum.isolated_kraft],
use_new_coordinator=[False]
)
@matrix(
Expand Down Expand Up @@ -195,7 +195,7 @@ def test_consumer_bounce(self, clean_shutdown, bounce_mode, metadata_quorum=quor
static_membership=[True, False],
bounce_mode=["all", "rolling"],
num_bounces=[5],
metadata_quorum=[quorum.zk, quorum.isolated_kraft],
metadata_quorum=[quorum.isolated_kraft],
use_new_coordinator=[False]
)
@matrix(
Expand Down Expand Up @@ -272,7 +272,7 @@ def test_static_consumer_bounce_with_eager_assignment(self, clean_shutdown, stat
@cluster(num_nodes=7)
@matrix(
bounce_mode=["all", "rolling"],
metadata_quorum=[quorum.zk, quorum.isolated_kraft],
metadata_quorum=[quorum.isolated_kraft],
use_new_coordinator=[False]
)
@matrix(
Expand Down Expand Up @@ -314,7 +314,7 @@ def test_static_consumer_persisted_after_rejoin(self, bounce_mode, metadata_quor
@matrix(
num_conflict_consumers=[1, 2],
fencing_stage=["stable", "all"],
metadata_quorum=[quorum.zk, quorum.isolated_kraft],
metadata_quorum=[quorum.isolated_kraft],
use_new_coordinator=[False]
)
@matrix(
Expand Down Expand Up @@ -399,7 +399,7 @@ def test_fencing_static_consumer(self, num_conflict_consumers, fencing_stage, me
@matrix(
clean_shutdown=[True],
enable_autocommit=[True, False],
metadata_quorum=[quorum.zk, quorum.isolated_kraft],
metadata_quorum=[quorum.isolated_kraft],
use_new_coordinator=[False]
)
@matrix(
Expand Down Expand Up @@ -454,12 +454,6 @@ def test_consumer_failure(self, clean_shutdown, enable_autocommit, metadata_quor
(consumer.last_commit(partition), consumer.current_position(partition))

@cluster(num_nodes=7)
@matrix(
clean_shutdown=[True, False],
enable_autocommit=[True, False],
metadata_quorum=[quorum.zk],
use_new_coordinator=[False]
)
@matrix(
clean_shutdown=[True, False],
enable_autocommit=[True, False],
Expand Down Expand Up @@ -511,7 +505,7 @@ def test_broker_failure(self, clean_shutdown, enable_autocommit, metadata_quorum

@cluster(num_nodes=7)
@matrix(
metadata_quorum=[quorum.zk, quorum.isolated_kraft],
metadata_quorum=[quorum.isolated_kraft],
use_new_coordinator=[False]
)
@matrix(
Expand Down Expand Up @@ -574,7 +568,7 @@ def __init__(self, test_context):
"org.apache.kafka.clients.consumer.RoundRobinAssignor",
"org.apache.kafka.clients.consumer.StickyAssignor",
"org.apache.kafka.clients.consumer.CooperativeStickyAssignor"],
metadata_quorum=[quorum.zk, quorum.isolated_kraft],
metadata_quorum=[quorum.isolated_kraft],
use_new_coordinator=[False]
)
@matrix(
Expand Down
106 changes: 0 additions & 106 deletions tests/kafkatest/tests/client/message_format_change_test.py
View file
Open in desktop

This file was deleted.

34 changes: 8 additions & 26 deletions tests/kafkatest/tests/connect/connect_distributed_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,7 +175,7 @@ def task_is_running(self, connector, task_id, node=None):
@matrix(
exactly_once_source=[True, False],
connect_protocol=['sessioned', 'compatible', 'eager'],
metadata_quorum=[quorum.zk, quorum.isolated_kraft],
metadata_quorum=[quorum.isolated_kraft],
use_new_coordinator=[False]
)
@matrix(
Expand Down Expand Up @@ -210,7 +210,7 @@ def test_restart_failed_connector(self, exactly_once_source, connect_protocol, m
@matrix(
connector_type=['source', 'exactly-once source', 'sink'],
connect_protocol=['sessioned', 'compatible', 'eager'],
metadata_quorum=[quorum.zk, quorum.isolated_kraft],
metadata_quorum=[quorum.isolated_kraft],
use_new_coordinator=[False]
)
@matrix(
Expand Down Expand Up @@ -247,7 +247,7 @@ def test_restart_failed_task(self, connector_type, connect_protocol, metadata_qu
@cluster(num_nodes=5)
@matrix(
connect_protocol=['sessioned', 'compatible', 'eager'],
metadata_quorum=[quorum.zk, quorum.isolated_kraft],
metadata_quorum=[quorum.isolated_kraft],
use_new_coordinator=[False]
)
@matrix(
Expand Down Expand Up @@ -277,7 +277,7 @@ def test_restart_connector_and_tasks_failed_connector(self, connect_protocol, me
@matrix(
connector_type=['source', 'sink'],
connect_protocol=['sessioned', 'compatible', 'eager'],
metadata_quorum=[quorum.zk, quorum.isolated_kraft],
metadata_quorum=[quorum.isolated_kraft],
use_new_coordinator=[False]
)
@matrix(
Expand Down Expand Up @@ -311,12 +311,6 @@ def test_restart_connector_and_tasks_failed_task(self, connector_type, connect_p
err_msg="Failed to see task transition to the RUNNING state")

@cluster(num_nodes=5)
@matrix(
exactly_once_source=[True, False],
connect_protocol=['sessioned', 'compatible', 'eager'],
metadata_quorum=[quorum.zk],
use_new_coordinator=[False]
)
@matrix(
exactly_once_source=[True, False],
connect_protocol=['sessioned', 'compatible', 'eager'],
Expand Down Expand Up @@ -366,7 +360,7 @@ def test_pause_and_resume_source(self, exactly_once_source, connect_protocol, me
@cluster(num_nodes=5)
@matrix(
connect_protocol=['sessioned', 'compatible', 'eager'],
metadata_quorum=[quorum.zk, quorum.isolated_kraft],
metadata_quorum=[quorum.isolated_kraft],
use_new_coordinator=[False]
)
@matrix(
Expand Down Expand Up @@ -422,12 +416,6 @@ def test_pause_and_resume_sink(self, connect_protocol, metadata_quorum, use_new_
err_msg="Failed to consume messages after resuming sink connector")

@cluster(num_nodes=5)
@matrix(
exactly_once_source=[True, False],
connect_protocol=['sessioned', 'compatible', 'eager'],
metadata_quorum=[quorum.zk],
use_new_coordinator=[False]
)
@matrix(
exactly_once_source=[True, False],
connect_protocol=['sessioned', 'compatible', 'eager'],
Expand Down Expand Up @@ -643,7 +631,7 @@ def _wait_for_loggers(self, level, request_time, namespace, workers=None):
security_protocol=[SecurityConfig.PLAINTEXT, SecurityConfig.SASL_SSL],
exactly_once_source=[True, False],
connect_protocol=['sessioned', 'compatible', 'eager'],
metadata_quorum=[quorum.zk, quorum.isolated_kraft],
metadata_quorum=[quorum.isolated_kraft],
use_new_coordinator=[False]
)
@matrix(
Expand Down Expand Up @@ -693,7 +681,7 @@ def test_file_source_and_sink(self, security_protocol, exactly_once_source, conn
@matrix(
clean=[True, False],
connect_protocol=['sessioned', 'compatible', 'eager'],
metadata_quorum=[quorum.zk, quorum.isolated_kraft],
metadata_quorum=[quorum.isolated_kraft],
use_new_coordinator=[False]
)
@matrix(
Expand Down Expand Up @@ -823,12 +811,6 @@ def test_bounce(self, clean, connect_protocol, metadata_quorum, use_new_coordina
assert success, "Found validation errors:\n" + "\n ".join(errors)

@cluster(num_nodes=7)
@matrix(
clean=[True, False],
connect_protocol=['sessioned', 'compatible', 'eager'],
metadata_quorum=[quorum.zk],
use_new_coordinator=[False]
)
@matrix(
clean=[True, False],
connect_protocol=['sessioned', 'compatible', 'eager'],
Expand Down Expand Up @@ -933,7 +915,7 @@ def test_exactly_once_source(self, clean, connect_protocol, metadata_quorum, use
@cluster(num_nodes=6)
@matrix(
connect_protocol=['sessioned', 'compatible', 'eager'],
metadata_quorum=[quorum.zk, quorum.isolated_kraft],
metadata_quorum=[quorum.isolated_kraft],
use_new_coordinator=[False]
)
@matrix(
Expand Down
2 changes: 0 additions & 2 deletions tests/kafkatest/tests/connect/connect_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,10 +138,8 @@ def validate_output(self, value):
return False

@cluster(num_nodes=5)
@parametrize(error_tolerance=ErrorTolerance.ALL, metadata_quorum=quorum.zk)
@parametrize(error_tolerance=ErrorTolerance.NONE, metadata_quorum=quorum.isolated_kraft)
@parametrize(error_tolerance=ErrorTolerance.ALL, metadata_quorum=quorum.isolated_kraft)
@parametrize(error_tolerance=ErrorTolerance.NONE, metadata_quorum=quorum.zk)
def test_skip_and_log_to_dlq(self, error_tolerance, metadata_quorum):
self.kafka = KafkaService(self.test_context, self.num_brokers, self.zk, topics=self.topics)

Expand Down
Loading
Loading