Skip to content

Commit 0e31d7f

Browse files
iskettanehiskettaneh
committed
spanconfig: add a static split point at the start of meta2
This commit is heavily copied from PR: #119594. It installs a static split point at the start of meta2 so that load based splitting splits meta2. Fixes: #119421 Release note: None
1 parent 8844739 commit 0e31d7f

File tree

18 files changed

+104
-66
lines changed

18 files changed

+104
-66
lines changed

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

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@ reconcile
77

88
mutations
99
----
10-
upsert /{Min-System/NodeLiveness} ttl_seconds=3600 num_replicas=5
10+
upsert /M{in-eta2} ttl_seconds=3600 num_replicas=5
11+
upsert /{Meta2-System/NodeLiveness} ttl_seconds=3600 num_replicas=5
1112
upsert /System/NodeLiveness{-Max} ttl_seconds=600 num_replicas=5
1213
upsert /System/{NodeLivenessMax-tsd} range system
1314
upsert /System{/tsd-tse} range default
@@ -117,7 +118,7 @@ upsert /Table/10{7-8} num_replicas=7
117118
delete /Table/11{2-3}
118119
upsert /Table/11{2-3} num_replicas=7
119120

120-
state offset=47
121+
state offset=48
121122
----
122123
...
123124
/Table/4{6-7} database system (host)
@@ -288,7 +289,7 @@ upsert /Table/7{5-6} ttl_seconds=100 ignore_strict_gc=true
288289
delete /Table/7{6-7}
289290
upsert /Table/7{6-7} ttl_seconds=100 ignore_strict_gc=true num_replicas=5 rangefeed_enabled=true
290291

291-
state offset=5 limit=42
292+
state offset=6 limit=42
292293
----
293294
...
294295
/Table/{0-4} ttl_seconds=100 ignore_strict_gc=true num_replicas=5 rangefeed_enabled=true

‎pkg/ccl/spanconfigccl/spanconfigreconcilerccl/testdata/indexes‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ mutations
1818
----
1919
upsert /Table/10{6-7} range default
2020

21-
state offset=47
21+
state offset=48
2222
----
2323
...
2424
/Table/4{6-7} database system (host)
@@ -69,7 +69,7 @@ delete /Table/10{6-7}
6969
upsert /Table/106/{2-3} num_replicas=7 num_voters=5
7070
upsert /Table/10{6/3-7} num_replicas=7
7171

72-
state offset=47
72+
state offset=48
7373
----
7474
...
7575
/Table/4{6-7} database system (host)
@@ -122,7 +122,7 @@ upsert /Table/106/{2-3} ttl_seconds=25 num_replicas=7 num_vot
122122
delete /Table/10{6/3-7}
123123
upsert /Table/10{6/3-7} ttl_seconds=3600 num_replicas=7
124124

125-
state offset=47
125+
state offset=48
126126
----
127127
...
128128
/Table/4{6-7} database system (host)
@@ -165,7 +165,7 @@ exec-sql
165165
ALTER TABLE db.t CONFIGURE ZONE USING num_replicas = 9
166166
----
167167

168-
state offset=47
168+
state offset=48
169169
----
170170
...
171171
/Table/4{6-7} database system (host)
@@ -221,7 +221,7 @@ delete /Table/106{-/2}
221221
delete /Table/106/{2-3}
222222
delete /Table/10{6/3-7}
223223

224-
state offset=46
224+
state offset=47
225225
----
226226
...
227227
/Table/4{5-6} ttl_seconds=7200 ignore_strict_gc=true num_replicas=5 rangefeed_enabled=true exclude_data_from_backup=true

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ mutations
1919

2020
# We should observe placeholder entries for both tenants (installed when
2121
# creating tenant records).
22-
state offset=47
22+
state offset=48
2323
----
2424
...
2525
/Table/4{6-7} database system (host)
@@ -130,7 +130,7 @@ upsert /Tenant/10/Table/7{4-5} database system (tenant)
130130
upsert /Tenant/10/Table/7{5-6} database system (tenant)
131131
upsert /Tenant/10/Table/7{6-7} database system (tenant)
132132

