Skip to content

Commit

Permalink
backupccl: enable restore-grants test on tenant
Browse files Browse the repository at this point in the history
This test passed under stress for 5 hours, which seems sufficient to
unskip it.

The underlying issue described in #89900 appears to be much harder to
reproduce and may now be resolved.

Informs #89900
Fixes #90444

Epic: none

Release note: None
  • Loading branch information
stevendanna committed Jul 4, 2023
1 parent fa2d7f7 commit 28e0cf8
Showing 1 changed file with 1 addition and 16 deletions.
17 changes: 1 addition & 16 deletions pkg/ccl/backupccl/testdata/backup-restore/restore-grants
Original file line number Diff line number Diff line change
Expand Up @@ -3,24 +3,9 @@
# the restoring descriptors reference may not be the same users as they
# referenced in the backed up cluster.

# TODO(DisasterRecovery): this test currently hangs when run within a tenant
# (see https://github.com/cockroachdb/cockroach/issues/90444), and should be refactored
# to run smoothly in a tenant.

# We allow implicit access to non-admin users so that we can test
# with nodelocal.
new-cluster name=s1 allow-implicit-access disable-tenant
----

# 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';
new-cluster name=s1 allow-implicit-access
----

# First, let's create some users, a database, a couple of types, some tables,
Expand Down

0 comments on commit 28e0cf8

Please sign in to comment.