Repository navigation
Commit 58ac133
[fix](test) serialize backup/restore suites toggling restore_reset_index_id (build #198126)
restore_reset_index_id is a single process-global, master-only, mutable FE
config read at RESTORE execution time (OlapTable.resetIdsForRestore). Three
suites mutate it:
- backup_restore/test_backup_restore_reset_index_id (sets true, then asserts
the restored index id was reset to a new value)
- backup_restore/test_backup_restore_inverted_idx (sets false / true)
- restore_p0/test_validate_restore_inverted_idx (sets false / true)
Because the regression framework runs NORMAL suites in parallel, one suite can
flip the shared global config between another suite's BACKUP and RESTORE. In
build #198126 a concurrent suite set restore_reset_index_id=false after
test_backup_restore_reset_index_id had set it true, so that suite's RESTORE
took the else-branch, kept the original index id, and the line-142 assertion
failed (old id == new id).
Add these suites to the `nonConcurrent` group so they run serially in the
single-thread SINGLE phase and can no longer race on the shared global config.
The FE reset logic itself is correct; this is purely a test-isolation fix. Same
design exists on apache/master; forward-port there too.
Co-Authored-By: Claude Opus 4.8 (1M context) <[email protected]>1 parent 4b2feaf commit 58ac133
3 files changed
Lines changed: 3 additions & 3 deletions
File tree
- regression-test/suites
- backup_restore
- restore_p0
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
15 | 15 | | |
16 | 16 | | |
17 | 17 | | |
18 | | - | |
| 18 | + | |
19 | 19 | | |
20 | 20 | | |
21 | 21 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
15 | 15 | | |
16 | 16 | | |
17 | 17 | | |
18 | | - | |
| 18 | + | |
19 | 19 | | |
20 | 20 | | |
21 | 21 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
15 | 15 | | |
16 | 16 | | |
17 | 17 | | |
18 | | - | |
| 18 | + | |
19 | 19 | | |
20 | 20 | | |
21 | 21 | | |
| |||
0 commit comments