From 8c0ddb05c33713cf71f62fb7ee9030d360059f05 Mon Sep 17 00:00:00 2001 From: Michal Maslanka Date: Fri, 30 Sep 2022 10:18:32 +0200 Subject: [PATCH] tests: allow logging unsupported api version entry when upgrading Older redpanda versions may not support some of the APIs in versions that the client currently use. Added allowed error log entry to tolerate this situation during an upgrade test. Fixes: #5868 Signed-off-by: Michal Maslanka --- .../rptest/tests/partition_movement_upgrade_test.py | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/tests/rptest/tests/partition_movement_upgrade_test.py b/tests/rptest/tests/partition_movement_upgrade_test.py index 5cabdb74187df..18aabc958457a 100644 --- a/tests/rptest/tests/partition_movement_upgrade_test.py +++ b/tests/rptest/tests/partition_movement_upgrade_test.py @@ -7,6 +7,7 @@ # the Business Source License, use of this software will be governed # by the Apache License, Version 2.0 +import re import threading from time import sleep import requests @@ -100,9 +101,14 @@ def stop_moving_partitions(self): self._stop_move.set() self.move_worker.join() - - @ok_to_fail # https://github.com/redpanda-data/redpanda/issues/5868 - @cluster(num_nodes=6, log_allow_list=RESTART_LOG_ALLOW_LIST) + # Allow unsupported version error log entry for older redpanda versions + unsupported_api_version_log_entry = re.compile( + "kafka rpc protocol - Error\[applying protocol\] .*Unsupported version \d+ for .*" + ) + + @cluster(num_nodes=6, + log_allow_list=RESTART_LOG_ALLOW_LIST + + [unsupported_api_version_log_entry]) def test_basic_upgrade(self): topic = TopicSpec(partition_count=16, replication_factor=3) self.client().create_topic(topic)