[kafka] branch trunk updated: MINOR: Add 2.1 version metadata upgrade (#6111)

[guozhang]

This is an automated email from the ASF dual-hosted git repository.

guozhang pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/kafka.git


The following commit(s) were added to refs/heads/trunk by this push:
     new b1b792d  MINOR: Add 2.1 version metadata upgrade (#6111)
b1b792d is described below

commit b1b792d9a81530fb872176c8d30e5b473f59e12f
Author: Bill Bejeck <bbej...@gmail.com>
AuthorDate: Wed Jan 9 18:19:00 2019 -0500

    MINOR: Add 2.1 version metadata upgrade (#6111)
    
    Updated the test_metadata_upgrade test. To enable using the 2.1 version I 
needed to add config change to the StreamsUpgradeTestJobRunnerService to ensure 
the ductape passes proper args when starting the StreamsUpgradeTest
    
    For testing, I ran the test_metadata_upgrade test and all versions now pass 
http://confluent-kafka-branch-builder-system-test-results.s3-us-west-2.amazonaws.com/2019-01-09--001.1547049873--bbejeck--MINOR_add_2_1_version_metadata_upgrade--a450c68/report.html
    
    Reviewers: Matthias J. Sax <matth...@confluent.io>, Guozhang Wang 
<wangg...@gmail.com>
---
 tests/kafkatest/services/streams.py                   | 5 +++--
 tests/kafkatest/tests/streams/streams_upgrade_test.py | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/tests/kafkatest/services/streams.py 
b/tests/kafkatest/services/streams.py
index 29a235e..771b67f 100644
--- a/tests/kafkatest/services/streams.py
+++ b/tests/kafkatest/services/streams.py
@@ -21,7 +21,7 @@ from ducktape.utils.util import wait_until
 from kafkatest.directory_layout.kafka_path import KafkaPathResolverMixin
 from kafkatest.services.kafka import KafkaConfig
 from kafkatest.services.monitor.jmx import JmxMixin
-from kafkatest.version import LATEST_0_10_0, LATEST_0_10_1, LATEST_0_10_2, 
LATEST_0_11_0, LATEST_1_0, LATEST_1_1, LATEST_2_0
+from kafkatest.version import LATEST_0_10_0, LATEST_0_10_1, LATEST_0_10_2, 
LATEST_0_11_0, LATEST_1_0, LATEST_1_1, LATEST_2_0, LATEST_2_1
 
 STATE_DIR = "state.dir"
 
@@ -482,7 +482,8 @@ class 
StreamsUpgradeTestJobRunnerService(StreamsTestBaseService):
     def start_cmd(self, node):
         args = self.args.copy()
         if self.KAFKA_STREAMS_VERSION in [str(LATEST_0_10_0), 
str(LATEST_0_10_1), str(LATEST_0_10_2),
-                                          str(LATEST_0_11_0), str(LATEST_1_0), 
str(LATEST_1_1), str(LATEST_2_0)]:
+                                          str(LATEST_0_11_0), str(LATEST_1_0), 
str(LATEST_1_1),
+                                          str(LATEST_2_0), str(LATEST_2_1)]:
             args['kafka'] = self.kafka.bootstrap_servers()
         else:
             args['kafka'] = ""
diff --git a/tests/kafkatest/tests/streams/streams_upgrade_test.py 
b/tests/kafkatest/tests/streams/streams_upgrade_test.py
index 57eaad5..885aefe 100644
--- a/tests/kafkatest/tests/streams/streams_upgrade_test.py
+++ b/tests/kafkatest/tests/streams/streams_upgrade_test.py
@@ -34,7 +34,7 @@ metadata_2_versions = [str(LATEST_0_10_1), 
str(LATEST_0_10_2), str(LATEST_0_11_0
 # once 0.10.1.2 is available backward_compatible_metadata_2_versions
 # can be replaced with metadata_2_versions
 backward_compatible_metadata_2_versions = [str(LATEST_0_10_2), 
str(LATEST_0_11_0), str(LATEST_1_0), str(LATEST_1_1)]
-metadata_3_or_higher_versions = [str(LATEST_2_0), str(DEV_VERSION)]
+metadata_3_or_higher_versions = [str(LATEST_2_0), str(LATEST_2_1), 
str(DEV_VERSION)]
 
 class StreamsUpgradeTest(Test):
     """