kafka-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From guozh...@apache.org
Subject [kafka] branch 2.4 updated: HOTFIX: fix bug in VP test where it greps for the wrong log message (#7642)
Date Tue, 05 Nov 2019 00:15:11 GMT
This is an automated email from the ASF dual-hosted git repository.

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


The following commit(s) were added to refs/heads/2.4 by this push:
     new 6fc17bc  HOTFIX: fix bug in VP test where it greps for the wrong log message (#7642)
6fc17bc is described below

commit 6fc17bcadd4b28eeb6922cf289fcc9bd2e4c8e7a
Author: A. Sophie Blee-Goldman <sophie@confluent.io>
AuthorDate: Mon Nov 4 16:14:25 2019 -0800

    HOTFIX: fix bug in VP test where it greps for the wrong log message (#7642)
    
    We added more version info to the log messages but must not have cleanly backported the
test update -- looking back it seems like older versions might also need a fix (separate PR
as the version numbers are different in 2.1-2.3)
    
    Reviewers: Boyang Chen <boyang@confluent.io>, Guozhang Wang <wangguoz@gmail.com>
---
 .../test/java/org/apache/kafka/streams/tests/StreamsUpgradeTest.java  | 4 +++-
 tests/kafkatest/tests/streams/streams_upgrade_test.py                 | 4 ++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/streams/src/test/java/org/apache/kafka/streams/tests/StreamsUpgradeTest.java
b/streams/src/test/java/org/apache/kafka/streams/tests/StreamsUpgradeTest.java
index bcb6d82..5215d5c 100644
--- a/streams/src/test/java/org/apache/kafka/streams/tests/StreamsUpgradeTest.java
+++ b/streams/src/test/java/org/apache/kafka/streams/tests/StreamsUpgradeTest.java
@@ -239,7 +239,9 @@ public class StreamsUpgradeTest {
                                 info.prevTasks(),
                                 info.standbyTasks(),
                                 info.userEndPoint())
-                                .encode()));
+                                .encode(),
+                            subscription.ownedPartitions()
+                        ));
                 }
                 assignment = super.assign(metadata, new GroupSubscription(downgradedSubscriptions)).groupAssignment();
                 bumpUsedVersion = true;
diff --git a/tests/kafkatest/tests/streams/streams_upgrade_test.py b/tests/kafkatest/tests/streams/streams_upgrade_test.py
index 00dbe35..25fe065 100644
--- a/tests/kafkatest/tests/streams/streams_upgrade_test.py
+++ b/tests/kafkatest/tests/streams/streams_upgrade_test.py
@@ -527,11 +527,11 @@ class StreamsUpgradeTest(Test):
                     monitors[second_other_processor] = second_other_monitor
 
                     if len(self.old_processors) > 0:
-                        log_monitor.wait_until("Sent a version 6 subscription and got version
5 assignment back (successful version probing). Downgrade subscription metadata to commonly
supported version and trigger new rebalance.",
+                        log_monitor.wait_until("Sent a version 6 subscription and got version
5 assignment back (successful version probing). Downgrade subscription metadata to commonly
supported version 5 and trigger new rebalance.",
                                                timeout_sec=60,
                                                err_msg="Could not detect 'successful version
probing' at upgrading node " + str(node.account))
                     else:
-                        log_monitor.wait_until("Sent a version 6 subscription and got version
5 assignment back (successful version probing). Downgrade subscription metadata to commonly
supported version and trigger new rebalance.",
+                        log_monitor.wait_until("Sent a version 6 subscription and got version
5 assignment back (successful version probing). Downgrade subscription metadata to commonly
supported version 6 and trigger new rebalance.",
                                                timeout_sec=60,
                                                err_msg="Could not detect 'successful version
probing with upgraded leader' at upgrading node " + str(node.account))
                         first_other_monitor.wait_until("Sent a version 5 subscription and
group.s latest commonly supported version is 6 (successful version probing and end of rolling
upgrade). Upgrading subscription metadata version to 6 for next rebalance.",


Mime
View raw message