Skip to content

Commit 8898577

Browse files
craig[bot]kyle-a-wong
craig[bot]
and
kyle-a-wong
committed
Merge #143812
143812: upgrades: add sql stats ttls to bootstrapCluster r=kyle-a-wong a=kyle-a-wong Adds a permanent upgrade to bootStrapCluster to set sql stats system tables ttls via bootstrapCluster instead of bootstrapSystem. This results in the same TTLs being set on all virtual clusters Resolves: #141799 Epic: none Release note: None Co-authored-by: Kyle Wong <[email protected]>
2 parents 345c50c + b4f1b17 commit 8898577

File tree

16 files changed

+106
-74
lines changed

16 files changed

+106
-74
lines changed

‎pkg/backup/backuptestutils/BUILD.bazel‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@ go_library(
1313
"//pkg/jobs",
1414
"//pkg/keyvisualizer",
1515
"//pkg/kv/kvserver",
16-
"//pkg/sql/sqlstats",
1716
"//pkg/testutils",
1817
"//pkg/testutils/sqlutils",
1918
"//pkg/testutils/testcluster",
19+
"//pkg/upgrade/upgradebase",
2020
"//pkg/util",
2121
"//pkg/util/metamorphic",
2222
"//pkg/workload/bank",

‎pkg/backup/backuptestutils/testutils.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,10 @@ import (
1818
"github.com/cockroachdb/cockroach/pkg/jobs"
1919
"github.com/cockroachdb/cockroach/pkg/keyvisualizer"
2020
"github.com/cockroachdb/cockroach/pkg/kv/kvserver"
21-
"github.com/cockroachdb/cockroach/pkg/sql/sqlstats"
2221
"github.com/cockroachdb/cockroach/pkg/testutils"
2322
"github.com/cockroachdb/cockroach/pkg/testutils/sqlutils"
2423
"github.com/cockroachdb/cockroach/pkg/testutils/testcluster"
24+
"github.com/cockroachdb/cockroach/pkg/upgrade/upgradebase"
2525
"github.com/cockroachdb/cockroach/pkg/util"
2626
"github.com/cockroachdb/cockroach/pkg/util/metamorphic"
2727
"github.com/cockroachdb/cockroach/pkg/workload/bank"
@@ -216,8 +216,8 @@ func setTestClusterDefaults(params *base.TestClusterArgs, dataDir string, useDat
216216
SkipZoneConfigBootstrap: true,
217217
}
218218
}
219-
if params.ServerArgs.Knobs.SQLStatsKnobs == nil {
220-
params.ServerArgs.Knobs.SQLStatsKnobs = &sqlstats.TestingKnobs{
219+
if params.ServerArgs.Knobs.UpgradeManager == nil {
220+
params.ServerArgs.Knobs.UpgradeManager = &upgradebase.TestingKnobs{
221221
SkipZoneConfigBootstrap: true,
222222
}
223223
}

‎pkg/ccl/logictestccl/testdata/logic_test/crdb_internal_tenant‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -261,7 +261,11 @@ SELECT range_id, start_pretty, end_pretty FROM crdb_internal.ranges_no_leases
261261
query IT
262262
SELECT zone_id, target FROM crdb_internal.zones ORDER BY 1
263263
----
264-
0 RANGE default
264+
0 RANGE default
265+
42 TABLE system.public.statement_statistics
266+
43 TABLE system.public.transaction_statistics
267+
61 TABLE system.public.statement_activity
268+
62 TABLE system.public.transaction_activity
265269

266270
query error pq: foo
267271
SELECT crdb_internal.force_error('', 'foo')

‎pkg/ccl/logictestccl/testdata/logic_test/zone_config_secondary_tenants‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,10 @@ query IT
1111
SELECT zone_id, target FROM crdb_internal.zones ORDER BY 1
1212
----
1313
0 RANGE default
14+
42 TABLE system.public.statement_statistics
15+
43 TABLE system.public.transaction_statistics
16+
61 TABLE system.public.statement_activity
17+
62 TABLE system.public.transaction_activity
1418
106 TABLE test.public.t
1519

1620
# The tests below test semantics around named zone for tenants. Tenants aren't

‎pkg/ccl/spanconfigccl/spanconfigreconcilerccl/testdata/multitenant/basic‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -91,8 +91,8 @@ upsert /Tenant/10/Table/3{7-8} database system (tenant)
9191
upsert /Tenant/10/Table/{39-40} database system (tenant)
9292
upsert /Tenant/10/Table/4{0-1} database system (tenant)
9393
upsert /Tenant/10/Table/4{1-2} database system (tenant)
94-
upsert /Tenant/10/Table/4{2-3} database system (tenant)
95-
upsert /Tenant/10/Table/4{3-4} database system (tenant)
94+
upsert /Tenant/10/Table/4{2-3} ttl_seconds=3600 ignore_strict_gc=true rangefeed_enabled=true
95+
upsert /Tenant/10/Table/4{3-4} ttl_seconds=3600 ignore_strict_gc=true rangefeed_enabled=true
9696
upsert /Tenant/10/Table/4{4-5} database system (tenant)
9797
upsert /Tenant/10/Table/4{5-6} ignore_strict_gc=true rangefeed_enabled=true exclude_data_from_backup=true
9898
upsert /Tenant/10/Table/4{6-7} database system (tenant)
@@ -109,8 +109,8 @@ upsert /Tenant/10/Table/5{7-8} database system (tenant)
109109
upsert /Tenant/10/Table/5{8-9} database system (tenant)
110110
upsert /Tenant/10/Table/{59-60} database system (tenant)
111111
upsert /Tenant/10/Table/6{0-1} database system (tenant)
112-
upsert /Tenant/10/Table/6{1-2} database system (tenant)
113-
upsert /Tenant/10/Table/6{2-3} database system (tenant)
112+
upsert /Tenant/10/Table/6{1-2} ttl_seconds=3600 ignore_strict_gc=true rangefeed_enabled=true
113+
upsert /Tenant/10/Table/6{2-3} ttl_seconds=3600 ignore_strict_gc=true rangefeed_enabled=true
114114
upsert /Tenant/10/Table/6{3-4} database system (tenant)
115115
upsert /Tenant/10/Table/6{4-5} database system (tenant)
116116
upsert /Tenant/10/Table/6{5-6} database system (tenant)
@@ -183,8 +183,8 @@ state offset=47
183183
/Tenant/10/Table/{39-40} database system (tenant)
184184
/Tenant/10/Table/4{0-1} database system (tenant)
185185
/Tenant/10/Table/4{1-2} database system (tenant)
186-
/Tenant/10/Table/4{2-3} database system (tenant)
187-
/Tenant/10/Table/4{3-4} database system (tenant)
186+
/Tenant/10/Table/4{2-3} ttl_seconds=3600 ignore_strict_gc=true rangefeed_enabled=true
187+
/Tenant/10/Table/4{3-4} ttl_seconds=3600 ignore_strict_gc=true rangefeed_enabled=true
188188
/Tenant/10/Table/4{4-5} database system (tenant)
189189
/Tenant/10/Table/4{5-6} ignore_strict_gc=true rangefeed_enabled=true exclude_data_from_backup=true
190190
/Tenant/10/Table/4{6-7} database system (tenant)
@@ -201,8 +201,8 @@ state offset=47
201201
/Tenant/10/Table/5{8-9} database system (tenant)
202202
/Tenant/10/Table/{59-60} database system (tenant)
203203
/Tenant/10/Table/6{0-1} database system (tenant)
204-
/Tenant/10/Table/6{1-2} database system (tenant)
205-
/Tenant/10/Table/6{2-3} database system (tenant)
204+
/Tenant/10/Table/6{1-2} ttl_seconds=3600 ignore_strict_gc=true rangefeed_enabled=true
205+
/Tenant/10/Table/6{2-3} ttl_seconds=3600 ignore_strict_gc=true rangefeed_enabled=true
206206
/Tenant/10/Table/6{3-4} database system (tenant)
207207
/Tenant/10/Table/6{4-5} database system (tenant)
208208
/Tenant/10/Table/6{5-6} database system (tenant)
@@ -261,8 +261,8 @@ state offset=81
261261
/Tenant/10/Table/{39-40} database system (tenant)
262262
/Tenant/10/Table/4{0-1} database system (tenant)
263263
/Tenant/10/Table/4{1-2} database system (tenant)
264-
/Tenant/10/Table/4{2-3} database system (tenant)
265-
/Tenant/10/Table/4{3-4} database system (tenant)
264+
/Tenant/10/Table/4{2-3} ttl_seconds=3600 ignore_strict_gc=true rangefeed_enabled=true
265+
/Tenant/10/Table/4{3-4} ttl_seconds=3600 ignore_strict_gc=true rangefeed_enabled=true
266266
/Tenant/10/Table/4{4-5} database system (tenant)
267267
/Tenant/10/Table/4{5-6} ignore_strict_gc=true rangefeed_enabled=true exclude_data_from_backup=true
268268
/Tenant/10/Table/4{6-7} database system (tenant)
@@ -279,8 +279,8 @@ state offset=81
279279
/Tenant/10/Table/5{8-9} database system (tenant)
280280
/Tenant/10/Table/{59-60} database system (tenant)
281281
/Tenant/10/Table/6{0-1} database system (tenant)
282-
/Tenant/10/Table/6{1-2} database system (tenant)
283-
/Tenant/10/Table/6{2-3} database system (tenant)
282+
/Tenant/10/Table/6{1-2} ttl_seconds=3600 ignore_strict_gc=true rangefeed_enabled=true
283+
/Tenant/10/Table/6{2-3} ttl_seconds=3600 ignore_strict_gc=true rangefeed_enabled=true
284284
/Tenant/10/Table/6{3-4} database system (tenant)
285285
/Tenant/10/Table/6{4-5} database system (tenant)
286286
/Tenant/10/Table/6{5-6} database system (tenant)

‎pkg/ccl/spanconfigccl/spanconfigreconcilerccl/testdata/multitenant/protectedts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -107,8 +107,8 @@ upsert /Tenant/10/Table/3{7-8} database system (tenant)
107107
upsert /Tenant/10/Table/{39-40} database system (tenant)
108108
upsert /Tenant/10/Table/4{0-1} database system (tenant)
109109
upsert /Tenant/10/Table/4{1-2} database system (tenant)
110-
upsert /Tenant/10/Table/4{2-3} database system (tenant)
111-
upsert /Tenant/10/Table/4{3-4} database system (tenant)
110+
upsert /Tenant/10/Table/4{2-3} ttl_seconds=3600 ignore_strict_gc=true rangefeed_enabled=true
111+
upsert /Tenant/10/Table/4{3-4} ttl_seconds=3600 ignore_strict_gc=true rangefeed_enabled=true
112112
upsert /Tenant/10/Table/4{4-5} database system (tenant)
113113
upsert /Tenant/10/Table/4{5-6} ignore_strict_gc=true rangefeed_enabled=true exclude_data_from_backup=true
114114
upsert /Tenant/10/Table/4{6-7} database system (tenant)
@@ -125,8 +125,8 @@ upsert /Tenant/10/Table/5{7-8} database system (tenant)
125125
upsert /Tenant/10/Table/5{8-9} database system (tenant)
126126
upsert /Tenant/10/Table/{59-60} database system (tenant)
127127
upsert /Tenant/10/Table/6{0-1} database system (tenant)
128-
upsert /Tenant/10/Table/6{1-2} database system (tenant)
129-
upsert /Tenant/10/Table/6{2-3} database system (tenant)
128+
upsert /Tenant/10/Table/6{1-2} ttl_seconds=3600 ignore_strict_gc=true rangefeed_enabled=true
129+
upsert /Tenant/10/Table/6{2-3} ttl_seconds=3600 ignore_strict_gc=true rangefeed_enabled=true
130130
upsert /Tenant/10/Table/6{3-4} database system (tenant)
131131
upsert /Tenant/10/Table/6{4-5} database system (tenant)
132132
upsert /Tenant/10/Table/6{5-6} database system (tenant)

‎pkg/ccl/spanconfigccl/spanconfigreconcilerccl/testdata/multitenant/range_tenants‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -138,8 +138,8 @@ state offset=47
138138
/Tenant/10/Table/{39-40} database system (tenant)
139139
/Tenant/10/Table/4{0-1} database system (tenant)
140140
/Tenant/10/Table/4{1-2} database system (tenant)
141-
/Tenant/10/Table/4{2-3} database system (tenant)
142-
/Tenant/10/Table/4{3-4} database system (tenant)
141+
/Tenant/10/Table/4{2-3} ttl_seconds=3600 ignore_strict_gc=true rangefeed_enabled=true
142+
/Tenant/10/Table/4{3-4} ttl_seconds=3600 ignore_strict_gc=true rangefeed_enabled=true
143143
/Tenant/10/Table/4{4-5} database system (tenant)
144144
/Tenant/10/Table/4{5-6} ignore_strict_gc=true rangefeed_enabled=true exclude_data_from_backup=true
145145
/Tenant/10/Table/4{6-7} database system (tenant)
@@ -156,8 +156,8 @@ state offset=47
156156
/Tenant/10/Table/5{8-9} database system (tenant)
157157
/Tenant/10/Table/{59-60} database system (tenant)
158158
/Tenant/10/Table/6{0-1} database system (tenant)
159-
/Tenant/10/Table/6{1-2} database system (tenant)
160-
/Tenant/10/Table/6{2-3} database system (tenant)
159+
/Tenant/10/Table/6{1-2} ttl_seconds=3600 ignore_strict_gc=true rangefeed_enabled=true
160+
/Tenant/10/Table/6{2-3} ttl_seconds=3600 ignore_strict_gc=true rangefeed_enabled=true
161161
/Tenant/10/Table/6{3-4} database system (tenant)
162162
/Tenant/10/Table/6{4-5} database system (tenant)
163163
/Tenant/10/Table/6{5-6} database system (tenant)
@@ -229,8 +229,8 @@ state offset=81
229229
/Tenant/10/Table/{39-40} database system (tenant)
230230
/Tenant/10/Table/4{0-1} database system (tenant)
231231
/Tenant/10/Table/4{1-2} database system (tenant)
232-
/Tenant/10/Table/4{2-3} database system (tenant)
233-
/Tenant/10/Table/4{3-4} database system (tenant)
232+
/Tenant/10/Table/4{2-3} ttl_seconds=3600 ignore_strict_gc=true rangefeed_enabled=true
233+
/Tenant/10/Table/4{3-4} ttl_seconds=3600 ignore_strict_gc=true rangefeed_enabled=true
234234
/Tenant/10/Table/4{4-5} database system (tenant)
235235
/Tenant/10/Table/4{5-6} ignore_strict_gc=true rangefeed_enabled=true exclude_data_from_backup=true
236236
/Tenant/10/Table/4{6-7} database system (tenant)
@@ -247,8 +247,8 @@ state offset=81
247247
/Tenant/10/Table/5{8-9} database system (tenant)
248248
/Tenant/10/Table/{59-60} database system (tenant)
249249
/Tenant/10/Table/6{0-1} database system (tenant)
250-
/Tenant/10/Table/6{1-2} database system (tenant)
251-
/Tenant/10/Table/6{2-3} database system (tenant)
250+
/Tenant/10/Table/6{1-2} ttl_seconds=3600 ignore_strict_gc=true rangefeed_enabled=true
251+
/Tenant/10/Table/6{2-3} ttl_seconds=3600 ignore_strict_gc=true rangefeed_enabled=true
252252
/Tenant/10/Table/6{3-4} database system (tenant)
253253
/Tenant/10/Table/6{4-5} database system (tenant)
254254
/Tenant/10/Table/6{5-6} database system (tenant)
@@ -293,8 +293,8 @@ state offset=81
293293
/Tenant/11/Table/{39-40} ttl_seconds=18000 ignore_strict_gc=true rangefeed_enabled=true
294294
/Tenant/11/Table/4{0-1} ttl_seconds=18000 ignore_strict_gc=true rangefeed_enabled=true
295295
/Tenant/11/Table/4{1-2} ttl_seconds=18000 ignore_strict_gc=true rangefeed_enabled=true
296-
/Tenant/11/Table/4{2-3} ttl_seconds=18000 ignore_strict_gc=true rangefeed_enabled=true
297-
/Tenant/11/Table/4{3-4} ttl_seconds=18000 ignore_strict_gc=true rangefeed_enabled=true
296+
/Tenant/11/Table/4{2-3} ttl_seconds=3600 ignore_strict_gc=true rangefeed_enabled=true
297+
/Tenant/11/Table/4{3-4} ttl_seconds=3600 ignore_strict_gc=true rangefeed_enabled=true
298298
/Tenant/11/Table/4{4-5} ttl_seconds=18000 ignore_strict_gc=true rangefeed_enabled=true
299299
/Tenant/11/Table/4{5-6} ttl_seconds=18000 ignore_strict_gc=true rangefeed_enabled=true exclude_data_from_backup=true
300300
/Tenant/11/Table/4{6-7} ttl_seconds=18000 ignore_strict_gc=true rangefeed_enabled=true
@@ -311,8 +311,8 @@ state offset=81
311311
/Tenant/11/Table/5{8-9} ttl_seconds=18000 ignore_strict_gc=true rangefeed_enabled=true
312312
/Tenant/11/Table/{59-60} ttl_seconds=18000 ignore_strict_gc=true rangefeed_enabled=true
313313
/Tenant/11/Table/6{0-1} ttl_seconds=18000 ignore_strict_gc=true rangefeed_enabled=true
314-
/Tenant/11/Table/6{1-2} ttl_seconds=18000 ignore_strict_gc=true rangefeed_enabled=true
315-
/Tenant/11/Table/6{2-3} ttl_seconds=18000 ignore_strict_gc=true rangefeed_enabled=true
314+
/Tenant/11/Table/6{1-2} ttl_seconds=3600 ignore_strict_gc=true rangefeed_enabled=true
315+
/Tenant/11/Table/6{2-3} ttl_seconds=3600 ignore_strict_gc=true rangefeed_enabled=true
316316
/Tenant/11/Table/6{3-4} ttl_seconds=18000 ignore_strict_gc=true rangefeed_enabled=true
317317
/Tenant/11/Table/6{4-5} ttl_seconds=18000 ignore_strict_gc=true rangefeed_enabled=true
318318
/Tenant/11/Table/6{5-6} ttl_seconds=18000 ignore_strict_gc=true rangefeed_enabled=true

‎pkg/ccl/spanconfigccl/spanconfigreconcilerccl/testdata/multitenant/tenant_end_key_split‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -61,8 +61,8 @@ state offset=103
6161
...
6262
/Tenant/11/Table/4{0-1} database system (tenant)
6363
/Tenant/11/Table/4{1-2} database system (tenant)
64-
/Tenant/11/Table/4{2-3} database system (tenant)
65-
/Tenant/11/Table/4{3-4} database system (tenant)
64+
/Tenant/11/Table/4{2-3} ttl_seconds=3600 ignore_strict_gc=true rangefeed_enabled=true
65+
/Tenant/11/Table/4{3-4} ttl_seconds=3600 ignore_strict_gc=true rangefeed_enabled=true
6666
/Tenant/11/Table/4{4-5} database system (tenant)
6767
/Tenant/11/Table/4{5-6} ignore_strict_gc=true rangefeed_enabled=true exclude_data_from_backup=true
6868
/Tenant/11/Table/4{6-7} database system (tenant)
@@ -79,8 +79,8 @@ state offset=103
7979
/Tenant/11/Table/5{8-9} database system (tenant)
8080
/Tenant/11/Table/{59-60} database system (tenant)
8181
/Tenant/11/Table/6{0-1} database system (tenant)
82-
/Tenant/11/Table/6{1-2} database system (tenant)
83-
/Tenant/11/Table/6{2-3} database system (tenant)
82+
/Tenant/11/Table/6{1-2} ttl_seconds=3600 ignore_strict_gc=true rangefeed_enabled=true
83+
/Tenant/11/Table/6{2-3} ttl_seconds=3600 ignore_strict_gc=true rangefeed_enabled=true
8484
/Tenant/11/Table/6{3-4} database system (tenant)
8585
/Tenant/11/Table/6{4-5} database system (tenant)
8686
/Tenant/11/Table/6{5-6} database system (tenant)
@@ -132,8 +132,8 @@ upsert /Tenant/11/Table/3{7-8} database system (tenant)
132132
upsert /Tenant/11/Table/{39-40} database system (tenant)
133133
upsert /Tenant/11/Table/4{0-1} database system (tenant)
134134
upsert /Tenant/11/Table/4{1-2} database system (tenant)
135-
upsert /Tenant/11/Table/4{2-3} database system (tenant)
136-
upsert /Tenant/11/Table/4{3-4} database system (tenant)
135+
upsert /Tenant/11/Table/4{2-3} ttl_seconds=3600 ignore_strict_gc=true rangefeed_enabled=true
136+
upsert /Tenant/11/Table/4{3-4} ttl_seconds=3600 ignore_strict_gc=true rangefeed_enabled=true
137137
upsert /Tenant/11/Table/4{4-5} database system (tenant)
138138
upsert /Tenant/11/Table/4{5-6} ignore_strict_gc=true rangefeed_enabled=true exclude_data_from_backup=true
139139
upsert /Tenant/11/Table/4{6-7} database system (tenant)
@@ -150,8 +150,8 @@ upsert /Tenant/11/Table/5{7-8} database system (tenant)
150150
upsert /Tenant/11/Table/5{8-9} database system (tenant)
151151
upsert /Tenant/11/Table/{59-60} database system (tenant)
152152
upsert /Tenant/11/Table/6{0-1} database system (tenant)
153-
upsert /Tenant/11/Table/6{1-2} database system (tenant)
154-
upsert /Tenant/11/Table/6{2-3} database system (tenant)
153+
upsert /Tenant/11/Table/6{1-2} ttl_seconds=3600 ignore_strict_gc=true rangefeed_enabled=true
154+
upsert /Tenant/11/Table/6{2-3} ttl_seconds=3600 ignore_strict_gc=true rangefeed_enabled=true
155155
upsert /Tenant/11/Table/6{3-4} database system (tenant)
156156
upsert /Tenant/11/Table/6{4-5} database system (tenant)
157157
upsert /Tenant/11/Table/6{5-6} database system (tenant)

0 commit comments

Comments
 (0)