133-
state offset=47
133+
state offset=48
134134
----
135135
...
136136
/Table/4{6-7} database system (host)
@@ -250,7 +250,7 @@ upsert /Tenant/10/Table/10{7-8} rangefeed_enabled=true
250250
upsert /Tenant/10/Table/11{2-3} rangefeed_enabled=true
251251
upsert /Tenant/10/Table/11{3-4} rangefeed_enabled=true
252252

253-
state offset=81
253+
state offset=82
254254
----
255255
...
256256
/Tenant/10/Table/{7-8} database system (tenant)

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

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ mutations
1616

1717
# We should observe placeholder entries for both tenants (installed when
1818
# creating tenant records).
19-
state offset=47
19+
state offset=48
2020
----
2121
...
2222
/Table/4{6-7} database system (host)
@@ -204,9 +204,10 @@ mutations tenant=10
204204
delete {source=10,target=10}
205205

206206
# All system span config targets should have been removed at this point.
207-
state limit=4
207+
state limit=5
208208
----
209-
/{Min-System/NodeLiveness} ttl_seconds=3600 num_replicas=5
209+
/M{in-eta2} ttl_seconds=3600 num_replicas=5
210+
/{Meta2-System/NodeLiveness} ttl_seconds=3600 num_replicas=5
210211
/System/NodeLiveness{-Max} ttl_seconds=600 num_replicas=5
211212
/System/{NodeLivenessMax-tsd} range system
212213
/System{/tsd-tse} range default

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ initialize tenant=11
3535
# We should observe placeholder entries for both tenants (installed when
3636
# creating tenant records). tenant=11 should start off with whatever RANGE
3737
# TENANT was at the time.
38-
state offset=47
38+
state offset=48
3939
----
4040
...
4141
/Table/4{6-7} database system (host)
@@ -81,7 +81,7 @@ reconcile tenant=10
8181
mutations discard tenant=10
8282
----
8383

84-
state offset=47
84+
state offset=48
8585
----
8686
...
8787
/Table/4{6-7} database system (host)
@@ -214,7 +214,7 @@ reconcile tenant=11
214214
mutations discard tenant=11
215215
----
216216

217-
state offset=81
217+
state offset=82
218218
----
219219
...
220220
/Tenant/10/Table/{7-8} database system (tenant)

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ initialize tenant=11
1414

1515
# A record IS written for a key that logically belongs to the next tenant,
1616
# tenant=12, because tenant=12 DOES NOT exist.
17-
state offset=59
17+
state offset=60
1818
----
1919
...
2020
/Table/{59-60} database system (host)
@@ -49,7 +49,7 @@ reconcile tenant=11
4949
# Peek near the start of the span_configurations table where tenant=11's records
5050
# are stored. The first one is from the start of its keyspace to start of
5151
# table with ID=4: /Tenant/11{-/Table/4}.
52-
state offset=60 limit=3
52+
state offset=61 limit=3
5353
----
5454
...
5555
/Table/6{0-1} database system (host)
@@ -60,7 +60,7 @@ state offset=60 limit=3
6060
# Peek near the end of the span_configurations table where tenant=11's records
6161
# are stored. The last one is for its last system table. Right now the split is
6262
# at /Tenant/12. Which is fine.
63-
state offset=103
63+
state offset=104
6464
----
6565
...
6666
/Tenant/11/Table/3{5-6} database system (tenant)
@@ -186,7 +186,7 @@ initialize tenant=10
186186

187187
# A record IS NOT written for a key that logically belongs to the next tenant,
188188
# tenant=11, because tenant=11 DOES exist.
189-
state offset=59 limit=5
189+
state offset=60 limit=5
190190
----
191191
...
192192
/Table/{59-60} database system (host)

‎pkg/ccl/spanconfigccl/spanconfigreconcilerccl/testdata/named_zones‎

Lines changed: 25 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,10 @@ reconcile
77
mutations discard
88
----
99

