KAFKA-19624: Improving consistency of command-line arguments for consumer performance tests

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))
@@ -133,11 +140,14 @@ def _worker(self, idx, node):
         self.security_config.setup_node(node)
 
         cmd = self.start_cmd(node)
-        self.logger.debug("Consumer performance %d command: %s", idx, cmd)
+        self.logger.error("Consumer performance %d command: %s", idx, cmd)
         last = None
         for line in node.account.ssh_capture(cmd):
+            self.logger.error("Consumer performance %d: %s", idx, line)
             last = line
 
+        self.logger.error("Consumer performance %d last line: %s", idx, last)
+
         # Parse and save the last line's information
         if last is not None:
             parts = last.split(',')

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
@@ -100,7 +100,7 @@ def start_cmd(self, node):
         for key, value in self.args().items():
             cmd += " --%s %s" % (key, value)
 
-        cmd += " --consumer.config %s" % ShareConsumerPerformanceService.CONFIG_FILE
+        cmd += " --command-config %s" % ShareConsumerPerformanceService.CONFIG_FILE
 
         for key, value in self.settings.items():
             cmd += " %s=%s" % (str(key), str(value))