Skip to content

Commit a73404b

Browse files
craig[bot]bghalfqazi
committed
151821: sql: add system table for INSPECT results r=bghal a=bghal The planned `INSPECT` command will use the table to store the results of its consistency validation jobs. Fixes: #148266 Epic: CRDB-30356 Release note (sql change): The inspect_errors system table is introduced. 152086: roachtest: deflake gopg r=fqazi a=fqazi Previously, one of the soft deletion tests was flaking because of a timing issue where sometimes it could be slower then expected. This patch adds the problematic test on the ignore list. Fixes: #151991 Release note: None Co-authored-by: Brendan Gerrity <[email protected]> Co-authored-by: Faizan Qazi <[email protected]>
3 parents 2d73bfc + bdca10d + 6a7d7ab commit a73404b

File tree

100 files changed

+591
-307
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

100 files changed

+591
-307
lines changed

‎docs/generated/settings/settings-for-tenants.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -421,4 +421,4 @@ trace.zipkin.collector string the address of a Zipkin instance to receive trace
421421
ui.database_locality_metadata.enabled boolean true if enabled shows extended locality data about databases and tables in DB Console which can be expensive to compute application
422422
ui.default_timezone string the default timezone used to format timestamps in the ui application
423423
ui.display_timezone enumeration etc/utc the timezone used to format timestamps in the ui. This setting is deprecatedand will be removed in a future version. Use the 'ui.default_timezone' setting instead. 'ui.default_timezone' takes precedence over this setting. [etc/utc = 0, america/new_york = 1] application
424-
version version 1000025.3-upgrading-to-1000025.4-step-006 set the active cluster version in the format '<major>.<minor>' application
424+
version version 1000025.3-upgrading-to-1000025.4-step-008 set the active cluster version in the format '<major>.<minor>' application

‎docs/generated/settings/settings.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -379,6 +379,6 @@
379379
<tr><td><div id="setting-ui-database-locality-metadata-enabled" class="anchored"><code>ui.database_locality_metadata.enabled</code></div></td><td>boolean</td><td><code>true</code></td><td>if enabled shows extended locality data about databases and tables in DB Console which can be expensive to compute</td><td>Serverless/Dedicated/Self-Hosted</td></tr>
380380
<tr><td><div id="setting-ui-default-timezone" class="anchored"><code>ui.default_timezone</code></div></td><td>string</td><td><code></code></td><td>the default timezone used to format timestamps in the ui</td><td>Serverless/Dedicated/Self-Hosted</td></tr>
381381
<tr><td><div id="setting-ui-display-timezone" class="anchored"><code>ui.display_timezone</code></div></td><td>enumeration</td><td><code>etc/utc</code></td><td>the timezone used to format timestamps in the ui. This setting is deprecatedand will be removed in a future version. Use the &#39;ui.default_timezone&#39; setting instead. &#39;ui.default_timezone&#39; takes precedence over this setting. [etc/utc = 0, america/new_york = 1]</td><td>Serverless/Dedicated/Self-Hosted</td></tr>
382-
<tr><td><div id="setting-version" class="anchored"><code>version</code></div></td><td>version</td><td><code>1000025.3-upgrading-to-1000025.4-step-006</code></td><td>set the active cluster version in the format &#39;&lt;major&gt;.&lt;minor&gt;&#39;</td><td>Serverless/Dedicated/Self-Hosted</td></tr>
382+
<tr><td><div id="setting-version" class="anchored"><code>version</code></div></td><td>version</td><td><code>1000025.3-upgrading-to-1000025.4-step-008</code></td><td>set the active cluster version in the format &#39;&lt;major&gt;.&lt;minor&gt;&#39;</td><td>Serverless/Dedicated/Self-Hosted</td></tr>
383383
</tbody>
384384
</table>

‎pkg/backup/system_schema.go‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -863,6 +863,9 @@ var systemTableBackupConfiguration = map[string]systemBackupConfiguration{
863863
systemschema.PreparedTransactionsTable.GetName(): {
864864
shouldIncludeInClusterBackup: optOutOfClusterBackup,
865865
},
866+
systemschema.InspectErrorsTable.GetName(): {
867+
shouldIncludeInClusterBackup: optOutOfClusterBackup,
868+
},
866869
}
867870

