From 01a9a47bfaa608e9706cf9da1a70f6b9e9c913d7 Mon Sep 17 00:00:00 2001 From: hnwyllmm Date: Wed, 22 Jul 2026 17:57:00 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' into task/2026071500117452260-v2 # Conflicts # tools/deploy/mysqltest_config.yaml --- .../test_suite/fork_table/r/mysql/fork_table_merge.result | 2 +- .../mysql_test/test_suite/fork_table/t/fork_table_merge.test | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/deploy/mysql_test/test_suite/fork_table/r/mysql/fork_table_merge.result b/tools/deploy/mysql_test/test_suite/fork_table/r/mysql/fork_table_merge.result index 02416e8e3..6f3fec187 100644 --- a/tools/deploy/mysql_test/test_suite/fork_table/r/mysql/fork_table_merge.result +++ b/tools/deploy/mysql_test/test_suite/fork_table/r/mysql/fork_table_merge.result @@ -5,7 +5,7 @@ SET wait_timeout=30000000; SET ob_trx_timeout = 100000000; SET ob_query_timeout = 100000000; # 启用debug sync -alter system set debug_sync_timeout = '60s'; +alter system set debug_sync_timeout = '90s'; set ob_global_debug_sync = 'reset'; # 加速major freeze alter system set merger_check_interval = '10s' tenant sys; diff --git a/tools/deploy/mysql_test/test_suite/fork_table/t/fork_table_merge.test b/tools/deploy/mysql_test/test_suite/fork_table/t/fork_table_merge.test index 531569743..fe42a8169 100644 --- a/tools/deploy/mysql_test/test_suite/fork_table/t/fork_table_merge.test +++ b/tools/deploy/mysql_test/test_suite/fork_table/t/fork_table_merge.test @@ -19,7 +19,7 @@ SET ob_query_timeout = 100000000; --echo # 启用debug sync connection obsys; -alter system set debug_sync_timeout = '60s'; +alter system set debug_sync_timeout = '90s'; sleep 3; set ob_global_debug_sync = 'reset'; connection default; @@ -76,7 +76,7 @@ connection obsys; --disable_result_log let $table_id = `select table_id from oceanbase.__all_table where table_name = 't1' limit 1`; let $tablet_cnt = `select count(*) as c from oceanbase.__all_tablet_to_table where table_id = $table_id`; -let $wait_timeout= 30; +let $wait_timeout= 60; let $wait_condition= select /*+query_timeout(100000000)*/ count(distinct tablet_id) = $tablet_cnt from oceanbase.__all_virtual_tablet_compaction_history