Skip to content

Commit

Permalink
multitenant: reduce capability unrelated test churn
Browse files Browse the repository at this point in the history
Filter out static capabilities in `subtest node_tenant_capabilities_cache`.

Release note: None
  • Loading branch information
ecwall committed Mar 10, 2023
1 parent 9996674 commit 3f366fd
Showing 1 changed file with 8 additions and 20 deletions.
28 changes: 8 additions & 20 deletions pkg/ccl/logictestccl/testdata/logic_test/crdb_internal
Original file line number Diff line number Diff line change
Expand Up @@ -191,33 +191,21 @@ SELECT crdb_internal.create_tenant(5)

# Use retry because source data is eventually consistent.
query ITT colnames,retry
SELECT * FROM crdb_internal.node_tenant_capabilities_cache
SELECT * FROM crdb_internal.node_tenant_capabilities_cache WHERE capability_id = 'can_admin_split'
----
tenant_id capability_id capability_value
1 can_admin_split false
1 can_admin_unsplit false
1 can_view_node_info false
1 can_view_tsdb_metrics false
5 can_admin_split false
5 can_admin_unsplit false
5 can_view_node_info false
5 can_view_tsdb_metrics false
tenant_id capability_id capability_value
1 can_admin_split false
5 can_admin_split false

statement ok
ALTER TENANT [5] GRANT CAPABILITY can_admin_split

# Use retry because source data is eventually consistent.
query ITT colnames,retry
SELECT * FROM crdb_internal.node_tenant_capabilities_cache
SELECT * FROM crdb_internal.node_tenant_capabilities_cache WHERE capability_id = 'can_admin_split'
----
tenant_id capability_id capability_value
1 can_admin_split false
1 can_admin_unsplit false
1 can_view_node_info false
1 can_view_tsdb_metrics false
5 can_admin_split true
5 can_admin_unsplit false
5 can_view_node_info false
5 can_view_tsdb_metrics false
tenant_id capability_id capability_value
1 can_admin_split false
5 can_admin_split true

subtest end

0 comments on commit 3f366fd

Please sign in to comment.