10-
state limit=5
10+
state limit=6
1111
----
12-
/{Min-System/NodeLiveness} ttl_seconds=3600 num_replicas=5
12+
/M{in-eta2} ttl_seconds=3600 num_replicas=5
13+
/{Meta2-System/NodeLiveness} ttl_seconds=3600 num_replicas=5
1314
/System/NodeLiveness{-Max} ttl_seconds=600 num_replicas=5
1415
/System/{NodeLivenessMax-tsd} range system
1516
/System{/tsd-tse} range default
@@ -51,9 +52,10 @@ upsert /System/{NodeLivenessMax-tsd} range default
5152
delete /System{tse-/SystemSpanConfigKeys}
5253
upsert /System{tse-/SystemSpanConfigKeys} range default
5354

54-
state limit=5
55+
state limit=6
5556
----
56-
/{Min-System/NodeLiveness} ttl_seconds=3600 num_replicas=5
57+
/M{in-eta2} ttl_seconds=3600 num_replicas=5
58+
/{Meta2-System/NodeLiveness} ttl_seconds=3600 num_replicas=5
5759
/System/NodeLiveness{-Max} ttl_seconds=600 num_replicas=7
5860
/System/{NodeLivenessMax-tsd} range default
5961
/System{/tsd-tse} ttl_seconds=42
@@ -69,14 +71,17 @@ ALTER RANGE timeseries CONFIGURE ZONE DISCARD;
6971

7072
mutations
7173
----
72-
delete /{Min-System/NodeLiveness}
73-
upsert /{Min-System/NodeLiveness} range default
74+
delete /M{in-eta2}
75+
upsert /M{in-eta2} range default
76+
delete /{Meta2-System/NodeLiveness}
77+
upsert /{Meta2-System/NodeLiveness} range default
7478
delete /System{/tsd-tse}
7579
upsert /System{/tsd-tse} range default
7680

77-
state limit=5
81+
state limit=6
7882
----
79-
/{Min-System/NodeLiveness} range default
83+
/M{in-eta2} range default
84+
/{Meta2-System/NodeLiveness} range default
8085
/System/NodeLiveness{-Max} ttl_seconds=600 num_replicas=7
8186
/System/{NodeLivenessMax-tsd} range default
8287
/System{/tsd-tse} range default
@@ -100,8 +105,10 @@ ALTER RANGE default CONFIGURE ZONE USING gc.ttlseconds = 50;
100105

101106
mutations
102107
----
103-
delete /{Min-System/NodeLiveness}
104-
upsert /{Min-System/NodeLiveness} ttl_seconds=50
108+
delete /M{in-eta2}
109+
upsert /M{in-eta2} ttl_seconds=50
110+
delete /{Meta2-System/NodeLiveness}
111+
upsert /{Meta2-System/NodeLiveness} ttl_seconds=50
105112
delete /System/{NodeLivenessMax-tsd}
106113
upsert /System/{NodeLivenessMax-tsd} ttl_seconds=50
107114
delete /System{/tsd-tse}
@@ -111,16 +118,17 @@ upsert /System{tse-/SystemSpanConfigKeys} ttl_seconds=50
111118
delete /Table/10{6-7}
112119
upsert /Table/10{6-7} ttl_seconds=50
113120

114-
state limit=5
121+
state limit=6
115122
----
116-
/{Min-System/NodeLiveness} ttl_seconds=50
123+
/M{in-eta2} ttl_seconds=50
124+
/{Meta2-System/NodeLiveness} ttl_seconds=50
117125
/System/NodeLiveness{-Max} ttl_seconds=600 num_replicas=7
118126
/System/{NodeLivenessMax-tsd} ttl_seconds=50
119127
/System{/tsd-tse} ttl_seconds=50
120128
/System{tse-/SystemSpanConfigKeys} ttl_seconds=50
121129
...
122130

