KAFKA-19624: Improve consistency of command-line arguments for consumer performance tests (#20385)

resolves https://issues.apache.org/jira/browse/KAFKA-19624

Reviewers: @brandboat, @AndrewJSchofield, @m1a2st

Author: aheev

tests/kafkatest/services/performance/consumer_performance.py

@@ -40,7 +40,7 @@ class ConsumerPerformanceService(PerformanceService):
         "socket-buffer-size", "The size of the tcp RECV size."
 
         "new-consumer", "Use the new consumer implementation."
-        "consumer.config", "Consumer config properties file."
+        "command-config", "Config properties file."
     """
 
     # Root directory for persistent output
@@ -83,10 +83,14 @@ def __init__(self, context, num_nodes, kafka, topic, messages, version=DEV_BRANC
     def args(self, version):
         """Dictionary of arguments used to start the Consumer Performance script."""
         args = {
-            'topic': self.topic,
-            'messages': self.messages
+            'topic': self.topic
         }
 
+        if version.supports_command_config():
+            args['num-records'] = self.messages
+        else:
+            args['messages'] = self.messages
+
         if version < V_2_5_0:
             args['broker-list'] = self.kafka.bootstrap_servers(self.security_config.security_protocol)
         else:
@@ -115,7 +119,10 @@ def start_cmd(self, node):
         for key, value in self.args(node.version).items():
             cmd += " --%s %s" % (key, value)
 
-        cmd += " --consumer.config %s" % ConsumerPerformanceService.CONFIG_FILE
+        if node.version.supports_command_config():
+            cmd += " --command-config %s" % ConsumerPerformanceService.CONFIG_FILE
+        else:
+            cmd += " --consumer.config %s" % ConsumerPerformanceService.CONFIG_FILE
 
         for key, value in self.settings.items():
             cmd += " %s=%s" % (str(key), str(value))

tests/kafkatest/services/performance/share_consumer_performance.py

@@ -33,7 +33,7 @@ class ShareConsumerPerformanceService(PerformanceService):
 
         "socket-buffer-size", "The size of the tcp RECV size."
 
-        "consumer.config", "Consumer config properties file."
+        "command-config", "Config properties file."
     """
 
     # Root directory for persistent output
@@ -73,16 +73,20 @@ def __init__(self, context, num_nodes, kafka, topic, messages, group="perf-share
         for node in self.nodes:
             node.version = version
 
-    def args(self):
+    def args(self, version):
         """Dictionary of arguments used to start the Share Consumer Performance script."""
         args = {
             'topic': self.topic,
-            'messages': self.messages,
             'bootstrap-server': self.kafka.bootstrap_servers(self.security_config.security_protocol),
             'group': self.group,
             'timeout': self.timeout
         }
 
+        if version.supports_command_config():
+            args['num-records'] = self.messages
+        else:
+            args['messages'] = self.messages
+
         if self.fetch_size is not None:
             args['fetch-size'] = self.fetch_size
 
@@ -97,10 +101,13 @@ def start_cmd(self, node):
         cmd += " export KAFKA_OPTS=%s;" % self.security_config.kafka_opts
         cmd += " export KAFKA_LOG4J_OPTS=\"%s%s\";" % (get_log4j_config_param(node), get_log4j_config_for_tools(node))
         cmd += " %s" % self.path.script("kafka-share-consumer-perf-test.sh", node)
-        for key, value in self.args().items():
+        for key, value in self.args(node.version).items():
             cmd += " --%s %s" % (key, value)
 
-        cmd += " --consumer.config %s" % ShareConsumerPerformanceService.CONFIG_FILE
+        if node.version.supports_command_config():
+            cmd += " --command-config %s" % ShareConsumerPerformanceService.CONFIG_FILE
+        else:
+            cmd += " --consumer.config %s" % ShareConsumerPerformanceService.CONFIG_FILE
 
         for key, value in self.settings.items():
             cmd += " %s=%s" % (str(key), str(value))