From 00ab70da7c1ad10be87ddec2a62ed6b6d4ae3d7b Mon Sep 17 00:00:00 2001 From: Andy Yang Date: Fri, 10 Mar 2023 14:45:02 -0500 Subject: [PATCH] sql: deflake mixed version user ID migration logic tests This patch adds a sleep directive into the mixed version user ID migration logic tests to reduce the flakiness caused by the cluster upgrades not finishing quickly enough. Release note: None --- .../logic_test/mixed_version_external_connections_owner_id | 3 +++ .../testdata/logic_test/mixed_version_role_members_user_ids | 1 + 2 files changed, 4 insertions(+) diff --git a/pkg/sql/logictest/testdata/logic_test/mixed_version_external_connections_owner_id b/pkg/sql/logictest/testdata/logic_test/mixed_version_external_connections_owner_id index 5c1f9514a473..6fd2a1762935 100644 --- a/pkg/sql/logictest/testdata/logic_test/mixed_version_external_connections_owner_id +++ b/pkg/sql/logictest/testdata/logic_test/mixed_version_external_connections_owner_id @@ -29,11 +29,14 @@ connection1 t connection2 t # Wait for migrations to run and verify that owner_id column is now present. +# The sleep directive is needed to reduce flakiness. upgrade 0 upgrade 2 +sleep 10s + query B retry SELECT crdb_internal.is_at_least_version('1000022.2-76') ---- diff --git a/pkg/sql/logictest/testdata/logic_test/mixed_version_role_members_user_ids b/pkg/sql/logictest/testdata/logic_test/mixed_version_role_members_user_ids index 6f609e5ea94f..a80f2e7353a4 100644 --- a/pkg/sql/logictest/testdata/logic_test/mixed_version_role_members_user_ids +++ b/pkg/sql/logictest/testdata/logic_test/mixed_version_role_members_user_ids @@ -110,6 +110,7 @@ SELECT crdb_internal.node_executable_version() SIMILAR TO '1000022.2-%' true # Wait for migrations to run. +# The sleep directive is needed to reduce flakiness. sleep 10s