Skip to content

Commit 375d9d7

Browse files
fix(restore): update restore cdc blacklist
Fixes #3601
1 parent 6fa5f19 commit 375d9d7

File tree

4 files changed

+11
-3
lines changed

4 files changed

+11
-3
lines changed

pkg/service/restore/testdata/get_target/continue_false.target.json

+3-1
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,16 @@
66
"*.*",
77
"!system.*",
88
"!system_schema.*",
9+
"!system_distributed_everywhere.cdc_generation_descriptions",
910
"!system_distributed_everywhere.cdc_generation_descriptions_v2",
11+
"!system_distributed.cdc_streams_descriptions",
1012
"!system_distributed.cdc_streams_descriptions_v2",
1113
"!system_distributed.cdc_generation_timestamps",
1214
"!*.*_scylla_cdc_log",
1315
"!ks1.mv1",
1416
"!ks2.si1_index"
1517
],
16-
"snapshot_tag": "sm_20230921151320UTC",
18+
"snapshot_tag": "sm_20231109110956UTC",
1719
"batch_size": 2,
1820
"restore_tables": true,
1921
"continue": false

pkg/service/restore/testdata/get_target/default_values.target.json

+3-1
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,16 @@
66
"*.*",
77
"!system.*",
88
"!system_schema.*",
9+
"!system_distributed_everywhere.cdc_generation_descriptions",
910
"!system_distributed_everywhere.cdc_generation_descriptions_v2",
11+
"!system_distributed.cdc_streams_descriptions",
1012
"!system_distributed.cdc_streams_descriptions_v2",
1113
"!system_distributed.cdc_generation_timestamps",
1214
"!*.*_scylla_cdc_log",
1315
"!ks1.mv1",
1416
"!ks2.si1_index"
1517
],
16-
"snapshot_tag": "sm_20230921151320UTC",
18+
"snapshot_tag": "sm_20231109110956UTC",
1719
"batch_size": 2,
1820
"restore_tables": true,
1921
"continue": true

pkg/service/restore/testdata/get_target/tables.target.json

+3-1
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,16 @@
77
"!ks1.table2",
88
"!system.*",
99
"!system_schema.*",
10+
"!system_distributed_everywhere.cdc_generation_descriptions",
1011
"!system_distributed_everywhere.cdc_generation_descriptions_v2",
12+
"!system_distributed.cdc_streams_descriptions",
1113
"!system_distributed.cdc_streams_descriptions_v2",
1214
"!system_distributed.cdc_generation_timestamps",
1315
"!*.*_scylla_cdc_log",
1416
"!ks1.mv1",
1517
"!ks2.si1_index"
1618
],
17-
"snapshot_tag": "sm_20230921151320UTC",
19+
"snapshot_tag": "sm_20231109110956UTC",
1820
"batch_size": 99,
1921
"parallel": 98,
2022
"restore_tables": true,

pkg/service/restore/worker.go

+2
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,9 @@ func (w *worker) initTarget(ctx context.Context, properties json.RawMessage) err
7474
// Currently, it is forbidden to alter those tables, so SM wouldn't be able to ensure their data consistency.
7575
// Moreover, those tables usually contain data with small TTL value,
7676
// so their contents would probably expire right after restore has ended.
77+
"system_distributed_everywhere.cdc_generation_descriptions",
7778
"system_distributed_everywhere.cdc_generation_descriptions_v2",
79+
"system_distributed.cdc_streams_descriptions",
7880
"system_distributed.cdc_streams_descriptions_v2",
7981
"system_distributed.cdc_generation_timestamps",
8082
"*.*_scylla_cdc_log", // All regular CDC tables have "_scylla_cdc_log" suffix

0 commit comments

Comments
 (0)