diff --git a/core/src/main/scala/kafka/tools/newproducer/MirrorMaker.scala b/core/src/main/scala/kafka/tools/newproducer/MirrorMaker.scala index d23ef9a..d314337 100644 --- a/core/src/main/scala/kafka/tools/newproducer/MirrorMaker.scala +++ b/core/src/main/scala/kafka/tools/newproducer/MirrorMaker.scala @@ -21,7 +21,6 @@ import joptsimple.OptionParser import kafka.utils.{Utils, CommandLineUtils, Logging} import java.util.concurrent.CountDownLatch import kafka.consumer._ -import collection.mutable.ListBuffer import org.apache.kafka.clients.producer.{ProducerConfig, ProducerRecord, KafkaProducer} import java.util.concurrent.atomic.AtomicInteger @@ -87,7 +86,7 @@ object MirrorMaker extends Logging { producerProps.setProperty(ProducerConfig.BLOCK_ON_BUFFER_FULL_CONFIG, "true") val consumerConfig = options.valueOf(consumerConfigOpt) val numStreams = options.valueOf(numStreamsOpt) - producerChannel = new ProducerDataChannel() + producerChannel = new ProducerDataChannel(new KafkaProducer(producerProps)) connector = new ZookeeperConsumerConnector(new ConsumerConfig(Utils.loadProps(consumerConfig))) var streams: Seq[KafkaStream[Array[Byte], Array[Byte]]] = null try { @@ -100,7 +99,6 @@ object MirrorMaker extends Logging { System.exit(1) } val streamIndex = new AtomicInteger() - streams.foreach(stream => producerChannel.addProducer(new KafkaProducer(producerProps))) mirroringThreads = streams.map(stream => new MirrorMakerThread(stream, streamIndex.getAndIncrement)) Runtime.getRuntime.addShutdownHook(new Thread() { override def run() { @@ -155,29 +153,13 @@ object MirrorMaker extends Logging { } } - class ProducerDataChannel extends Logging { - val producers = new ListBuffer[KafkaProducer] - var producerIndex = new AtomicInteger(0) - - def addProducer(producer: KafkaProducer) { - producers += producer - } - + class ProducerDataChannel(private val producer: KafkaProducer) extends Logging { def send(producerRecord: ProducerRecord) { - if(producerRecord.key() != null) { - val producerId = Utils.abs(java.util.Arrays.hashCode(producerRecord.key())) % producers.size - trace("Send message with key %s to producer %d.".format(java.util.Arrays.toString(producerRecord.key()), producerId)) - val producer = producers(producerId) producer.send(producerRecord) - } else { - val producerId = producerIndex.getAndSet((producerIndex.get() + 1) % producers.size) - producers(producerId).send(producerRecord) - trace("Sent message to producer " + producerId) - } } def close() { - producers.foreach(_.close()) + producer.close() } } } diff --git a/perf/src/main/scala/kafka/perf/ProducerPerformance.scala b/perf/src/main/scala/kafka/perf/ProducerPerformance.scala index 5d399d9..9867f84 100644 --- a/perf/src/main/scala/kafka/perf/ProducerPerformance.scala +++ b/perf/src/main/scala/kafka/perf/ProducerPerformance.scala @@ -210,11 +210,15 @@ object ProducerPerformance extends Logging { props.put("client.id", "perf-test") props.put("request.required.acks", config.producerRequestRequiredAcks.toString) props.put("request.timeout.ms", config.producerRequestTimeoutMs.toString) + props.put("request.retries", config.producerNumRetries.toString) val producer = new KafkaProducer(props) def send(topic: String, partition: Long, bytes: Array[Byte]) { val part = partition % this.producer.partitionsFor(topic).size - this.producer.send(new ProducerRecord(topic, Utils.abs(part.toInt), null, bytes)) + val responseFuture = this.producer.send(new ProducerRecord(topic, Utils.abs(part.toInt), null, bytes)) + if (config.isSync) { + responseFuture.get() + } } def close() { @@ -290,11 +294,15 @@ object ProducerPerformance extends Logging { Thread.sleep(config.messageSendGapMs) }) } catch { - case e: Exception => error("Error sending messages", e) + case e: Throwable => error("Error when sending messages", e) } j += 1 } - producer.close() + try { + producer.close() + } catch { + case e: Throwable => error("Error when closing producer", e) + } totalBytesSent.addAndGet(bytesSent) totalMessagesSent.addAndGet(nSends) allDone.countDown() diff --git a/system_test/migration_tool_testsuite/migration_tool_test.py b/system_test/migration_tool_testsuite/migration_tool_test.py index ce6f4f6..2fecd19 100644 --- a/system_test/migration_tool_testsuite/migration_tool_test.py +++ b/system_test/migration_tool_testsuite/migration_tool_test.py @@ -247,6 +247,7 @@ class MigrationToolTest(ReplicationUtils, SetupUtils): str(self.testcaseEnv.userDefinedEnvVarDict["backgroundProducerStopped"]) + "]", extra=self.d) if self.testcaseEnv.userDefinedEnvVarDict["backgroundProducerStopped"]: time.sleep(1) + self.testcaseEnv.lock.release() self.logger.info("all producer threads completed", extra=self.d) break time.sleep(1) diff --git a/system_test/mirror_maker_testsuite/config/mirror_producer.properties b/system_test/mirror_maker_testsuite/config/mirror_producer.properties index b2bf2c2..4391bc8 100644 --- a/system_test/mirror_maker_testsuite/config/mirror_producer.properties +++ b/system_test/mirror_maker_testsuite/config/mirror_producer.properties @@ -1,6 +1,5 @@ -producer.type=async -queue.enqueue.timeout.ms=-1 +block.on.buffer.full=true metadata.broker.list=localhost:9094 compression.codec=0 -message.send.max.retries=3 +request.retries=3 request.required.acks=1 diff --git a/system_test/mirror_maker_testsuite/mirror_maker_test.py b/system_test/mirror_maker_testsuite/mirror_maker_test.py index dfffb4e..fd18088 100644 --- a/system_test/mirror_maker_testsuite/mirror_maker_test.py +++ b/system_test/mirror_maker_testsuite/mirror_maker_test.py @@ -248,6 +248,7 @@ class MirrorMakerTest(ReplicationUtils, SetupUtils): str(self.testcaseEnv.userDefinedEnvVarDict["backgroundProducerStopped"]) + "]", extra=self.d) if self.testcaseEnv.userDefinedEnvVarDict["backgroundProducerStopped"]: time.sleep(1) + self.testcaseEnv.lock.release() self.logger.info("all producer threads completed", extra=self.d) break time.sleep(1) diff --git a/system_test/mirror_maker_testsuite/testcase_5001/testcase_5001_properties.json b/system_test/mirror_maker_testsuite/testcase_5001/testcase_5001_properties.json index 287cab9..4a0da6e 100644 --- a/system_test/mirror_maker_testsuite/testcase_5001/testcase_5001_properties.json +++ b/system_test/mirror_maker_testsuite/testcase_5001/testcase_5001_properties.json @@ -119,6 +119,7 @@ { "entity_id": "10", + "new-producer":"true", "topic": "test_1", "threads": "5", "compression-codec": "0", @@ -141,6 +142,7 @@ { "entity_id": "12", + "new-producer":"true", "log_filename": "mirror_maker_12.log", "mirror_consumer_config_filename": "mirror_consumer_12.properties", "mirror_producer_config_filename": "mirror_producer_12.properties" diff --git a/system_test/mirror_maker_testsuite/testcase_5002/testcase_5002_properties.json b/system_test/mirror_maker_testsuite/testcase_5002/testcase_5002_properties.json index 5457eb1..d74e97d 100644 --- a/system_test/mirror_maker_testsuite/testcase_5002/testcase_5002_properties.json +++ b/system_test/mirror_maker_testsuite/testcase_5002/testcase_5002_properties.json @@ -119,6 +119,7 @@ { "entity_id": "10", + "new-producer":"true", "topic": "test_1", "threads": "5", "compression-codec": "0", @@ -141,6 +142,7 @@ { "entity_id": "12", + "new-producer":"true", "log_filename": "mirror_maker_12.log", "mirror_consumer_config_filename": "mirror_consumer_12.properties", "mirror_producer_config_filename": "mirror_producer_12.properties" diff --git a/system_test/mirror_maker_testsuite/testcase_5003/testcase_5003_properties.json b/system_test/mirror_maker_testsuite/testcase_5003/testcase_5003_properties.json index 98fefee..e33acf1 100644 --- a/system_test/mirror_maker_testsuite/testcase_5003/testcase_5003_properties.json +++ b/system_test/mirror_maker_testsuite/testcase_5003/testcase_5003_properties.json @@ -120,6 +120,7 @@ { "entity_id": "10", + "new-producer":"true", "topic": "test_1", "threads": "5", "compression-codec": "2", @@ -142,12 +143,14 @@ { "entity_id": "12", + "new-producer":"true", "log_filename": "mirror_maker_12.log", "mirror_consumer_config_filename": "mirror_consumer_12.properties", "mirror_producer_config_filename": "mirror_producer_12.properties" }, { "entity_id": "13", + "new-producer":"true", "log_filename": "mirror_maker_13.log", "mirror_consumer_config_filename": "mirror_consumer_13.properties", "mirror_producer_config_filename": "mirror_producer_13.properties" diff --git a/system_test/mirror_maker_testsuite/testcase_5004/testcase_5004_properties.json b/system_test/mirror_maker_testsuite/testcase_5004/testcase_5004_properties.json index 6067b12..5c39bcf 100644 --- a/system_test/mirror_maker_testsuite/testcase_5004/testcase_5004_properties.json +++ b/system_test/mirror_maker_testsuite/testcase_5004/testcase_5004_properties.json @@ -120,6 +120,7 @@ { "entity_id": "10", + "new-producer":"true", "topic": "test_1", "threads": "5", "compression-codec": "1", @@ -142,12 +143,14 @@ { "entity_id": "12", + "new-producer":"true", "log_filename": "mirror_maker_12.log", "mirror_consumer_config_filename": "mirror_consumer_12.properties", "mirror_producer_config_filename": "mirror_producer_12.properties" }, { "entity_id": "13", + "new-producer":"true", "log_filename": "mirror_maker_13.log", "mirror_consumer_config_filename": "mirror_consumer_13.properties", "mirror_producer_config_filename": "mirror_producer_13.properties" diff --git a/system_test/mirror_maker_testsuite/testcase_5005/testcase_5005_properties.json b/system_test/mirror_maker_testsuite/testcase_5005/testcase_5005_properties.json index 58483ad..697af65 100644 --- a/system_test/mirror_maker_testsuite/testcase_5005/testcase_5005_properties.json +++ b/system_test/mirror_maker_testsuite/testcase_5005/testcase_5005_properties.json @@ -120,6 +120,7 @@ { "entity_id": "10", + "new-producer":"true", "topic": "test_1", "threads": "5", "compression-codec": "1", @@ -133,6 +134,7 @@ }, { "entity_id": "11", + "new-producer":"true", "topic": "test_2", "threads": "5", "compression-codec": "1", @@ -164,12 +166,14 @@ { "entity_id": "14", + "new-producer":"true", "log_filename": "mirror_maker_14.log", "mirror_consumer_config_filename": "mirror_consumer_14.properties", "mirror_producer_config_filename": "mirror_producer_14.properties" }, { "entity_id": "15", + "new-producer":"true", "log_filename": "mirror_maker_15.log", "mirror_consumer_config_filename": "mirror_consumer_15.properties", "mirror_producer_config_filename": "mirror_producer_15.properties" diff --git a/system_test/mirror_maker_testsuite/testcase_5006/testcase_5006_properties.json b/system_test/mirror_maker_testsuite/testcase_5006/testcase_5006_properties.json index 1d9190c..a610a60 100644 --- a/system_test/mirror_maker_testsuite/testcase_5006/testcase_5006_properties.json +++ b/system_test/mirror_maker_testsuite/testcase_5006/testcase_5006_properties.json @@ -120,6 +120,7 @@ { "entity_id": "10", + "new-producer":"true", "topic": "test_1", "threads": "5", "compression-codec": "1", @@ -133,6 +134,7 @@ }, { "entity_id": "11", + "new-producer":"true", "topic": "test_2", "threads": "5", "compression-codec": "1", @@ -164,12 +166,14 @@ { "entity_id": "14", + "new-producer":"true", "log_filename": "mirror_maker_14.log", "mirror_consumer_config_filename": "mirror_consumer_14.properties", "mirror_producer_config_filename": "mirror_producer_14.properties" }, { "entity_id": "15", + "new-producer":"true", "log_filename": "mirror_maker_15.log", "mirror_consumer_config_filename": "mirror_consumer_15.properties", "mirror_producer_config_filename": "mirror_producer_15.properties" diff --git a/system_test/replication_testsuite/replica_basic_test.py b/system_test/replication_testsuite/replica_basic_test.py index e20130b..5d3d93e 100644 --- a/system_test/replication_testsuite/replica_basic_test.py +++ b/system_test/replication_testsuite/replica_basic_test.py @@ -363,6 +363,7 @@ class ReplicaBasicTest(ReplicationUtils, SetupUtils): str(self.testcaseEnv.userDefinedEnvVarDict["backgroundProducerStopped"]) + "]", extra=self.d) if self.testcaseEnv.userDefinedEnvVarDict["backgroundProducerStopped"]: time.sleep(1) + self.testcaseEnv.lock.release() self.logger.info("all producer threads completed", extra=self.d) break time.sleep(1) diff --git a/system_test/replication_testsuite/testcase_0001/testcase_0001_properties.json b/system_test/replication_testsuite/testcase_0001/testcase_0001_properties.json index 9bc164b..eaaa4ed 100644 --- a/system_test/replication_testsuite/testcase_0001/testcase_0001_properties.json +++ b/system_test/replication_testsuite/testcase_0001/testcase_0001_properties.json @@ -60,6 +60,7 @@ }, { "entity_id": "4", + "new-producer":"true", "topic": "test_1", "threads": "5", "compression-codec": "0", diff --git a/system_test/replication_testsuite/testcase_0002/testcase_0002_properties.json b/system_test/replication_testsuite/testcase_0002/testcase_0002_properties.json index c90d753..0ffbf67 100644 --- a/system_test/replication_testsuite/testcase_0002/testcase_0002_properties.json +++ b/system_test/replication_testsuite/testcase_0002/testcase_0002_properties.json @@ -60,6 +60,7 @@ }, { "entity_id": "4", + "new-producer":"true", "topic": "test_1", "threads": "5", "compression-codec": "1", diff --git a/system_test/replication_testsuite/testcase_0003/testcase_0003_properties.json b/system_test/replication_testsuite/testcase_0003/testcase_0003_properties.json index b62b8aa..e2fb579 100644 --- a/system_test/replication_testsuite/testcase_0003/testcase_0003_properties.json +++ b/system_test/replication_testsuite/testcase_0003/testcase_0003_properties.json @@ -60,6 +60,7 @@ }, { "entity_id": "4", + "new-producer":"true", "topic": "test_1", "threads": "5", "compression-codec": "1", diff --git a/system_test/replication_testsuite/testcase_0004/testcase_0004_properties.json b/system_test/replication_testsuite/testcase_0004/testcase_0004_properties.json index b91cef8..62fbe08 100644 --- a/system_test/replication_testsuite/testcase_0004/testcase_0004_properties.json +++ b/system_test/replication_testsuite/testcase_0004/testcase_0004_properties.json @@ -60,6 +60,7 @@ }, { "entity_id": "4", + "new-producer":"true", "topic": "test_1", "threads": "5", "compression-codec": "1", diff --git a/system_test/replication_testsuite/testcase_0005/testcase_0005_properties.json b/system_test/replication_testsuite/testcase_0005/testcase_0005_properties.json index 4b3f76a..02ad59d 100644 --- a/system_test/replication_testsuite/testcase_0005/testcase_0005_properties.json +++ b/system_test/replication_testsuite/testcase_0005/testcase_0005_properties.json @@ -60,6 +60,7 @@ }, { "entity_id": "4", + "new-producer":"true", "topic": "test_1", "threads": "5", "compression-codec": "1", diff --git a/system_test/replication_testsuite/testcase_0006/testcase_0006_properties.json b/system_test/replication_testsuite/testcase_0006/testcase_0006_properties.json index b9b3485..b64304f 100644 --- a/system_test/replication_testsuite/testcase_0006/testcase_0006_properties.json +++ b/system_test/replication_testsuite/testcase_0006/testcase_0006_properties.json @@ -60,6 +60,7 @@ }, { "entity_id": "4", + "new-producer":"true", "topic": "test_1", "threads": "5", "compression-codec": "1", diff --git a/system_test/replication_testsuite/testcase_0007/testcase_0007_properties.json b/system_test/replication_testsuite/testcase_0007/testcase_0007_properties.json index 5c4351f..e850709 100644 --- a/system_test/replication_testsuite/testcase_0007/testcase_0007_properties.json +++ b/system_test/replication_testsuite/testcase_0007/testcase_0007_properties.json @@ -60,6 +60,7 @@ }, { "entity_id": "4", + "new-producer":"true", "topic": "test_1", "threads": "5", "compression-codec": "1", diff --git a/system_test/replication_testsuite/testcase_0008/testcase_0008_properties.json b/system_test/replication_testsuite/testcase_0008/testcase_0008_properties.json index 79cfed8..47217cf 100644 --- a/system_test/replication_testsuite/testcase_0008/testcase_0008_properties.json +++ b/system_test/replication_testsuite/testcase_0008/testcase_0008_properties.json @@ -60,6 +60,7 @@ }, { "entity_id": "4", + "new-producer":"true", "topic": "test_1", "threads": "5", "compression-codec": "1", diff --git a/system_test/replication_testsuite/testcase_0009/testcase_0009_properties.json b/system_test/replication_testsuite/testcase_0009/testcase_0009_properties.json index a52b709..3ddaad4 100644 --- a/system_test/replication_testsuite/testcase_0009/testcase_0009_properties.json +++ b/system_test/replication_testsuite/testcase_0009/testcase_0009_properties.json @@ -60,6 +60,7 @@ }, { "entity_id": "4", + "new-producer":"true", "topic": "test_1", "threads": "5", "compression-codec": "1", diff --git a/system_test/replication_testsuite/testcase_0010/testcase_0010_properties.json b/system_test/replication_testsuite/testcase_0010/testcase_0010_properties.json index 8d4b5fe..e25ddb9 100644 --- a/system_test/replication_testsuite/testcase_0010/testcase_0010_properties.json +++ b/system_test/replication_testsuite/testcase_0010/testcase_0010_properties.json @@ -60,6 +60,7 @@ }, { "entity_id": "4", + "new-producer":"true", "topic": "test_1", "threads": "5", "compression-codec": "1", diff --git a/system_test/replication_testsuite/testcase_0011/testcase_0011_properties.json b/system_test/replication_testsuite/testcase_0011/testcase_0011_properties.json index b03f9cf..ac17570 100644 --- a/system_test/replication_testsuite/testcase_0011/testcase_0011_properties.json +++ b/system_test/replication_testsuite/testcase_0011/testcase_0011_properties.json @@ -61,6 +61,7 @@ }, { "entity_id": "4", + "new-producer":"true", "topic": "test_1", "threads": "5", "compression-codec": "1", diff --git a/system_test/replication_testsuite/testcase_0021/testcase_0021_properties.json b/system_test/replication_testsuite/testcase_0021/testcase_0021_properties.json index 40c2f8d..f35a439 100644 --- a/system_test/replication_testsuite/testcase_0021/testcase_0021_properties.json +++ b/system_test/replication_testsuite/testcase_0021/testcase_0021_properties.json @@ -59,6 +59,7 @@ }, { "entity_id": "4", + "new-producer":"true", "topic": "test_1", "threads": "5", "compression-codec": "0", @@ -72,6 +73,7 @@ }, { "entity_id": "5", + "new-producer":"true", "topic": "test_2", "threads": "5", "compression-codec": "0", diff --git a/system_test/replication_testsuite/testcase_0022/testcase_0022_properties.json b/system_test/replication_testsuite/testcase_0022/testcase_0022_properties.json index 7a30460..5a168f3 100644 --- a/system_test/replication_testsuite/testcase_0022/testcase_0022_properties.json +++ b/system_test/replication_testsuite/testcase_0022/testcase_0022_properties.json @@ -59,6 +59,7 @@ }, { "entity_id": "4", + "new-producer":"true", "topic": "test_1", "threads": "5", "compression-codec": "0", @@ -72,6 +73,7 @@ }, { "entity_id": "5", + "new-producer":"true", "topic": "test_2", "threads": "5", "compression-codec": "0", diff --git a/system_test/replication_testsuite/testcase_0023/testcase_0023_properties.json b/system_test/replication_testsuite/testcase_0023/testcase_0023_properties.json index d921f01..09d81a6 100644 --- a/system_test/replication_testsuite/testcase_0023/testcase_0023_properties.json +++ b/system_test/replication_testsuite/testcase_0023/testcase_0023_properties.json @@ -59,6 +59,7 @@ }, { "entity_id": "4", + "new-producer":"true", "topic": "test_1", "threads": "5", "compression-codec": "1", @@ -72,6 +73,7 @@ }, { "entity_id": "5", + "new-producer":"true", "topic": "test_2", "threads": "5", "compression-codec": "1", diff --git a/system_test/replication_testsuite/testcase_0024/testcase_0024_properties.json b/system_test/replication_testsuite/testcase_0024/testcase_0024_properties.json index 839eb14..5661b88 100644 --- a/system_test/replication_testsuite/testcase_0024/testcase_0024_properties.json +++ b/system_test/replication_testsuite/testcase_0024/testcase_0024_properties.json @@ -62,6 +62,7 @@ }, { "entity_id": "4", + "new-producer":"true", "topic": "test_1,test_2", "threads": "5", "compression-codec": "1", diff --git a/system_test/replication_testsuite/testcase_0101/testcase_0101_properties.json b/system_test/replication_testsuite/testcase_0101/testcase_0101_properties.json index 85e4b61..6238151 100644 --- a/system_test/replication_testsuite/testcase_0101/testcase_0101_properties.json +++ b/system_test/replication_testsuite/testcase_0101/testcase_0101_properties.json @@ -63,6 +63,7 @@ }, { "entity_id": "4", + "new-producer":"true", "topic": "test_1", "threads": "5", "compression-codec": "0", diff --git a/system_test/replication_testsuite/testcase_0102/testcase_0102_properties.json b/system_test/replication_testsuite/testcase_0102/testcase_0102_properties.json index 0d2f59f..69203c3 100644 --- a/system_test/replication_testsuite/testcase_0102/testcase_0102_properties.json +++ b/system_test/replication_testsuite/testcase_0102/testcase_0102_properties.json @@ -63,6 +63,7 @@ }, { "entity_id": "4", + "new-producer":"true", "topic": "test_1", "threads": "5", "compression-codec": "1", diff --git a/system_test/replication_testsuite/testcase_0103/testcase_0103_properties.json b/system_test/replication_testsuite/testcase_0103/testcase_0103_properties.json index 34acfa9..6bc54ce 100644 --- a/system_test/replication_testsuite/testcase_0103/testcase_0103_properties.json +++ b/system_test/replication_testsuite/testcase_0103/testcase_0103_properties.json @@ -63,6 +63,7 @@ }, { "entity_id": "4", + "new-producer":"true", "topic": "test_1", "threads": "5", "compression-codec": "1", diff --git a/system_test/replication_testsuite/testcase_0104/testcase_0104_properties.json b/system_test/replication_testsuite/testcase_0104/testcase_0104_properties.json index 4145345..4b3cfe7 100644 --- a/system_test/replication_testsuite/testcase_0104/testcase_0104_properties.json +++ b/system_test/replication_testsuite/testcase_0104/testcase_0104_properties.json @@ -63,6 +63,7 @@ }, { "entity_id": "4", + "new-producer":"true", "topic": "test_1", "threads": "5", "compression-codec": "1", diff --git a/system_test/replication_testsuite/testcase_0105/testcase_0105_properties.json b/system_test/replication_testsuite/testcase_0105/testcase_0105_properties.json index 2eecc76..a913a6c 100644 --- a/system_test/replication_testsuite/testcase_0105/testcase_0105_properties.json +++ b/system_test/replication_testsuite/testcase_0105/testcase_0105_properties.json @@ -63,6 +63,7 @@ }, { "entity_id": "4", + "new-producer":"true", "topic": "test_1", "threads": "5", "compression-codec": "1", diff --git a/system_test/replication_testsuite/testcase_0106/testcase_0106_properties.json b/system_test/replication_testsuite/testcase_0106/testcase_0106_properties.json index 744174e..55b0bdb 100644 --- a/system_test/replication_testsuite/testcase_0106/testcase_0106_properties.json +++ b/system_test/replication_testsuite/testcase_0106/testcase_0106_properties.json @@ -63,6 +63,7 @@ }, { "entity_id": "4", + "new-producer":"true", "topic": "test_1", "threads": "5", "compression-codec": "1", diff --git a/system_test/replication_testsuite/testcase_0107/testcase_0107_properties.json b/system_test/replication_testsuite/testcase_0107/testcase_0107_properties.json index e881b13..608ed87 100644 --- a/system_test/replication_testsuite/testcase_0107/testcase_0107_properties.json +++ b/system_test/replication_testsuite/testcase_0107/testcase_0107_properties.json @@ -63,6 +63,7 @@ }, { "entity_id": "4", + "new-producer":"true", "topic": "test_1", "threads": "5", "compression-codec": "1", diff --git a/system_test/replication_testsuite/testcase_0108/testcase_0108_properties.json b/system_test/replication_testsuite/testcase_0108/testcase_0108_properties.json index 7b48fdb..f1e9caf 100644 --- a/system_test/replication_testsuite/testcase_0108/testcase_0108_properties.json +++ b/system_test/replication_testsuite/testcase_0108/testcase_0108_properties.json @@ -63,6 +63,7 @@ }, { "entity_id": "4", + "new-producer":"true", "topic": "test_1", "threads": "5", "compression-codec": "1", diff --git a/system_test/replication_testsuite/testcase_0109/testcase_0109_properties.json b/system_test/replication_testsuite/testcase_0109/testcase_0109_properties.json index a98ae03..26fa2ac 100644 --- a/system_test/replication_testsuite/testcase_0109/testcase_0109_properties.json +++ b/system_test/replication_testsuite/testcase_0109/testcase_0109_properties.json @@ -63,6 +63,7 @@ }, { "entity_id": "4", + "new-producer":"true", "topic": "test_1", "threads": "5", "compression-codec": "1", diff --git a/system_test/replication_testsuite/testcase_0110/testcase_0110_properties.json b/system_test/replication_testsuite/testcase_0110/testcase_0110_properties.json index f51abc1..f11c705 100644 --- a/system_test/replication_testsuite/testcase_0110/testcase_0110_properties.json +++ b/system_test/replication_testsuite/testcase_0110/testcase_0110_properties.json @@ -63,6 +63,7 @@ }, { "entity_id": "4", + "new-producer":"true", "topic": "test_1", "threads": "5", "compression-codec": "1", diff --git a/system_test/replication_testsuite/testcase_0111/testcase_0111_properties.json b/system_test/replication_testsuite/testcase_0111/testcase_0111_properties.json index fff0d68..cc1eae6 100644 --- a/system_test/replication_testsuite/testcase_0111/testcase_0111_properties.json +++ b/system_test/replication_testsuite/testcase_0111/testcase_0111_properties.json @@ -64,6 +64,7 @@ }, { "entity_id": "4", + "new-producer":"true", "topic": "test_1", "threads": "5", "compression-codec": "0", diff --git a/system_test/replication_testsuite/testcase_0112/testcase_0112_properties.json b/system_test/replication_testsuite/testcase_0112/testcase_0112_properties.json index 636f02a..48a6c9d 100644 --- a/system_test/replication_testsuite/testcase_0112/testcase_0112_properties.json +++ b/system_test/replication_testsuite/testcase_0112/testcase_0112_properties.json @@ -64,6 +64,7 @@ }, { "entity_id": "4", + "new-producer":"true", "topic": "test_1", "threads": "5", "compression-codec": "0", diff --git a/system_test/replication_testsuite/testcase_0113/testcase_0113_properties.json b/system_test/replication_testsuite/testcase_0113/testcase_0113_properties.json index bdb885e..a88b49b 100644 --- a/system_test/replication_testsuite/testcase_0113/testcase_0113_properties.json +++ b/system_test/replication_testsuite/testcase_0113/testcase_0113_properties.json @@ -64,6 +64,7 @@ }, { "entity_id": "4", + "new-producer":"true", "topic": "test_1", "threads": "5", "compression-codec": "0", diff --git a/system_test/replication_testsuite/testcase_0114/testcase_0114_properties.json b/system_test/replication_testsuite/testcase_0114/testcase_0114_properties.json index ca51c5f..1261614 100644 --- a/system_test/replication_testsuite/testcase_0114/testcase_0114_properties.json +++ b/system_test/replication_testsuite/testcase_0114/testcase_0114_properties.json @@ -64,6 +64,7 @@ }, { "entity_id": "4", + "new-producer":"true", "topic": "test_1", "threads": "5", "compression-codec": "0", diff --git a/system_test/replication_testsuite/testcase_0115/testcase_0115_properties.json b/system_test/replication_testsuite/testcase_0115/testcase_0115_properties.json index 459becf..2d649da 100644 --- a/system_test/replication_testsuite/testcase_0115/testcase_0115_properties.json +++ b/system_test/replication_testsuite/testcase_0115/testcase_0115_properties.json @@ -64,6 +64,7 @@ }, { "entity_id": "4", + "new-producer":"true", "topic": "test_1", "threads": "5", "compression-codec": "1", diff --git a/system_test/replication_testsuite/testcase_0116/testcase_0116_properties.json b/system_test/replication_testsuite/testcase_0116/testcase_0116_properties.json index c9471bc..cbad6f2 100644 --- a/system_test/replication_testsuite/testcase_0116/testcase_0116_properties.json +++ b/system_test/replication_testsuite/testcase_0116/testcase_0116_properties.json @@ -64,6 +64,7 @@ }, { "entity_id": "4", + "new-producer":"true", "topic": "test_1", "threads": "5", "compression-codec": "1", diff --git a/system_test/replication_testsuite/testcase_0117/testcase_0117_properties.json b/system_test/replication_testsuite/testcase_0117/testcase_0117_properties.json index 8159464..0099a8f 100644 --- a/system_test/replication_testsuite/testcase_0117/testcase_0117_properties.json +++ b/system_test/replication_testsuite/testcase_0117/testcase_0117_properties.json @@ -64,6 +64,7 @@ }, { "entity_id": "4", + "new-producer":"true", "topic": "test_1", "threads": "5", "compression-codec": "1", diff --git a/system_test/replication_testsuite/testcase_0118/testcase_0118_properties.json b/system_test/replication_testsuite/testcase_0118/testcase_0118_properties.json index f73f0e4..6954d43 100644 --- a/system_test/replication_testsuite/testcase_0118/testcase_0118_properties.json +++ b/system_test/replication_testsuite/testcase_0118/testcase_0118_properties.json @@ -64,6 +64,7 @@ }, { "entity_id": "4", + "new-producer":"true", "topic": "test_1", "threads": "5", "compression-codec": "1", diff --git a/system_test/replication_testsuite/testcase_0119/testcase_0119_properties.json b/system_test/replication_testsuite/testcase_0119/testcase_0119_properties.json index 442a481..ab1e47a 100644 --- a/system_test/replication_testsuite/testcase_0119/testcase_0119_properties.json +++ b/system_test/replication_testsuite/testcase_0119/testcase_0119_properties.json @@ -64,6 +64,7 @@ }, { "entity_id": "4", + "new-producer":"true", "topic": "test_1", "threads": "5", "compression-codec": "0", diff --git a/system_test/replication_testsuite/testcase_0121/testcase_0121_properties.json b/system_test/replication_testsuite/testcase_0121/testcase_0121_properties.json index 606aad3..c7940c4 100644 --- a/system_test/replication_testsuite/testcase_0121/testcase_0121_properties.json +++ b/system_test/replication_testsuite/testcase_0121/testcase_0121_properties.json @@ -63,6 +63,7 @@ }, { "entity_id": "4", + "new-producer":"true", "topic": "test_1", "threads": "5", "compression-codec": "0", @@ -76,6 +77,7 @@ }, { "entity_id": "5", + "new-producer":"true", "topic": "test_2", "threads": "5", "compression-codec": "0", diff --git a/system_test/replication_testsuite/testcase_0122/testcase_0122_properties.json b/system_test/replication_testsuite/testcase_0122/testcase_0122_properties.json index ea47536..35daf5b 100644 --- a/system_test/replication_testsuite/testcase_0122/testcase_0122_properties.json +++ b/system_test/replication_testsuite/testcase_0122/testcase_0122_properties.json @@ -63,6 +63,7 @@ }, { "entity_id": "4", + "new-producer":"true", "topic": "test_1", "threads": "5", "compression-codec": "0", @@ -76,6 +77,7 @@ }, { "entity_id": "5", + "new-producer":"true", "topic": "test_2", "threads": "5", "compression-codec": "0", diff --git a/system_test/replication_testsuite/testcase_0123/testcase_0123_properties.json b/system_test/replication_testsuite/testcase_0123/testcase_0123_properties.json index f9c9273..fe5e49a 100644 --- a/system_test/replication_testsuite/testcase_0123/testcase_0123_properties.json +++ b/system_test/replication_testsuite/testcase_0123/testcase_0123_properties.json @@ -63,6 +63,7 @@ }, { "entity_id": "4", + "new-producer":"true", "topic": "test_1", "threads": "5", "compression-codec": "1", @@ -76,6 +77,7 @@ }, { "entity_id": "5", + "new-producer":"true", "topic": "test_2", "threads": "5", "compression-codec": "1", diff --git a/system_test/replication_testsuite/testcase_0124/testcase_0124_properties.json b/system_test/replication_testsuite/testcase_0124/testcase_0124_properties.json index 02f8506..bff5d73 100644 --- a/system_test/replication_testsuite/testcase_0124/testcase_0124_properties.json +++ b/system_test/replication_testsuite/testcase_0124/testcase_0124_properties.json @@ -67,6 +67,7 @@ }, { "entity_id": "4", + "new-producer":"true", "topic": "test_1", "threads": "5", "compression-codec": "0", @@ -80,6 +81,7 @@ }, { "entity_id": "5", + "new-producer":"true", "topic": "test_2", "threads": "5", "compression-codec": "0", diff --git a/system_test/replication_testsuite/testcase_0125/testcase_0125_properties.json b/system_test/replication_testsuite/testcase_0125/testcase_0125_properties.json index 0048279..1f57ecc 100644 --- a/system_test/replication_testsuite/testcase_0125/testcase_0125_properties.json +++ b/system_test/replication_testsuite/testcase_0125/testcase_0125_properties.json @@ -67,6 +67,7 @@ }, { "entity_id": "4", + "new-producer":"true", "topic": "test_1", "threads": "5", "compression-codec": "0", @@ -80,6 +81,7 @@ }, { "entity_id": "5", + "new-producer":"true", "topic": "test_2", "threads": "5", "compression-codec": "0", diff --git a/system_test/replication_testsuite/testcase_0126/testcase_0126_properties.json b/system_test/replication_testsuite/testcase_0126/testcase_0126_properties.json index 5119e61..ffa0fc3 100644 --- a/system_test/replication_testsuite/testcase_0126/testcase_0126_properties.json +++ b/system_test/replication_testsuite/testcase_0126/testcase_0126_properties.json @@ -67,6 +67,7 @@ }, { "entity_id": "4", + "new-producer":"true", "topic": "test_1", "threads": "5", "compression-codec": "1", @@ -80,6 +81,7 @@ }, { "entity_id": "5", + "new-producer":"true", "topic": "test_2", "threads": "5", "compression-codec": "1", diff --git a/system_test/replication_testsuite/testcase_0127/testcase_0127_properties.json b/system_test/replication_testsuite/testcase_0127/testcase_0127_properties.json index 8b53fa7..78ecd8f 100644 --- a/system_test/replication_testsuite/testcase_0127/testcase_0127_properties.json +++ b/system_test/replication_testsuite/testcase_0127/testcase_0127_properties.json @@ -67,6 +67,7 @@ }, { "entity_id": "4", + "new-producer":"true", "topic": "test_1", "threads": "5", "compression-codec": "1", @@ -80,6 +81,7 @@ }, { "entity_id": "5", + "new-producer":"true", "topic": "test_2", "threads": "5", "compression-codec": "1", diff --git a/system_test/replication_testsuite/testcase_0128/testcase_0128_properties.json b/system_test/replication_testsuite/testcase_0128/testcase_0128_properties.json index e8edb9f..589eb20 100644 --- a/system_test/replication_testsuite/testcase_0128/testcase_0128_properties.json +++ b/system_test/replication_testsuite/testcase_0128/testcase_0128_properties.json @@ -65,6 +65,7 @@ }, { "entity_id": "4", + "new-producer":"true", "topic": "test_1,test_2", "threads": "5", "compression-codec": "1", diff --git a/system_test/replication_testsuite/testcase_0131/testcase_0131_properties.json b/system_test/replication_testsuite/testcase_0131/testcase_0131_properties.json index a140882..0324b6f 100644 --- a/system_test/replication_testsuite/testcase_0131/testcase_0131_properties.json +++ b/system_test/replication_testsuite/testcase_0131/testcase_0131_properties.json @@ -66,6 +66,7 @@ }, { "entity_id": "4", + "new-producer":"true", "topic": "test_1", "threads": "5", "compression-codec": "0", @@ -79,6 +80,7 @@ }, { "entity_id": "5", + "new-producer":"true", "topic": "test_2", "threads": "5", "compression-codec": "0", diff --git a/system_test/replication_testsuite/testcase_0132/testcase_0132_properties.json b/system_test/replication_testsuite/testcase_0132/testcase_0132_properties.json index 48b30c7..83bcaaa 100644 --- a/system_test/replication_testsuite/testcase_0132/testcase_0132_properties.json +++ b/system_test/replication_testsuite/testcase_0132/testcase_0132_properties.json @@ -63,6 +63,7 @@ }, { "entity_id": "4", + "new-producer":"true", "topic": "test_1", "threads": "5", "compression-codec": "0", @@ -76,6 +77,7 @@ }, { "entity_id": "5", + "new-producer":"true", "topic": "test_2", "threads": "5", "compression-codec": "0", diff --git a/system_test/replication_testsuite/testcase_0133/testcase_0133_properties.json b/system_test/replication_testsuite/testcase_0133/testcase_0133_properties.json index 8276aae..2a1eaa5 100644 --- a/system_test/replication_testsuite/testcase_0133/testcase_0133_properties.json +++ b/system_test/replication_testsuite/testcase_0133/testcase_0133_properties.json @@ -63,6 +63,7 @@ }, { "entity_id": "4", + "new-producer":"true", "topic": "test_1", "threads": "5", "compression-codec": "1", @@ -76,6 +77,7 @@ }, { "entity_id": "5", + "new-producer":"true", "topic": "test_2", "threads": "5", "compression-codec": "1", diff --git a/system_test/replication_testsuite/testcase_0134/testcase_0134_properties.json b/system_test/replication_testsuite/testcase_0134/testcase_0134_properties.json index 73bb859..0a98ce5 100644 --- a/system_test/replication_testsuite/testcase_0134/testcase_0134_properties.json +++ b/system_test/replication_testsuite/testcase_0134/testcase_0134_properties.json @@ -68,6 +68,7 @@ }, { "entity_id": "4", + "new-producer":"true", "topic": "test_1,test_2", "threads": "5", "compression-codec": "1", diff --git a/system_test/replication_testsuite/testcase_0151/testcase_0151_properties.json b/system_test/replication_testsuite/testcase_0151/testcase_0151_properties.json index eebba4d..237a343 100644 --- a/system_test/replication_testsuite/testcase_0151/testcase_0151_properties.json +++ b/system_test/replication_testsuite/testcase_0151/testcase_0151_properties.json @@ -65,6 +65,7 @@ }, { "entity_id": "4", + "new-producer":"true", "topic": "test_1", "threads": "5", "compression-codec": "0", diff --git a/system_test/replication_testsuite/testcase_0152/testcase_0152_properties.json b/system_test/replication_testsuite/testcase_0152/testcase_0152_properties.json index debf544..8d57610 100644 --- a/system_test/replication_testsuite/testcase_0152/testcase_0152_properties.json +++ b/system_test/replication_testsuite/testcase_0152/testcase_0152_properties.json @@ -65,6 +65,7 @@ }, { "entity_id": "4", + "new-producer":"true", "topic": "test_1", "threads": "5", "compression-codec": "0", diff --git a/system_test/replication_testsuite/testcase_0153/testcase_0153_properties.json b/system_test/replication_testsuite/testcase_0153/testcase_0153_properties.json index 57b7d98..89b933f 100644 --- a/system_test/replication_testsuite/testcase_0153/testcase_0153_properties.json +++ b/system_test/replication_testsuite/testcase_0153/testcase_0153_properties.json @@ -65,6 +65,7 @@ }, { "entity_id": "4", + "new-producer":"true", "topic": "test_1", "threads": "5", "compression-codec": "0", diff --git a/system_test/replication_testsuite/testcase_0154/testcase_0154_properties.json b/system_test/replication_testsuite/testcase_0154/testcase_0154_properties.json index c09fab7..fe3f98f 100644 --- a/system_test/replication_testsuite/testcase_0154/testcase_0154_properties.json +++ b/system_test/replication_testsuite/testcase_0154/testcase_0154_properties.json @@ -65,6 +65,7 @@ }, { "entity_id": "4", + "new-producer":"true", "topic": "test_1", "threads": "5", "compression-codec": "0", diff --git a/system_test/replication_testsuite/testcase_0155/testcase_0155_properties.json b/system_test/replication_testsuite/testcase_0155/testcase_0155_properties.json index dd5ac52..7f9ced8 100644 --- a/system_test/replication_testsuite/testcase_0155/testcase_0155_properties.json +++ b/system_test/replication_testsuite/testcase_0155/testcase_0155_properties.json @@ -65,6 +65,7 @@ }, { "entity_id": "4", + "new-producer":"true", "topic": "test_1", "threads": "5", "compression-codec": "1", diff --git a/system_test/replication_testsuite/testcase_0156/testcase_0156_properties.json b/system_test/replication_testsuite/testcase_0156/testcase_0156_properties.json index 8236ca5..ec1e83c 100644 --- a/system_test/replication_testsuite/testcase_0156/testcase_0156_properties.json +++ b/system_test/replication_testsuite/testcase_0156/testcase_0156_properties.json @@ -65,6 +65,7 @@ }, { "entity_id": "4", + "new-producer":"true", "topic": "test_1", "threads": "5", "compression-codec": "1", diff --git a/system_test/replication_testsuite/testcase_0157/testcase_0157_properties.json b/system_test/replication_testsuite/testcase_0157/testcase_0157_properties.json index a28bf81..e96ed32 100644 --- a/system_test/replication_testsuite/testcase_0157/testcase_0157_properties.json +++ b/system_test/replication_testsuite/testcase_0157/testcase_0157_properties.json @@ -65,6 +65,7 @@ }, { "entity_id": "4", + "new-producer":"true", "topic": "test_1", "threads": "5", "compression-codec": "1", diff --git a/system_test/replication_testsuite/testcase_0158/testcase_0158_properties.json b/system_test/replication_testsuite/testcase_0158/testcase_0158_properties.json index 3d6edbd..7ca2942 100644 --- a/system_test/replication_testsuite/testcase_0158/testcase_0158_properties.json +++ b/system_test/replication_testsuite/testcase_0158/testcase_0158_properties.json @@ -65,6 +65,7 @@ }, { "entity_id": "4", + "new-producer":"true", "topic": "test_1", "threads": "5", "compression-codec": "1", diff --git a/system_test/replication_testsuite/testcase_0159/testcase_0159_properties.json b/system_test/replication_testsuite/testcase_0159/testcase_0159_properties.json index 030c9e8..cf7ccc3 100644 --- a/system_test/replication_testsuite/testcase_0159/testcase_0159_properties.json +++ b/system_test/replication_testsuite/testcase_0159/testcase_0159_properties.json @@ -65,6 +65,7 @@ }, { "entity_id": "4", + "new-producer":"true", "topic": "test_1", "threads": "5", "compression-codec": "1", diff --git a/system_test/replication_testsuite/testcase_0201/testcase_0201_properties.json b/system_test/replication_testsuite/testcase_0201/testcase_0201_properties.json index c6f8a23..521592b 100644 --- a/system_test/replication_testsuite/testcase_0201/testcase_0201_properties.json +++ b/system_test/replication_testsuite/testcase_0201/testcase_0201_properties.json @@ -64,6 +64,7 @@ }, { "entity_id": "4", + "new-producer":"true", "topic": "test_1", "threads": "5", "compression-codec": "0", diff --git a/system_test/replication_testsuite/testcase_0202/testcase_0202_properties.json b/system_test/replication_testsuite/testcase_0202/testcase_0202_properties.json index 7b1a4c2..c2feeb8 100644 --- a/system_test/replication_testsuite/testcase_0202/testcase_0202_properties.json +++ b/system_test/replication_testsuite/testcase_0202/testcase_0202_properties.json @@ -64,6 +64,7 @@ }, { "entity_id": "4", + "new-producer":"true", "topic": "test_1", "threads": "5", "compression-codec": "0", diff --git a/system_test/replication_testsuite/testcase_0203/testcase_0203_properties.json b/system_test/replication_testsuite/testcase_0203/testcase_0203_properties.json index 47276a8..83b4dbc 100644 --- a/system_test/replication_testsuite/testcase_0203/testcase_0203_properties.json +++ b/system_test/replication_testsuite/testcase_0203/testcase_0203_properties.json @@ -64,6 +64,7 @@ }, { "entity_id": "4", + "new-producer":"true", "topic": "test_1", "threads": "5", "compression-codec": "0", diff --git a/system_test/replication_testsuite/testcase_0204/testcase_0204_properties.json b/system_test/replication_testsuite/testcase_0204/testcase_0204_properties.json index 3742cfa..629b7ba 100644 --- a/system_test/replication_testsuite/testcase_0204/testcase_0204_properties.json +++ b/system_test/replication_testsuite/testcase_0204/testcase_0204_properties.json @@ -64,6 +64,7 @@ }, { "entity_id": "4", + "new-producer":"true", "topic": "test_1", "threads": "5", "compression-codec": "0", diff --git a/system_test/replication_testsuite/testcase_0205/testcase_0205_properties.json b/system_test/replication_testsuite/testcase_0205/testcase_0205_properties.json index d41672d..a9d13c3 100644 --- a/system_test/replication_testsuite/testcase_0205/testcase_0205_properties.json +++ b/system_test/replication_testsuite/testcase_0205/testcase_0205_properties.json @@ -64,6 +64,7 @@ }, { "entity_id": "4", + "new-producer":"true", "topic": "test_1", "threads": "5", "compression-codec": "1", diff --git a/system_test/replication_testsuite/testcase_0206/testcase_0206_properties.json b/system_test/replication_testsuite/testcase_0206/testcase_0206_properties.json index a32d888..e316669 100644 --- a/system_test/replication_testsuite/testcase_0206/testcase_0206_properties.json +++ b/system_test/replication_testsuite/testcase_0206/testcase_0206_properties.json @@ -64,6 +64,7 @@ }, { "entity_id": "4", + "new-producer":"true", "topic": "test_1", "threads": "5", "compression-codec": "1", diff --git a/system_test/replication_testsuite/testcase_0207/testcase_0207_properties.json b/system_test/replication_testsuite/testcase_0207/testcase_0207_properties.json index 5737870..1e08f46 100644 --- a/system_test/replication_testsuite/testcase_0207/testcase_0207_properties.json +++ b/system_test/replication_testsuite/testcase_0207/testcase_0207_properties.json @@ -64,6 +64,7 @@ }, { "entity_id": "4", + "new-producer":"true", "topic": "test_1", "threads": "5", "compression-codec": "1", diff --git a/system_test/replication_testsuite/testcase_0208/testcase_0208_properties.json b/system_test/replication_testsuite/testcase_0208/testcase_0208_properties.json index c3d1d2c..1dd38f4 100644 --- a/system_test/replication_testsuite/testcase_0208/testcase_0208_properties.json +++ b/system_test/replication_testsuite/testcase_0208/testcase_0208_properties.json @@ -64,6 +64,7 @@ }, { "entity_id": "4", + "new-producer":"true", "topic": "test_1", "threads": "5", "compression-codec": "1", diff --git a/system_test/replication_testsuite/testcase_0209/testcase_0209_properties.json b/system_test/replication_testsuite/testcase_0209/testcase_0209_properties.json index 8d2ceba..ac6b4d0 100644 --- a/system_test/replication_testsuite/testcase_0209/testcase_0209_properties.json +++ b/system_test/replication_testsuite/testcase_0209/testcase_0209_properties.json @@ -65,6 +65,7 @@ }, { "entity_id": "4", + "new-producer":"true", "topic": "test_1", "threads": "5", "compression-codec": "1", diff --git a/system_test/replication_testsuite/testcase_0251/testcase_0251_properties.json b/system_test/replication_testsuite/testcase_0251/testcase_0251_properties.json index 76ea677..9f06f30 100644 --- a/system_test/replication_testsuite/testcase_0251/testcase_0251_properties.json +++ b/system_test/replication_testsuite/testcase_0251/testcase_0251_properties.json @@ -64,6 +64,7 @@ }, { "entity_id": "4", + "new-producer":"true", "topic": "test_1", "threads": "5", "compression-codec": "0", diff --git a/system_test/replication_testsuite/testcase_0252/testcase_0252_properties.json b/system_test/replication_testsuite/testcase_0252/testcase_0252_properties.json index 672b3ff..c264fca 100644 --- a/system_test/replication_testsuite/testcase_0252/testcase_0252_properties.json +++ b/system_test/replication_testsuite/testcase_0252/testcase_0252_properties.json @@ -64,6 +64,7 @@ }, { "entity_id": "4", + "new-producer":"true", "topic": "test_1", "threads": "5", "compression-codec": "0", diff --git a/system_test/replication_testsuite/testcase_0253/testcase_0253_properties.json b/system_test/replication_testsuite/testcase_0253/testcase_0253_properties.json index 19bd096..e5fdb2e 100644 --- a/system_test/replication_testsuite/testcase_0253/testcase_0253_properties.json +++ b/system_test/replication_testsuite/testcase_0253/testcase_0253_properties.json @@ -64,6 +64,7 @@ }, { "entity_id": "4", + "new-producer":"true", "topic": "test_1", "threads": "5", "compression-codec": "0", diff --git a/system_test/replication_testsuite/testcase_0254/testcase_0254_properties.json b/system_test/replication_testsuite/testcase_0254/testcase_0254_properties.json index 8d6add0..27ce4e9 100644 --- a/system_test/replication_testsuite/testcase_0254/testcase_0254_properties.json +++ b/system_test/replication_testsuite/testcase_0254/testcase_0254_properties.json @@ -64,6 +64,7 @@ }, { "entity_id": "4", + "new-producer":"true", "topic": "test_1", "threads": "5", "compression-codec": "0", diff --git a/system_test/replication_testsuite/testcase_0255/testcase_0255_properties.json b/system_test/replication_testsuite/testcase_0255/testcase_0255_properties.json index 2a7e777..1148a45 100644 --- a/system_test/replication_testsuite/testcase_0255/testcase_0255_properties.json +++ b/system_test/replication_testsuite/testcase_0255/testcase_0255_properties.json @@ -64,6 +64,7 @@ }, { "entity_id": "4", + "new-producer":"true", "topic": "test_1", "threads": "5", "compression-codec": "1", diff --git a/system_test/replication_testsuite/testcase_0256/testcase_0256_properties.json b/system_test/replication_testsuite/testcase_0256/testcase_0256_properties.json index 91fbc9d..1b58e9b 100644 --- a/system_test/replication_testsuite/testcase_0256/testcase_0256_properties.json +++ b/system_test/replication_testsuite/testcase_0256/testcase_0256_properties.json @@ -64,6 +64,7 @@ }, { "entity_id": "4", + "new-producer":"true", "topic": "test_1", "threads": "5", "compression-codec": "1", diff --git a/system_test/replication_testsuite/testcase_0257/testcase_0257_properties.json b/system_test/replication_testsuite/testcase_0257/testcase_0257_properties.json index 5594a9b..42e33c2 100644 --- a/system_test/replication_testsuite/testcase_0257/testcase_0257_properties.json +++ b/system_test/replication_testsuite/testcase_0257/testcase_0257_properties.json @@ -64,6 +64,7 @@ }, { "entity_id": "4", + "new-producer":"true", "topic": "test_1", "threads": "5", "compression-codec": "1", diff --git a/system_test/replication_testsuite/testcase_0258/testcase_0258_properties.json b/system_test/replication_testsuite/testcase_0258/testcase_0258_properties.json index 6eabd37..ae9ce5e 100644 --- a/system_test/replication_testsuite/testcase_0258/testcase_0258_properties.json +++ b/system_test/replication_testsuite/testcase_0258/testcase_0258_properties.json @@ -64,6 +64,7 @@ }, { "entity_id": "4", + "new-producer":"true", "topic": "test_1", "threads": "5", "compression-codec": "1", diff --git a/system_test/replication_testsuite/testcase_0259/testcase_0259_properties.json b/system_test/replication_testsuite/testcase_0259/testcase_0259_properties.json index 3bbeeb1..7278327 100644 --- a/system_test/replication_testsuite/testcase_0259/testcase_0259_properties.json +++ b/system_test/replication_testsuite/testcase_0259/testcase_0259_properties.json @@ -65,6 +65,7 @@ }, { "entity_id": "4", + "new-producer":"true", "topic": "test_1", "threads": "5", "compression-codec": "1", diff --git a/system_test/replication_testsuite/testcase_0301/testcase_0301_properties.json b/system_test/replication_testsuite/testcase_0301/testcase_0301_properties.json index 496340c..f9b775e 100644 --- a/system_test/replication_testsuite/testcase_0301/testcase_0301_properties.json +++ b/system_test/replication_testsuite/testcase_0301/testcase_0301_properties.json @@ -62,6 +62,7 @@ }, { "entity_id": "4", + "new-producer":"true", "topic": "test_1", "threads": "5", "compression-codec": "0", diff --git a/system_test/replication_testsuite/testcase_0302/testcase_0302_properties.json b/system_test/replication_testsuite/testcase_0302/testcase_0302_properties.json index beabc86..af468c3 100644 --- a/system_test/replication_testsuite/testcase_0302/testcase_0302_properties.json +++ b/system_test/replication_testsuite/testcase_0302/testcase_0302_properties.json @@ -62,6 +62,7 @@ }, { "entity_id": "4", + "new-producer":"true", "topic": "test_1", "threads": "5", "compression-codec": "0", diff --git a/system_test/replication_testsuite/testcase_0303/testcase_0303_properties.json b/system_test/replication_testsuite/testcase_0303/testcase_0303_properties.json index 0e8f5a4..374ff9e 100644 --- a/system_test/replication_testsuite/testcase_0303/testcase_0303_properties.json +++ b/system_test/replication_testsuite/testcase_0303/testcase_0303_properties.json @@ -62,6 +62,7 @@ }, { "entity_id": "4", + "new-producer":"true", "topic": "test_1", "threads": "5", "compression-codec": "0", diff --git a/system_test/replication_testsuite/testcase_0304/testcase_0304_properties.json b/system_test/replication_testsuite/testcase_0304/testcase_0304_properties.json index 98a3855..1b0f2ee 100644 --- a/system_test/replication_testsuite/testcase_0304/testcase_0304_properties.json +++ b/system_test/replication_testsuite/testcase_0304/testcase_0304_properties.json @@ -62,6 +62,7 @@ }, { "entity_id": "4", + "new-producer":"true", "topic": "test_1", "threads": "5", "compression-codec": "0", diff --git a/system_test/replication_testsuite/testcase_0305/testcase_0305_properties.json b/system_test/replication_testsuite/testcase_0305/testcase_0305_properties.json index e09ac9c..568de4b 100644 --- a/system_test/replication_testsuite/testcase_0305/testcase_0305_properties.json +++ b/system_test/replication_testsuite/testcase_0305/testcase_0305_properties.json @@ -62,6 +62,7 @@ }, { "entity_id": "4", + "new-producer":"true", "topic": "test_1", "threads": "5", "compression-codec": "1", diff --git a/system_test/replication_testsuite/testcase_0306/testcase_0306_properties.json b/system_test/replication_testsuite/testcase_0306/testcase_0306_properties.json index bcfe91b..ab93338 100644 --- a/system_test/replication_testsuite/testcase_0306/testcase_0306_properties.json +++ b/system_test/replication_testsuite/testcase_0306/testcase_0306_properties.json @@ -62,6 +62,7 @@ }, { "entity_id": "4", + "new-producer":"true", "topic": "test_1", "threads": "5", "compression-codec": "1", diff --git a/system_test/replication_testsuite/testcase_0307/testcase_0307_properties.json b/system_test/replication_testsuite/testcase_0307/testcase_0307_properties.json index da07a9e..06b0623 100644 --- a/system_test/replication_testsuite/testcase_0307/testcase_0307_properties.json +++ b/system_test/replication_testsuite/testcase_0307/testcase_0307_properties.json @@ -62,6 +62,7 @@ }, { "entity_id": "4", + "new-producer":"true", "topic": "test_1", "threads": "5", "compression-codec": "1", diff --git a/system_test/replication_testsuite/testcase_0308/testcase_0308_properties.json b/system_test/replication_testsuite/testcase_0308/testcase_0308_properties.json index 0fecafc..0fda7c6 100644 --- a/system_test/replication_testsuite/testcase_0308/testcase_0308_properties.json +++ b/system_test/replication_testsuite/testcase_0308/testcase_0308_properties.json @@ -62,6 +62,7 @@ }, { "entity_id": "4", + "new-producer":"true", "topic": "test_1", "threads": "5", "compression-codec": "1", diff --git a/system_test/replication_testsuite/testcase_0309/testcase_0309_properties.json b/system_test/replication_testsuite/testcase_0309/testcase_0309_properties.json index 90bd404..2879c8f 100644 --- a/system_test/replication_testsuite/testcase_0309/testcase_0309_properties.json +++ b/system_test/replication_testsuite/testcase_0309/testcase_0309_properties.json @@ -63,6 +63,7 @@ }, { "entity_id": "4", + "new-producer":"true", "topic": "test_1", "threads": "5", "compression-codec": "1", diff --git a/system_test/replication_testsuite/testcase_1/testcase_1_properties.json b/system_test/replication_testsuite/testcase_1/testcase_1_properties.json index 7e1b3fb..2398722 100644 --- a/system_test/replication_testsuite/testcase_1/testcase_1_properties.json +++ b/system_test/replication_testsuite/testcase_1/testcase_1_properties.json @@ -57,6 +57,7 @@ }, { "entity_id": "4", + "new-producer":"true", "topic": "test_1", "threads": "5", "compression-codec": "0", diff --git a/system_test/replication_testsuite/testcase_4001/testcase_4001_properties.json b/system_test/replication_testsuite/testcase_4001/testcase_4001_properties.json index d2ffd95..2652f16 100644 --- a/system_test/replication_testsuite/testcase_4001/testcase_4001_properties.json +++ b/system_test/replication_testsuite/testcase_4001/testcase_4001_properties.json @@ -67,6 +67,7 @@ }, { "entity_id": "4", + "new-producer":"true", "topic": "test_1", "threads": "5", "compression-codec": "0", @@ -80,6 +81,7 @@ }, { "entity_id": "5", + "new-producer":"true", "topic": "test_2", "threads": "5", "compression-codec": "0", diff --git a/system_test/replication_testsuite/testcase_4002/testcase_4002_properties.json b/system_test/replication_testsuite/testcase_4002/testcase_4002_properties.json index c86525d..8724597 100644 --- a/system_test/replication_testsuite/testcase_4002/testcase_4002_properties.json +++ b/system_test/replication_testsuite/testcase_4002/testcase_4002_properties.json @@ -67,6 +67,7 @@ }, { "entity_id": "4", + "new-producer":"true", "topic": "test_1", "threads": "5", "compression-codec": "0", @@ -80,6 +81,7 @@ }, { "entity_id": "5", + "new-producer":"true", "topic": "test_2", "threads": "5", "compression-codec": "0", diff --git a/system_test/replication_testsuite/testcase_4003/testcase_4003_properties.json b/system_test/replication_testsuite/testcase_4003/testcase_4003_properties.json index b77e4fd..4e3b6f5 100644 --- a/system_test/replication_testsuite/testcase_4003/testcase_4003_properties.json +++ b/system_test/replication_testsuite/testcase_4003/testcase_4003_properties.json @@ -67,6 +67,7 @@ }, { "entity_id": "4", + "new-producer":"true", "topic": "test_1", "threads": "5", "compression-codec": "1", @@ -80,6 +81,7 @@ }, { "entity_id": "5", + "new-producer":"true", "topic": "test_2", "threads": "5", "compression-codec": "1", diff --git a/system_test/replication_testsuite/testcase_4004/testcase_4004_properties.json b/system_test/replication_testsuite/testcase_4004/testcase_4004_properties.json index e753327..f8718a6 100644 --- a/system_test/replication_testsuite/testcase_4004/testcase_4004_properties.json +++ b/system_test/replication_testsuite/testcase_4004/testcase_4004_properties.json @@ -67,6 +67,7 @@ }, { "entity_id": "4", + "new-producer":"true", "topic": "test_1", "threads": "5", "compression-codec": "1", @@ -80,6 +81,7 @@ }, { "entity_id": "5", + "new-producer":"true", "topic": "test_2", "threads": "5", "compression-codec": "1", diff --git a/system_test/replication_testsuite/testcase_4005/testcase_4005_properties.json b/system_test/replication_testsuite/testcase_4005/testcase_4005_properties.json index 5468401..af96c7b 100644 --- a/system_test/replication_testsuite/testcase_4005/testcase_4005_properties.json +++ b/system_test/replication_testsuite/testcase_4005/testcase_4005_properties.json @@ -67,6 +67,7 @@ }, { "entity_id": "4", + "new-producer":"true", "topic": "test_1", "threads": "5", "compression-codec": "0", @@ -80,6 +81,7 @@ }, { "entity_id": "5", + "new-producer":"true", "topic": "test_2", "threads": "5", "compression-codec": "0", diff --git a/system_test/replication_testsuite/testcase_4006/testcase_4006_properties.json b/system_test/replication_testsuite/testcase_4006/testcase_4006_properties.json index e5ab0a0..e132236 100644 --- a/system_test/replication_testsuite/testcase_4006/testcase_4006_properties.json +++ b/system_test/replication_testsuite/testcase_4006/testcase_4006_properties.json @@ -67,6 +67,7 @@ }, { "entity_id": "4", + "new-producer":"true", "topic": "test_1", "threads": "5", "compression-codec": "0", @@ -80,6 +81,7 @@ }, { "entity_id": "5", + "new-producer":"true", "topic": "test_2", "threads": "5", "compression-codec": "0", diff --git a/system_test/replication_testsuite/testcase_4007/testcase_4007_properties.json b/system_test/replication_testsuite/testcase_4007/testcase_4007_properties.json index 7aa6e9a..5c4e5bb 100644 --- a/system_test/replication_testsuite/testcase_4007/testcase_4007_properties.json +++ b/system_test/replication_testsuite/testcase_4007/testcase_4007_properties.json @@ -67,6 +67,7 @@ }, { "entity_id": "4", + "new-producer":"true", "topic": "test_1", "threads": "5", "compression-codec": "1", @@ -80,6 +81,7 @@ }, { "entity_id": "5", + "new-producer":"true", "topic": "test_2", "threads": "5", "compression-codec": "1", diff --git a/system_test/replication_testsuite/testcase_4008/testcase_4008_properties.json b/system_test/replication_testsuite/testcase_4008/testcase_4008_properties.json index 08aa108..8dce9b2 100644 --- a/system_test/replication_testsuite/testcase_4008/testcase_4008_properties.json +++ b/system_test/replication_testsuite/testcase_4008/testcase_4008_properties.json @@ -67,6 +67,7 @@ }, { "entity_id": "4", + "new-producer":"true", "topic": "test_1", "threads": "5", "compression-codec": "1", @@ -80,6 +81,7 @@ }, { "entity_id": "5", + "new-producer":"true", "topic": "test_2", "threads": "5", "compression-codec": "1", diff --git a/system_test/replication_testsuite/testcase_4011/testcase_4011_properties.json b/system_test/replication_testsuite/testcase_4011/testcase_4011_properties.json index 512fafb..c6f1d1c 100644 --- a/system_test/replication_testsuite/testcase_4011/testcase_4011_properties.json +++ b/system_test/replication_testsuite/testcase_4011/testcase_4011_properties.json @@ -67,6 +67,7 @@ }, { "entity_id": "4", + "new-producer":"true", "topic": "test_1", "threads": "5", "compression-codec": "0", @@ -80,6 +81,7 @@ }, { "entity_id": "5", + "new-producer":"true", "topic": "test_2", "threads": "5", "compression-codec": "0", diff --git a/system_test/replication_testsuite/testcase_4012/testcase_4012_properties.json b/system_test/replication_testsuite/testcase_4012/testcase_4012_properties.json index 9b711af..bc1ff63 100644 --- a/system_test/replication_testsuite/testcase_4012/testcase_4012_properties.json +++ b/system_test/replication_testsuite/testcase_4012/testcase_4012_properties.json @@ -67,6 +67,7 @@ }, { "entity_id": "4", + "new-producer":"true", "topic": "test_1", "threads": "5", "compression-codec": "0", @@ -80,6 +81,7 @@ }, { "entity_id": "5", + "new-producer":"true", "topic": "test_2", "threads": "5", "compression-codec": "0", diff --git a/system_test/replication_testsuite/testcase_4013/testcase_4013_properties.json b/system_test/replication_testsuite/testcase_4013/testcase_4013_properties.json index 3836366..aa48a68 100644 --- a/system_test/replication_testsuite/testcase_4013/testcase_4013_properties.json +++ b/system_test/replication_testsuite/testcase_4013/testcase_4013_properties.json @@ -67,6 +67,7 @@ }, { "entity_id": "4", + "new-producer":"true", "topic": "test_1", "threads": "5", "compression-codec": "1", @@ -80,6 +81,7 @@ }, { "entity_id": "5", + "new-producer":"true", "topic": "test_2", "threads": "5", "compression-codec": "1", diff --git a/system_test/replication_testsuite/testcase_4014/testcase_4014_properties.json b/system_test/replication_testsuite/testcase_4014/testcase_4014_properties.json index 86ab75a..7acf8b6 100644 --- a/system_test/replication_testsuite/testcase_4014/testcase_4014_properties.json +++ b/system_test/replication_testsuite/testcase_4014/testcase_4014_properties.json @@ -67,6 +67,7 @@ }, { "entity_id": "4", + "new-producer":"true", "topic": "test_1", "threads": "5", "compression-codec": "1", @@ -80,6 +81,7 @@ }, { "entity_id": "5", + "new-producer":"true", "topic": "test_2", "threads": "5", "compression-codec": "1", diff --git a/system_test/replication_testsuite/testcase_4015/testcase_4015_properties.json b/system_test/replication_testsuite/testcase_4015/testcase_4015_properties.json index 82d51b6..7841273 100644 --- a/system_test/replication_testsuite/testcase_4015/testcase_4015_properties.json +++ b/system_test/replication_testsuite/testcase_4015/testcase_4015_properties.json @@ -67,6 +67,7 @@ }, { "entity_id": "4", + "new-producer":"true", "topic": "test_1", "threads": "5", "compression-codec": "0", @@ -80,6 +81,7 @@ }, { "entity_id": "5", + "new-producer":"true", "topic": "test_2", "threads": "5", "compression-codec": "0", diff --git a/system_test/replication_testsuite/testcase_4016/testcase_4016_properties.json b/system_test/replication_testsuite/testcase_4016/testcase_4016_properties.json index 31c1be0..0519d27 100644 --- a/system_test/replication_testsuite/testcase_4016/testcase_4016_properties.json +++ b/system_test/replication_testsuite/testcase_4016/testcase_4016_properties.json @@ -67,6 +67,7 @@ }, { "entity_id": "4", + "new-producer":"true", "topic": "test_1", "threads": "5", "compression-codec": "0", @@ -80,6 +81,7 @@ }, { "entity_id": "5", + "new-producer":"true", "topic": "test_2", "threads": "5", "compression-codec": "0", diff --git a/system_test/replication_testsuite/testcase_4017/testcase_4017_properties.json b/system_test/replication_testsuite/testcase_4017/testcase_4017_properties.json index 72f78b0..c29077b 100644 --- a/system_test/replication_testsuite/testcase_4017/testcase_4017_properties.json +++ b/system_test/replication_testsuite/testcase_4017/testcase_4017_properties.json @@ -67,6 +67,7 @@ }, { "entity_id": "4", + "new-producer":"true", "topic": "test_1", "threads": "5", "compression-codec": "1", @@ -80,6 +81,7 @@ }, { "entity_id": "5", + "new-producer":"true", "topic": "test_2", "threads": "5", "compression-codec": "1", diff --git a/system_test/replication_testsuite/testcase_4018/testcase_4018_properties.json b/system_test/replication_testsuite/testcase_4018/testcase_4018_properties.json index ee459f4..ab57e5a 100644 --- a/system_test/replication_testsuite/testcase_4018/testcase_4018_properties.json +++ b/system_test/replication_testsuite/testcase_4018/testcase_4018_properties.json @@ -67,6 +67,7 @@ }, { "entity_id": "4", + "new-producer":"true", "topic": "test_1", "threads": "5", "compression-codec": "1", @@ -80,6 +81,7 @@ }, { "entity_id": "5", + "new-producer":"true", "topic": "test_2", "threads": "5", "compression-codec": "1", diff --git a/system_test/replication_testsuite/testcase_9051/testcase_9051_properties.json b/system_test/replication_testsuite/testcase_9051/testcase_9051_properties.json index 958eef7..e959aed 100644 --- a/system_test/replication_testsuite/testcase_9051/testcase_9051_properties.json +++ b/system_test/replication_testsuite/testcase_9051/testcase_9051_properties.json @@ -60,6 +60,7 @@ }, { "entity_id": "4", + "new-producer":"true", "topic": "t001", "threads": "5", "compression-codec": "0", diff --git a/system_test/utils/kafka_system_test_utils.py b/system_test/utils/kafka_system_test_utils.py index 5d2b7df..29ab2ba 100644 --- a/system_test/utils/kafka_system_test_utils.py +++ b/system_test/utils/kafka_system_test_utils.py @@ -696,6 +696,7 @@ def start_entity_in_background(systemTestEnv, testcaseEnv, entityId): configFile = system_test_utils.get_data_by_lookup_keyval(testcaseConfigsList, "entity_id", entityId, "config_filename") logFile = system_test_utils.get_data_by_lookup_keyval(testcaseConfigsList, "entity_id", entityId, "log_filename") + useNewProducer = system_test_utils.get_data_by_lookup_keyval(testcaseConfigsList, "entity_id", entityId, "new-producer") mmConsumerConfigFile = system_test_utils.get_data_by_lookup_keyval(testcaseConfigsList, "entity_id", entityId, "mirror_consumer_config_filename") mmProducerConfigFile = system_test_utils.get_data_by_lookup_keyval(testcaseConfigsList, "entity_id", entityId, @@ -729,15 +730,26 @@ def start_entity_in_background(systemTestEnv, testcaseEnv, entityId): logPathName + "/entity_" + entityId + "_pid'"] elif role == "mirror_maker": - cmdList = ["ssh " + hostname, - "'JAVA_HOME=" + javaHome, - "JMX_PORT=" + jmxPort, - kafkaHome + "/bin/kafka-run-class.sh kafka.tools.MirrorMaker", - "--consumer.config " + configPathName + "/" + mmConsumerConfigFile, - "--producer.config " + configPathName + "/" + mmProducerConfigFile, - "--whitelist=\".*\" >> ", - logPathName + "/" + logFile + " & echo pid:$! > ", - logPathName + "/entity_" + entityId + "_pid'"] + if useNewProducer.lower() == "true": + cmdList = ["ssh " + hostname, + "'JAVA_HOME=" + javaHome, + "JMX_PORT=" + jmxPort, + kafkaHome + "/bin/kafka-run-class.sh kafka.tools.newproducer.MirrorMaker", + "--consumer.config " + configPathName + "/" + mmConsumerConfigFile, + "--producer.config " + configPathName + "/" + mmProducerConfigFile, + "--whitelist=\".*\" >> ", + logPathName + "/" + logFile + " & echo pid:$! > ", + logPathName + "/entity_" + entityId + "_pid'"] + else: + cmdList = ["ssh " + hostname, + "'JAVA_HOME=" + javaHome, + "JMX_PORT=" + jmxPort, + kafkaHome + "/bin/kafka-run-class.sh kafka.tools.MirrorMaker", + "--consumer.config " + configPathName + "/" + mmConsumerConfigFile, + "--producer.config " + configPathName + "/" + mmProducerConfigFile, + "--whitelist=\".*\" >> ", + logPathName + "/" + logFile + " & echo pid:$! > ", + logPathName + "/entity_" + entityId + "_pid'"] cmdStr = " ".join(cmdList) @@ -960,6 +972,7 @@ def start_producer_in_thread(testcaseEnv, entityConfigList, producerConfig, kafk noMsgPerBatch = system_test_utils.get_data_by_lookup_keyval(testcaseConfigsList, "entity_id", entityId, "message") requestNumAcks = system_test_utils.get_data_by_lookup_keyval(testcaseConfigsList, "entity_id", entityId, "request-num-acks") syncMode = system_test_utils.get_data_by_lookup_keyval(testcaseConfigsList, "entity_id", entityId, "sync") + useNewProducer = system_test_utils.get_data_by_lookup_keyval(testcaseConfigsList, "entity_id", entityId, "new-producer") retryBackoffMs = system_test_utils.get_data_by_lookup_keyval(testcaseConfigsList, "entity_id", entityId, "producer-retry-backoff-ms") numOfRetries = system_test_utils.get_data_by_lookup_keyval(testcaseConfigsList, "entity_id", entityId, "producer-num-retries") @@ -998,6 +1011,8 @@ def start_producer_in_thread(testcaseEnv, entityConfigList, producerConfig, kafk boolArgumentsStr = "" if syncMode.lower() == "true": boolArgumentsStr = boolArgumentsStr + " --sync" + if useNewProducer.lower() == "true": + boolArgumentsStr = boolArgumentsStr + " --new-producer" # keep calling producer until signaled to stop by: # testcaseEnv.userDefinedEnvVarDict["stopBackgroundProducer"] @@ -1506,6 +1521,7 @@ def stop_all_remote_running_processes(systemTestEnv, testcaseEnv): logger.info("status of backgroundProducerStopped : [" + \ str(testcaseEnv.userDefinedEnvVarDict["backgroundProducerStopped"]) + "]", extra=d) if testcaseEnv.userDefinedEnvVarDict["backgroundProducerStopped"]: + testcaseEnv.lock.release() logger.info("all producer threads completed", extra=d) break testcaseEnv.lock.release()