Skip to content

Commit 58ac133

Browse files
morningmanclaude
andcommitted
[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/test_backup_restore_inverted_idx.groovy‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
// specific language governing permissions and limitations
1616
// under the License.
1717

18-
suite("test_backup_restore_inverted_idx", "backup_restore") {
18+
suite("test_backup_restore_inverted_idx", "backup_restore,nonConcurrent") {
1919
String suiteName = "test_backup_restore_inverted_idx"
2020
String dbName = "${suiteName}_db"
2121
String repoName = "${suiteName}_repo_" + UUID.randomUUID().toString().replace("-", "")

‎regression-test/suites/backup_restore/test_backup_restore_reset_index_id.groovy‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
// specific language governing permissions and limitations
1616
// under the License.
1717

18-
suite("test_backup_restore_reset_index_id", "backup_restore") {
18+
suite("test_backup_restore_reset_index_id", "backup_restore,nonConcurrent") {
1919
String suiteName = "test_backup_restore_reset_index_id"
2020
String dbName = "${suiteName}_db"
2121
String repoName = "${suiteName}_repo_" + UUID.randomUUID().toString().replace("-", "")

‎regression-test/suites/restore_p0/test_validate_restore_inverted_idx.groovy‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
// specific language governing permissions and limitations
1616
// under the License.
1717

18-
suite("test_validate_restore_inverted_idx", "validate_restore") {
18+
suite("test_validate_restore_inverted_idx", "validate_restore,nonConcurrent") {
1919
def runValidateRestoreInvertedIdx = { String version ->
2020
String validateSuiteName = "test_backup_restore_inverted_idx"
2121
String dbName = "${validateSuiteName}_db_${version.replace('.', '_')}"

0 commit comments

Comments
 (0)