Skip to content

Commit

Permalink
backupccl: unskip restore-grants
Browse files Browse the repository at this point in the history
This test was skipped because it timed out.

I believe cockroachdb#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 cockroachdb#87129

Release note: None
  • Loading branch information
stevendanna committed Oct 13, 2022
1 parent 1c37771 commit 300eef3
Showing 1 changed file with 11 additions and 3 deletions.
14 changes: 11 additions & 3 deletions pkg/ccl/backupccl/testdata/backup-restore/restore-grants
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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
Expand Down

0 comments on commit 300eef3

Please sign in to comment.