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

KAFKA-14580: Moving EndToEndLatency from core to tools module #13095

Merged
merged 16 commits into from
Mar 2, 2023
Merged

KAFKA-14580: Moving EndToEndLatency from core to tools module #13095

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
f7a6756
KAFKA-14580: Moving EndToEndLatency from core to tools module
Jan 9, 2023
2522f2b
further changes to make it running on local
Jan 12, 2023
4296ca2
Fixing checkstyles + adding unit tests
Jan 13, 2023
23dea55
Fixing checkstyle issues in tests
Jan 13, 2023
2ab9c41
Addressing review comments
Jan 14, 2023
b3d4299
Removing argparse4j related code changes
Jan 15, 2023
3865262
further review comments
Jan 16, 2023
341e310
Converting null to optional when no properties file is passed
Jan 17, 2023
0c02332
Removing unwanted topic creation statement
Jan 17, 2023
8577033
Review comments addressed
Jan 26, 2023
bd54ec0
Making usage of multine string concatentation using + consistent
Jan 26, 2023
e2811b1
updating path of EndToEndLatency in system tests
Jan 31, 2023
f72733e
Changing java_class_name based on kafka version
Feb 13, 2023
4e905a5
Fixing java_class_name
Feb 16, 2023
f63e1e5
Review comments addressed plus replacing EndToEndLAtency.scala with E…
Feb 20, 2023
a1ea6f5
Adding happy path testcase
Feb 23, 2023
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
1 change: 1 addition & 0 deletions checkstyle/import-control.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -408,6 +408,7 @@
<subpackage name="tools">
<allow pkg="org.apache.kafka.common"/>
<allow pkg="org.apache.kafka.server.util" />
<allow pkg="org.apache.kafka.clients" />
<allow pkg="org.apache.kafka.clients.admin" />
<allow pkg="org.apache.kafka.clients.producer" />
<allow pkg="org.apache.kafka.clients.consumer" />
Expand Down
179 changes: 0 additions & 179 deletions core/src/main/scala/kafka/tools/EndToEndLatency.scala
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion tests/kafkatest/benchmarks/core/benchmark_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,7 @@ def test_end_to_end_latency(self, compression_type="none", security_protocol="PL

Return aggregate latency statistics.

(Under the hood, this simply runs EndToEndLatency.scala)
(Under the hood, this simply runs EndToEndLatency.java)
"""
client_version = KafkaVersion(client_version)
broker_version = KafkaVersion(broker_version)
Expand Down
9 changes: 7 additions & 2 deletions tests/kafkatest/services/performance/end_to_end_latency.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@

from kafkatest.services.performance import PerformanceService
from kafkatest.services.security.security_config import SecurityConfig
from kafkatest.version import DEV_BRANCH
from kafkatest.version import get_version, V_3_4_0, DEV_BRANCH



Expand Down Expand Up @@ -50,6 +50,7 @@ def __init__(self, context, num_nodes, kafka, topic, num_records, compression_ty
root=EndToEndLatencyService.PERSISTENT_ROOT)
self.kafka = kafka
self.security_config = kafka.security_config.client_config()
self.version = ''

security_protocol = self.security_config.security_protocol

Expand All @@ -73,6 +74,7 @@ def __init__(self, context, num_nodes, kafka, topic, num_records, compression_ty

def start_cmd(self, node):
args = self.args.copy()
self.version = get_version(node)
args.update({
'bootstrap_servers': self.kafka.bootstrap_servers(self.security_config.security_protocol),
'config_file': EndToEndLatencyService.CONFIG_FILE,
Expand Down Expand Up @@ -124,4 +126,7 @@ def _worker(self, idx, node):
self.results[idx-1] = results

def java_class_name(self):
return "kafka.tools.EndToEndLatency"
if self.version <= V_3_4_0:
return "kafka.tools.EndToEndLatency"
else:
return "org.apache.kafka.tools.EndToEndLatency"
Loading