From 716faf01cb6d0664ab3bbee6f2a83773271a7fb4 Mon Sep 17 00:00:00 2001 From: Rafi Shamim Date: Mon, 19 Aug 2024 11:08:30 -0400 Subject: [PATCH] logictest: deflake cross_version_tenant_backup This makes the test less flaky by making sure finalization is complete before beginning the RESTORE. Release note: None --- .../testdata/logic_test/cross_version_tenant_backup | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkg/sql/logictest/testdata/logic_test/cross_version_tenant_backup b/pkg/sql/logictest/testdata/logic_test/cross_version_tenant_backup index 2a9fc0e23386..ff43786ada81 100644 --- a/pkg/sql/logictest/testdata/logic_test/cross_version_tenant_backup +++ b/pkg/sql/logictest/testdata/logic_test/cross_version_tenant_backup @@ -19,11 +19,11 @@ foo 3 statement ok BACKUP TENANT 3 INTO 'userfile:///1/example' -upgrade 0 +upgrade all -upgrade 1 - -upgrade 2 +# Wait for upgrade to finalize. +statement ok +SET CLUSTER SETTING version = crdb_internal.node_executable_version() statement ok RESTORE TENANT 3 FROM LATEST IN 'userfile:///1/example' with tenant_name = 'baz'