Merge cockroachdb#98401

98401: sql: deflake mixed version user ID migration logic tests r=adityamaru a=andyyang890 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. Informs cockroachdb#92342 Release note: None Co-authored-by: Andy Yang <[email protected]>
jeffswenson · Mar 11, 2023 · 9568438 · 9568438
2 parents 3b88952 + 00ab70d
commit 9568438
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
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
@@ -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
@@ -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
-Original file line number
+Diff line change
@@ Expand Up @@
     true
     # Wait for migrations to run.
+    # The sleep directive is needed to reduce flakiness.
     sleep 10s
@@ Expand Down @@