From 300eef3fe50e325e04b934edeb82676cdf6e10b7 Mon Sep 17 00:00:00 2001 From: Steven Danna Date: Thu, 13 Oct 2022 11:39:20 +0100 Subject: [PATCH] backupccl: unskip restore-grants This test was skipped because it timed out. I believe #89900 is the likely cause of the timeout. Since this test doesn't depend on the shorter closed timestamp setting, we can reset them to make the timeout much less likely. Fixes #87129 Release note: None --- .../testdata/backup-restore/restore-grants | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/pkg/ccl/backupccl/testdata/backup-restore/restore-grants b/pkg/ccl/backupccl/testdata/backup-restore/restore-grants index afcb62aa8530..d47a77e77957 100644 --- a/pkg/ccl/backupccl/testdata/backup-restore/restore-grants +++ b/pkg/ccl/backupccl/testdata/backup-restore/restore-grants @@ -1,6 +1,3 @@ -skip issue-num=87129 ----- - # Ensure that non-cluster restores appropriately wipes the grants on the # restored descriptors. Since we're not restoring the users, the users that # the restoring descriptors reference may not be the same users as they @@ -11,6 +8,17 @@ skip issue-num=87129 new-server name=s1 allow-implicit-access ---- +# TODO(ssd): We reset the closed timestamp configurables to avoid schema +# change transactions entering a retry loop with the lease acquisition +# transactions. See https://github.com/cockroachdb/cockroach/issues/89900 +exec-sql +SET CLUSTER SETTING kv.closed_timestamp.target_duration = '3s'; +---- + +exec-sql +SET CLUSTER SETTING kv.closed_timestamp.side_transport_interval= '200ms'; +---- + # First, let's create some users, a database, a couple of types, some tables, # and a schema. exec-sql