123-
state offset=46
131+
state offset=47
124132
----
125133
...
126134
/Table/4{5-6} ttl_seconds=7200 ignore_strict_gc=true num_replicas=5 rangefeed_enabled=true exclude_data_from_backup=true
@@ -165,7 +173,7 @@ mutations
165173
----
166174
upsert /Table/10{7-8} ttl_seconds=50
167175

168-
state offset=46
176+
state offset=47
169177
----
170178
...
171179
/Table/4{5-6} ttl_seconds=7200 ignore_strict_gc=true num_replicas=5 rangefeed_enabled=true exclude_data_from_backup=true
@@ -213,9 +221,10 @@ upsert /System/{NodeLivenessMax-tsd} ttl_seconds=100
213221
delete /System{tse-/SystemSpanConfigKeys}
214222
upsert /System{tse-/SystemSpanConfigKeys} ttl_seconds=100
215223

216-
state limit=5
224+
state limit=6
217225
----
218-
/{Min-System/NodeLiveness} ttl_seconds=50
226+
/M{in-eta2} ttl_seconds=50
227+
/{Meta2-System/NodeLiveness} ttl_seconds=50
219228
/System/NodeLiveness{-Max} ttl_seconds=600 num_replicas=7
220229
/System/{NodeLivenessMax-tsd} ttl_seconds=100
221230
/System{/tsd-tse} ttl_seconds=50

‎pkg/ccl/spanconfigccl/spanconfigreconcilerccl/testdata/partitions‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ reconcile
1010
mutations discard
1111
----
1212

13-
state offset=47
13+
state offset=48
1414
----
1515
...
1616
/Table/4{6-7} database system (host)
@@ -59,7 +59,7 @@ mutations
5959
----
6060
upsert /Table/10{6-7} range default
6161

62-
state offset=47
62+
state offset=48
6363
----
6464
...
6565
/Table/4{6-7} database system (host)
@@ -105,7 +105,7 @@ mutations
105105
delete /Table/10{6-7}
106106
upsert /Table/10{6-7} num_replicas=7 num_voters=5
107107

108-
state offset=47
108+
state offset=48
109109
----
110110
...
111111
/Table/4{6-7} database system (host)
@@ -156,7 +156,7 @@ upsert /Table/106/1/{1-2} global_reads=true num_replicas=7 num_
156156
upsert /Table/106/1/{2-3} global_reads=true num_replicas=7 num_voters=5
157157
upsert /Table/10{6/1/3-7} num_replicas=7 num_voters=5
158158

159-
state offset=47
159+
state offset=48
160160
----
161161
...
162162
/Table/4{6-7} database system (host)
@@ -207,7 +207,7 @@ delete /Table/10{6/1/3-7}
207207
upsert /Table/106/1/{4-5} ttl_seconds=5 num_replicas=7 num_voters=5
208208
upsert /Table/10{6/1/5-7} num_replicas=7 num_voters=5
209209

210-
state offset=47
210+
state offset=48
211211
----
212212
...
213213
/Table/4{6-7} database system (host)
@@ -272,7 +272,7 @@ upsert /Table/106/{1/5-2} num_replicas=7 num_voters=6
272272
delete /Table/10{6/1/5-7}
273273
upsert /Table/10{6/2-7} num_replicas=7 num_voters=5
274274

275-
state offset=47
275+
state offset=48
276276
----
277277
...
278278
/Table/4{6-7} database system (host)
@@ -335,7 +335,7 @@ upsert /Table/106/1/{4-5} ttl_seconds=5 num_replicas=7
335335
delete /Table/10{6/2-7}
336336
upsert /Table/10{6/2-7} num_replicas=7
337337

338-
state offset=47
338+
state offset=48
339339
----
340340
...
341341
/Table/4{6-7} database system (host)
@@ -392,7 +392,7 @@ delete /Table/106/1/{4-5}
392392
delete /Table/106/{1/5-2}
393393
delete /Table/10{6/2-7}
394394

395-
state offset=47
395+
state offset=48
396396
----
397397
...
398398
/Table/4{6-7} database system (host)

0 commit comments

Comments
 (0)