Skip to content

Commit af8f311

Browse files
chore(treewide): adjust to lack of system_distributed.service_levels tab and system_distributed_everywhere ks
Mentioned tab and ks will not be created on cluster startup starting from scylla 2026.3 (already present on scylla master). This has been implemented on the scylla side in: scylladb/scylladb#29482. This commit adjusts our golden files tests to no longer always expect them. Refs scylladb/scylladb#29482.
1 parent e2a5872 commit af8f311

7 files changed

Lines changed: 17 additions & 10 deletions

File tree

pkg/service/backup/service_backup_integration_test.go

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -489,8 +489,10 @@ func TestGetTargetIntegration(t *testing.T) {
489489
cmpopts.SortSlices(func(a, b string) bool { return a < b }),
490490
cmpopts.SortSlices(func(a, b backup.Unit) bool { return a.Keyspace < b.Keyspace }),
491491
cmpopts.IgnoreUnexported(backup.Target{}),
492-
cmpopts.IgnoreSliceElements(func(u backup.Unit) bool { return u.Keyspace == "system_replicated_keys" || u.Keyspace == "system_auth" }),
493-
cmpopts.IgnoreSliceElements(func(t string) bool { return t == "dicts" })); diff != "" {
492+
cmpopts.IgnoreSliceElements(func(u backup.Unit) bool {
493+
return u.Keyspace == "system_replicated_keys" || u.Keyspace == "system_auth" || u.Keyspace == "system_distributed_everywhere"
494+
}),
495+
cmpopts.IgnoreSliceElements(func(t string) bool { return t == "dicts" || t == "service_levels" })); diff != "" {
494496
t.Fatal(diff)
495497
}
496498
})

pkg/service/backup/testdata/get_target/filter_keyspaces.golden.json

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
11
{
22
"units": [
33
{
4-
"keyspace": "system_distributed_everywhere",
4+
"keyspace": "system_distributed",
55
"tables": [
6-
"cdc_generation_descriptions_v2"
6+
"view_build_status",
7+
"cdc_generation_timestamps",
8+
"cdc_streams_descriptions_v2"
79
],
810
"all_tables": true
911
},
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{"keyspace": ["system_distributed_everywhere.*"], "location": ["s3:backuptest-get-target"]}
1+
{"keyspace": ["system_distributed.*"], "location": ["s3:backuptest-get-target"]}

pkg/service/repair/service_repair_integration_test.go

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -453,8 +453,10 @@ func TestServiceGetTargetIntegration(t *testing.T) {
453453
cmpopts.SortSlices(func(a, b string) bool { return a < b }),
454454
cmpopts.SortSlices(func(u1, u2 repair.Unit) bool { return u1.Keyspace < u2.Keyspace }),
455455
cmpopts.IgnoreUnexported(repair.Target{}),
456-
cmpopts.IgnoreSliceElements(func(u repair.Unit) bool { return u.Keyspace == "system_replicated_keys" || u.Keyspace == "system_auth" }),
457-
cmpopts.IgnoreSliceElements(func(t string) bool { return t == "dicts" }),
456+
cmpopts.IgnoreSliceElements(func(u repair.Unit) bool {
457+
return u.Keyspace == "system_replicated_keys" || u.Keyspace == "system_auth" || u.Keyspace == "system_distributed_everywhere"
458+
}),
459+
cmpopts.IgnoreSliceElements(func(t string) bool { return t == "dicts" || t == "service_levels" }),
458460
cmpopts.IgnoreFields(repair.Target{}, "Host")); diff != "" {
459461
t.Fatal(diff)
460462
}

pkg/service/repair/testdata/ServiceGetTargetIntegration/complex.golden.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
{
22
"units": [
33
{
4-
"Keyspace": "system_distributed_everywhere",
4+
"Keyspace": "system_replicated_keys",
55
"Tables": [
6-
"cdc_generation_descriptions_v2"
6+
"encrypted_keys"
77
],
88
"AllTables": true
99
}

pkg/service/repair/testdata/ServiceGetTargetIntegration/complex.input.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"keyspace": [
3-
"system_distributed_everywhere.cdc_generation_descriptions_v2","system_traces.node*"
3+
"system_replicated_keys.encrypted_keys","system_traces.node*"
44
],
55
"dc": [
66
"dc1"

pkg/service/restore/service_restore_integration_test.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -367,6 +367,7 @@ func TestRestoreGetTargetUnitsViewsIntegration(t *testing.T) {
367367
ignoreTarget := []string{
368368
"!system_auth.*",
369369
"!system_distributed.service_levels",
370+
"!system_distributed_everywhere.cdc_generation_descriptions_v2",
370371
}
371372
// It's not possible to create views on tablet keyspaces
372373
var ignoredViews []string

0 commit comments

Comments
 (0)