diff --git a/system_test/migration_tool_testsuite/0.7/lib/kafka-perf-0.7.0.jar b/system_test/migration_tool_testsuite/0.7/lib/kafka-perf-0.7.0.jar index b1d7c7ebde0..d4f89d54907 100644 Binary files a/system_test/migration_tool_testsuite/0.7/lib/kafka-perf-0.7.0.jar and b/system_test/migration_tool_testsuite/0.7/lib/kafka-perf-0.7.0.jar differ diff --git a/system_test/migration_tool_testsuite/config/migration_producer.properties b/system_test/migration_tool_testsuite/config/migration_producer.properties index 175080778ab..17b5928a121 100644 --- a/system_test/migration_tool_testsuite/config/migration_producer.properties +++ b/system_test/migration_tool_testsuite/config/migration_producer.properties @@ -61,3 +61,6 @@ serializer.class=kafka.serializer.DefaultEncoder # the number of messages batched at the producer #batch.num.messages= + +message.send.max.retries=3 +request.required.acks=1 diff --git a/system_test/migration_tool_testsuite/migration_tool_test.py b/system_test/migration_tool_testsuite/migration_tool_test.py index 5d22f83ce2c..ce6f4f684be 100644 --- a/system_test/migration_tool_testsuite/migration_tool_test.py +++ b/system_test/migration_tool_testsuite/migration_tool_test.py @@ -76,6 +76,8 @@ class MigrationToolTest(ReplicationUtils, SetupUtils): self.testSuiteAbsPathName, SystemTestEnv.SYSTEM_TEST_CASE_PREFIX) testCasePathNameList.sort() + replicationUtils = ReplicationUtils(self) + # ============================================================= # launch each testcase one by one: testcase_1, testcase_2, ... # ============================================================= @@ -284,7 +286,7 @@ class MigrationToolTest(ReplicationUtils, SetupUtils): # validate the data matched and checksum # ============================================= self.log_message("validating data matched") - kafka_system_test_utils.validate_07_08_migrated_data_matched(self.systemTestEnv, self.testcaseEnv) + kafka_system_test_utils.validate_data_matched(self.systemTestEnv, self.testcaseEnv, replicationUtils) kafka_system_test_utils.validate_broker_log_segment_checksum(self.systemTestEnv, self.testcaseEnv) # ============================================= diff --git a/system_test/migration_tool_testsuite/testcase_9001/testcase_9001_properties.json b/system_test/migration_tool_testsuite/testcase_9001/testcase_9001_properties.json index 1904ab5b948..608e3bdf79c 100644 --- a/system_test/migration_tool_testsuite/testcase_9001/testcase_9001_properties.json +++ b/system_test/migration_tool_testsuite/testcase_9001/testcase_9001_properties.json @@ -100,7 +100,6 @@ "group.id": "mytestgroup", "consumer-timeout-ms": "10000", "log_filename": "console_consumer_8.log", - "formatter": "kafka.consumer.ChecksumMessageFormatter", "config_filename": "console_consumer_8.properties" }, { diff --git a/system_test/migration_tool_testsuite/testcase_9003/testcase_9003_properties.json b/system_test/migration_tool_testsuite/testcase_9003/testcase_9003_properties.json index 8cacc69a74c..333256c8f53 100644 --- a/system_test/migration_tool_testsuite/testcase_9003/testcase_9003_properties.json +++ b/system_test/migration_tool_testsuite/testcase_9003/testcase_9003_properties.json @@ -101,7 +101,6 @@ "group.id": "mytestgroup", "consumer-timeout-ms": "10000", "log_filename": "console_consumer_8.log", - "formatter": "kafka.consumer.ChecksumMessageFormatter", "config_filename": "console_consumer_8.properties" }, { diff --git a/system_test/migration_tool_testsuite/testcase_9004/testcase_9004_properties.json b/system_test/migration_tool_testsuite/testcase_9004/testcase_9004_properties.json index 4dbd80b5c82..b2a6e85e575 100644 --- a/system_test/migration_tool_testsuite/testcase_9004/testcase_9004_properties.json +++ b/system_test/migration_tool_testsuite/testcase_9004/testcase_9004_properties.json @@ -101,7 +101,6 @@ "group.id": "mytestgroup", "consumer-timeout-ms": "10000", "log_filename": "console_consumer_8.log", - "formatter": "kafka.consumer.ChecksumMessageFormatter", "config_filename": "console_consumer_8.properties" }, { diff --git a/system_test/migration_tool_testsuite/testcase_9005/testcase_9005_properties.json b/system_test/migration_tool_testsuite/testcase_9005/testcase_9005_properties.json index e46b4538c95..ddbc9050690 100644 --- a/system_test/migration_tool_testsuite/testcase_9005/testcase_9005_properties.json +++ b/system_test/migration_tool_testsuite/testcase_9005/testcase_9005_properties.json @@ -128,7 +128,6 @@ "group.id": "mytestgroup", "consumer-timeout-ms": "10000", "log_filename": "console_consumer_10.log", - "formatter": "kafka.consumer.ChecksumMessageFormatter", "config_filename": "console_consumer_10.properties" }, { @@ -137,7 +136,6 @@ "group.id": "mytestgroup", "consumer-timeout-ms": "10000", "log_filename": "console_consumer_11.log", - "formatter": "kafka.consumer.ChecksumMessageFormatter", "config_filename": "console_consumer_11.properties" }, diff --git a/system_test/migration_tool_testsuite/testcase_9006/testcase_9006_properties.json b/system_test/migration_tool_testsuite/testcase_9006/testcase_9006_properties.json index 10f5955cd83..21b4c40e207 100644 --- a/system_test/migration_tool_testsuite/testcase_9006/testcase_9006_properties.json +++ b/system_test/migration_tool_testsuite/testcase_9006/testcase_9006_properties.json @@ -128,7 +128,6 @@ "group.id": "mytestgroup", "consumer-timeout-ms": "10000", "log_filename": "console_consumer_10.log", - "formatter": "kafka.consumer.ChecksumMessageFormatter", "config_filename": "console_consumer_10.properties" }, { @@ -137,7 +136,6 @@ "group.id": "mytestgroup", "consumer-timeout-ms": "10000", "log_filename": "console_consumer_11.log", - "formatter": "kafka.consumer.ChecksumMessageFormatter", "config_filename": "console_consumer_11.properties" }, diff --git a/system_test/utils/kafka_system_test_utils.py b/system_test/utils/kafka_system_test_utils.py index de16a341156..35fc383933d 100644 --- a/system_test/utils/kafka_system_test_utils.py +++ b/system_test/utils/kafka_system_test_utils.py @@ -1047,6 +1047,7 @@ def start_producer_in_thread(testcaseEnv, entityConfigList, producerConfig, kafk "JMX_PORT=" + jmxPort, kafkaRunClassBin + " kafka.perf.ProducerPerformance", "--brokerinfo " + brokerInfoStr, + "--initial-message-id " + str(initMsgId), "--messages " + noMsgPerBatch, "--topic " + topic, "--threads " + threads,