868871
func rekeySystemTable(

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -251,12 +251,12 @@ txn_id txn_fingerprint_id query implicit_txn session_id start_time end_tim
251251
query ITTI
252252
SELECT range_id, start_pretty, end_pretty, lease_holder FROM crdb_internal.ranges
253253
----
254-
75 /Tenant/10 /Tenant/11 1
254+
76 /Tenant/10 /Tenant/11 1
255255

256256
query ITT
257257
SELECT range_id, start_pretty, end_pretty FROM crdb_internal.ranges_no_leases
258258
----
259-
75 /Tenant/10 /Tenant/11
259+
76 /Tenant/10 /Tenant/11
260260

261261
query IT
262262
SELECT zone_id, target FROM crdb_internal.zones ORDER BY 1

‎pkg/ccl/logictestccl/testdata/logic_test/multi_region_remote_access_error‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -471,7 +471,7 @@ skipif config multiregion-9node-3region-3azs-vec-off
471471
query I retry
472472
SELECT DISTINCT range_id FROM [SHOW RANGES FROM TABLE messages_rbr]
473473
----
474-
80
474+
81
475475

476476
# Update does not fail when accessing all rows in messages_rbr because lookup
477477
# join does not error out the lookup table in phase 1.

‎pkg/ccl/logictestccl/testdata/logic_test/regional_by_row_insert_fast_path‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -200,7 +200,7 @@ query T rowsort
200200
SELECT message FROM [SHOW KV TRACE FOR SESSION]
201201
WHERE message LIKE '%batch%' AND message LIKE '%Scan%'
202202
----
203-
r74: sending batch 4 Scan to (n1,s1):1
203+
r75: sending batch 4 Scan to (n1,s1):1
204204

205205
# Regression test for #115377.
206206
statement ok

‎pkg/ccl/logictestccl/testdata/logic_test/regional_by_row_query_behavior‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -266,7 +266,7 @@ ap-southeast-2 23
266266
query TT
267267
SELECT start_key, end_key FROM [SHOW RANGE FROM TABLE regional_by_row_table FOR ROW ('ap-southeast-2', 1)]
268268
----
269-
<before:/Table/72> …
269+
<before:/Table/73> …
270270

271271
query TIIII
272272
SELECT crdb_region, pk, pk2, a, b FROM regional_by_row_table
@@ -404,7 +404,7 @@ SELECT start_key, end_key, replicas, lease_holder FROM [SHOW RANGES FROM INDEX r
404404
ORDER BY 1
405405
----
406406
start_key end_key replicas lease_holder
407-
<before:/Table/72> …/"\x80"/0 {1} 1
407+
<before:/Table/73> …/"\x80"/0 {1} 1
408408
…/"\x80"/0 …/"\xc0"/0 {4} 4
409409
…/"\xc0"/0 <after:/Table/110/5> {7} 7
410410

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,7 @@ upsert /Table/{69-70} database system (host)
8080
upsert /Table/7{0-1} database system (host)
8181
upsert /Table/7{1-2} database system (host)
8282
upsert /Table/7{2-3} database system (host)
83+
upsert /Table/7{3-4} database system (host)
8384

8485
exec-sql
8586
CREATE DATABASE db;
@@ -142,6 +143,7 @@ state offset=47
142143
/Table/7{0-1} database system (host)
143144
/Table/7{1-2} database system (host)
144145
/Table/7{2-3} database system (host)
146+
/Table/7{3-4} database system (host)
145147
/Table/10{6-7} num_replicas=7 num_voters=5
146148
/Table/10{7-8} num_replicas=7
147149
/Table/11{2-3} num_replicas=7
@@ -271,6 +273,8 @@ delete /Table/7{1-2}
271273
upsert /Table/7{1-2} ttl_seconds=100 ignore_strict_gc=true num_replicas=5 rangefeed_enabled=true
272274
delete /Table/7{2-3}
273275
upsert /Table/7{2-3} ttl_seconds=100 ignore_strict_gc=true num_replicas=5 rangefeed_enabled=true
276+
delete /Table/7{3-4}
277+
upsert /Table/7{3-4} ttl_seconds=100 ignore_strict_gc=true num_replicas=5 rangefeed_enabled=true
274278

275279
state offset=5 limit=42
276280
----

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@ state offset=47
4747
/Table/7{0-1} database system (host)
4848
/Table/7{1-2} database system (host)
4949
/Table/7{2-3} database system (host)
50+
/Table/7{3-4} database system (host)
5051
/Table/10{6-7} range default
5152

5253
exec-sql
@@ -94,6 +95,7 @@ state offset=47
9495
/Table/7{0-1} database system (host)
9596
/Table/7{1-2} database system (host)
9697
/Table/7{2-3} database system (host)
98+
/Table/7{3-4} database system (host)
9799
/Table/106{-/2} num_replicas=7
98100
/Table/106/{2-3} num_replicas=7 num_voters=5
99101
/Table/10{6/3-7} num_replicas=7
@@ -143,6 +145,7 @@ state offset=47
143145
/Table/7{0-1} database system (host)
144146
/Table/7{1-2} database system (host)
145147
/Table/7{2-3} database system (host)
148+
/Table/7{3-4} database system (host)
146149
/Table/106{-/2} ttl_seconds=3600 num_replicas=7
147150
/Table/106/{2-3} ttl_seconds=25 num_replicas=7 num_voters=5
148151
/Table/10{6/3-7} ttl_seconds=3600 num_replicas=7
@@ -182,6 +185,7 @@ state offset=47
182185
/Table/7{0-1} database system (host)
183186
/Table/7{1-2} database system (host)
184187
/Table/7{2-3} database system (host)
188+
/Table/7{3-4} database system (host)
185189
/Table/106{-/2} ttl_seconds=3600 num_replicas=9
186190
/Table/106/{2-3} ttl_seconds=25 num_replicas=9 num_voters=5
187191
/Table/10{6/3-7} ttl_seconds=3600 num_replicas=9
@@ -235,3 +239,4 @@ state offset=46
235239
/Table/7{0-1} database system (host)
236240
/Table/7{1-2} database system (host)
237241
/Table/7{2-3} database system (host)
242+
/Table/7{3-4} database system (host)

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@ state offset=47
4848
/Table/7{0-1} database system (host)
4949
/Table/7{1-2} database system (host)
5050
/Table/7{2-3} database system (host)
51+
/Table/7{3-4} database system (host)
5152
/Tenant/10{-\x00} database system (tenant)
5253
/Tenant/11{-\x00} database system (tenant)
5354
/Tenant/12{-\x00} database system (tenant)
@@ -121,6 +122,7 @@ upsert /Tenant/10/Table/{69-70} database system (tenant)
121122
upsert /Tenant/10/Table/7{0-1} database system (tenant)
122123
upsert /Tenant/10/Table/7{1-2} database system (tenant)
123124
upsert /Tenant/10/Table/7{2-3} database system (tenant)
125+
upsert /Tenant/10/Table/7{3-4} database system (tenant)
124126

125127
state offset=47
126128
----
@@ -151,6 +153,7 @@ state offset=47
151153
/Table/7{0-1} database system (host)
152154
/Table/7{1-2} database system (host)
153155
/Table/7{2-3} database system (host)
156+
/Table/7{3-4} database system (host)
154157
/Tenant/10{-/Table/4} database system (tenant)
155158
/Tenant/10/Table/{4-5} database system (tenant)
156159
/Tenant/10/Table/{5-6} database system (tenant)
@@ -213,6 +216,7 @@ state offset=47
213216
/Tenant/10/Table/7{0-1} database system (tenant)
214217
/Tenant/10/Table/7{1-2} database system (tenant)
215218
/Tenant/10/Table/7{2-3} database system (tenant)
219+
/Tenant/10/Table/7{3-4} database system (tenant)
216220
/Tenant/11{-\x00} database system (tenant)
217221
/Tenant/12{-\x00} database system (tenant)
218222

@@ -237,6 +241,7 @@ upsert /Tenant/10/Table/11{3-4} rangefeed_enabled=true
237241
state offset=81
238242
----
239243
...
244+
/Tenant/10/Table/1{1-2} ignore_strict_gc=true rangefeed_enabled=true exclude_data_from_backup=true
240245
/Tenant/10/Table/1{2-3} database system (tenant)
241246
/Tenant/10/Table/1{3-4} database system (tenant)
242247
/Tenant/10/Table/1{4-5} database system (tenant)
@@ -291,6 +296,7 @@ state offset=81
291296
/Tenant/10/Table/7{0-1} database system (tenant)
292297
/Tenant/10/Table/7{1-2} database system (tenant)
293298
/Tenant/10/Table/7{2-3} database system (tenant)
299+
/Tenant/10/Table/7{3-4} database system (tenant)
294300
/Tenant/10/Table/10{6-7} rangefeed_enabled=true
295301
/Tenant/10/Table/10{7-8} rangefeed_enabled=true
296302
/Tenant/10/Table/11{2-3} rangefeed_enabled=true

0 commit comments

Comments
 (0)