kafka-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jun...@apache.org
Subject [06/36] git commit: kafka-883; System Test - update migration tool testsuite after 0.7 ProducerPerformance sends seq MessageID; patched by John Fung; reviewed by Jun Rao
Date Wed, 11 Sep 2013 17:03:51 GMT
kafka-883; System Test - update migration tool testsuite after 0.7 ProducerPerformance sends
seq MessageID; patched by John Fung; reviewed by Jun Rao


Project: http://git-wip-us.apache.org/repos/asf/kafka/repo
Commit: http://git-wip-us.apache.org/repos/asf/kafka/commit/ce7d5880
Tree: http://git-wip-us.apache.org/repos/asf/kafka/tree/ce7d5880
Diff: http://git-wip-us.apache.org/repos/asf/kafka/diff/ce7d5880

Branch: refs/heads/trunk
Commit: ce7d588055e7d3aacebcc696665b1260fa2e9063
Parents: f596ab5
Author: John Fung <fung.john@gmail.com>
Authored: Tue Jul 23 10:32:30 2013 -0700
Committer: Jun Rao <junrao@gmail.com>
Committed: Tue Jul 23 10:32:30 2013 -0700

----------------------------------------------------------------------
 .../0.7/lib/kafka-perf-0.7.0.jar                | Bin 52975 -> 55427 bytes
 .../config/migration_producer.properties        |   3 +++
 .../migration_tool_test.py                      |   4 +++-
 .../testcase_9001/testcase_9001_properties.json |   1 -
 .../testcase_9003/testcase_9003_properties.json |   1 -
 .../testcase_9004/testcase_9004_properties.json |   1 -
 .../testcase_9005/testcase_9005_properties.json |   2 --
 .../testcase_9006/testcase_9006_properties.json |   2 --
 system_test/utils/kafka_system_test_utils.py    |   1 +
 9 files changed, 7 insertions(+), 8 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/kafka/blob/ce7d5880/system_test/migration_tool_testsuite/0.7/lib/kafka-perf-0.7.0.jar
----------------------------------------------------------------------
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 b1d7c7e..d4f89d5 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

http://git-wip-us.apache.org/repos/asf/kafka/blob/ce7d5880/system_test/migration_tool_testsuite/config/migration_producer.properties
----------------------------------------------------------------------
diff --git a/system_test/migration_tool_testsuite/config/migration_producer.properties b/system_test/migration_tool_testsuite/config/migration_producer.properties
index 1750807..17b5928 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

http://git-wip-us.apache.org/repos/asf/kafka/blob/ce7d5880/system_test/migration_tool_testsuite/migration_tool_test.py
----------------------------------------------------------------------
diff --git a/system_test/migration_tool_testsuite/migration_tool_test.py b/system_test/migration_tool_testsuite/migration_tool_test.py
index 5d22f83..ce6f4f6 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)
 
                 # =============================================

http://git-wip-us.apache.org/repos/asf/kafka/blob/ce7d5880/system_test/migration_tool_testsuite/testcase_9001/testcase_9001_properties.json
----------------------------------------------------------------------
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 1904ab5..608e3bd 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"
     },
     {

http://git-wip-us.apache.org/repos/asf/kafka/blob/ce7d5880/system_test/migration_tool_testsuite/testcase_9003/testcase_9003_properties.json
----------------------------------------------------------------------
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 8cacc69..333256c 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"
     },
     {

http://git-wip-us.apache.org/repos/asf/kafka/blob/ce7d5880/system_test/migration_tool_testsuite/testcase_9004/testcase_9004_properties.json
----------------------------------------------------------------------
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 4dbd80b..b2a6e85 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"
     },
     {

http://git-wip-us.apache.org/repos/asf/kafka/blob/ce7d5880/system_test/migration_tool_testsuite/testcase_9005/testcase_9005_properties.json
----------------------------------------------------------------------
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 e46b453..ddbc905 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"
     },
 

http://git-wip-us.apache.org/repos/asf/kafka/blob/ce7d5880/system_test/migration_tool_testsuite/testcase_9006/testcase_9006_properties.json
----------------------------------------------------------------------
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 10f5955..21b4c40 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"
     },
 

http://git-wip-us.apache.org/repos/asf/kafka/blob/ce7d5880/system_test/utils/kafka_system_test_utils.py
----------------------------------------------------------------------
diff --git a/system_test/utils/kafka_system_test_utils.py b/system_test/utils/kafka_system_test_utils.py
index de16a34..35fc383 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,


Mime
View raw message