From 98d8551902703a1852e729fc2ffe30fea5b98751 Mon Sep 17 00:00:00 2001 From: gy389672 Date: Tue, 30 Jun 2026 16:36:33 +0800 Subject: [PATCH 1/7] alter obd version --- deps/init/oceanbase.el9.x86_64.deps | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deps/init/oceanbase.el9.x86_64.deps b/deps/init/oceanbase.el9.x86_64.deps index d6f36741c..542700bda 100644 --- a/deps/init/oceanbase.el9.x86_64.deps +++ b/deps/init/oceanbase.el9.x86_64.deps @@ -62,6 +62,6 @@ obshell-4.4.1.1-32026031914.el8.x86_64.rpm target=community #obshell-4.5.0.0-12026050816.el8.x86_64.rpm target=community [test-utils] -ob-deploy-4.1.0-2.el8.x86_64.rpm target=community +ob-deploy-4.4.0-5.el8.x86_64.rpm target=community obclient-2.2.2-1.el8.x86_64.rpm target=community libobclient-2.2.2-3.el8.x86_64.rpm target=community From 32c3e84425105185b75d43fba31b7e07ece5f356 Mon Sep 17 00:00:00 2001 From: gy389672 Date: Wed, 1 Jul 2026 10:18:49 +0800 Subject: [PATCH 2/7] fix obshell --- .../seekdb/scripts/mysqltest_for_seekdb.sh | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/.github/script/seekdb/scripts/mysqltest_for_seekdb.sh b/.github/script/seekdb/scripts/mysqltest_for_seekdb.sh index 8b8bb440d..41c02c6af 100755 --- a/.github/script/seekdb/scripts/mysqltest_for_seekdb.sh +++ b/.github/script/seekdb/scripts/mysqltest_for_seekdb.sh @@ -333,6 +333,24 @@ EOF fi } +function copy_obshell_to_bin { + local bin_dir=$1 + local obshell_src="" + for cand in \ + "$HOME/seekdb/tools/deploy/bin/obshell" \ + "$DEP_PATH/home/admin/oceanbase/bin/obshell"; do + if [[ -x "$cand" ]]; then + obshell_src="$cand" + break + fi + done + if [[ -n "$obshell_src" ]]; then + cp -f "$obshell_src" "$bin_dir/obshell" && chmod +x "$bin_dir/obshell" + else + echo "[WARN] obshell not found in deps, skip packaging obshell into mirror" + fi +} + function obd_prepare_bin { cd $HOME mkdir -p $DOWNLOAD_DIR/{bin,etc,admin} || return 1 @@ -361,6 +379,7 @@ function obd_prepare_bin { then cd $HOME/seekdb/tools/deploy && [[ -f copy.sh ]] && sh copy.sh fi + copy_obshell_to_bin "$DOWNLOAD_DIR/bin" if [[ -f "$HOME/seekdb/tools/deploy/obd/.observer_obd_plugin_version" ]] then obs_version=$(cat $HOME/seekdb/tools/deploy/obd/.observer_obd_plugin_version) From fa171c38c22c2a253243fbc351b70b26811523df Mon Sep 17 00:00:00 2001 From: gy389672 Date: Wed, 1 Jul 2026 11:49:41 +0800 Subject: [PATCH 3/7] start_obshell: false --- .github/script/seekdb/scripts/mysqltest_for_seekdb.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/script/seekdb/scripts/mysqltest_for_seekdb.sh b/.github/script/seekdb/scripts/mysqltest_for_seekdb.sh index 41c02c6af..3d556a6e1 100755 --- a/.github/script/seekdb/scripts/mysqltest_for_seekdb.sh +++ b/.github/script/seekdb/scripts/mysqltest_for_seekdb.sh @@ -285,6 +285,7 @@ EOF fi extra_conf="""$MYSQLRTEST_ARGS $CGROUP_CONFIG + start_obshell: false """ conf=${conf//'{{%% PROXY_CONF %%}}'/"$extra_conf"} conf=${conf//'{{%% DEPLOY_PATH %%}}'/"$HOME/seekdb/tools/deploy"} From 384187f3fc052ccd5ec22dd329dc140ecfa175ae Mon Sep 17 00:00:00 2001 From: gy389672 Date: Wed, 1 Jul 2026 14:46:49 +0800 Subject: [PATCH 4/7] alter obd version --- .../seekdb/scripts/mysqltest_for_seekdb.sh | 19 +++++++++++++++---- deps/init/oceanbase.el9.x86_64.deps | 2 +- 2 files changed, 16 insertions(+), 5 deletions(-) diff --git a/.github/script/seekdb/scripts/mysqltest_for_seekdb.sh b/.github/script/seekdb/scripts/mysqltest_for_seekdb.sh index 3d556a6e1..9dbaf0539 100755 --- a/.github/script/seekdb/scripts/mysqltest_for_seekdb.sh +++ b/.github/script/seekdb/scripts/mysqltest_for_seekdb.sh @@ -285,7 +285,6 @@ EOF fi extra_conf="""$MYSQLRTEST_ARGS $CGROUP_CONFIG - start_obshell: false """ conf=${conf//'{{%% PROXY_CONF %%}}'/"$extra_conf"} conf=${conf//'{{%% DEPLOY_PATH %%}}'/"$HOME/seekdb/tools/deploy"} @@ -399,17 +398,29 @@ function obd_prepare_bin { } +function obd_ci_strip_obshell { + # mirror 保留 obshell；启动前删掉部署目录里的二进制，让 obshell_start 插件 skip + rm -f "$DATA_PATH"/observer*/bin/obshell 2>/dev/null || true +} + +function obd_cluster_deploy_and_start { + [[ -f $HOME/seekdb/tools/deploy/activate_obd.sh ]] && source $HOME/seekdb/tools/deploy/activate_obd.sh + $obd cluster deploy $ob_name -c $HOME/seekdb/tools/deploy/config.yaml -f || return 1 + obd_ci_strip_obshell + $obd cluster start $ob_name -f && $obd cluster display $ob_name +} + function obd_init_cluster { retries=$reboot_retries while (( $retries > 0 )) do if [[ "$retries" == "$reboot_retries" ]] then - [[ -f $HOME/seekdb/tools/deploy/activate_obd.sh ]] && source $HOME/seekdb/tools/deploy/activate_obd.sh - $obd cluster deploy $ob_name -c $HOME/seekdb/tools/deploy/config.yaml -f && $obd cluster start $ob_name -f && $obd cluster display $ob_name + obd_cluster_deploy_and_start else [[ -f $HOME/seekdb/tools/deploy/activate_obd.sh ]] && source $HOME/seekdb/tools/deploy/activate_obd.sh - $obd cluster redeploy $ob_name -f + $obd cluster destroy $ob_name -f 2>/dev/null || true + obd_cluster_deploy_and_start fi retries=`expr $retries - 1` ./obclient -h 127.1 -P $MYSQL_PORT -u root -A -e "alter system set_tp tp_no = 509, error_code = 4016, frequency = 1;" diff --git a/deps/init/oceanbase.el9.x86_64.deps b/deps/init/oceanbase.el9.x86_64.deps index 542700bda..272274a9e 100644 --- a/deps/init/oceanbase.el9.x86_64.deps +++ b/deps/init/oceanbase.el9.x86_64.deps @@ -62,6 +62,6 @@ obshell-4.4.1.1-32026031914.el8.x86_64.rpm target=community #obshell-4.5.0.0-12026050816.el8.x86_64.rpm target=community [test-utils] -ob-deploy-4.4.0-5.el8.x86_64.rpm target=community +ob-deploy-4.1.x-190.el8.x86_64.rpm target=community obclient-2.2.2-1.el8.x86_64.rpm target=community libobclient-2.2.2-3.el8.x86_64.rpm target=community From 97217c6cfa6837ab317f90141c2d67fdd64947b4 Mon Sep 17 00:00:00 2001 From: gy389672 Date: Wed, 1 Jul 2026 15:48:00 +0800 Subject: [PATCH 5/7] alter obd version --- .github/script/seekdb/scripts/mysqltest_for_seekdb.sh | 8 ++++++-- deps/init/oceanbase.el9.x86_64.deps | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.github/script/seekdb/scripts/mysqltest_for_seekdb.sh b/.github/script/seekdb/scripts/mysqltest_for_seekdb.sh index 9dbaf0539..f721d248a 100755 --- a/.github/script/seekdb/scripts/mysqltest_for_seekdb.sh +++ b/.github/script/seekdb/scripts/mysqltest_for_seekdb.sh @@ -576,9 +576,13 @@ function obd_run_mysqltest { obd_prepare_config echo "config after change:" cat $HOME/seekdb/tools/deploy/config.yaml - $obd cluster destroy $ob_name && $obd cluster deploy $ob_name -c $HOME/seekdb/tools/deploy/config.yaml && $obd cluster start $ob_name -f && $obd cluster display $ob_name + [[ -f $HOME/seekdb/tools/deploy/activate_obd.sh ]] && source $HOME/seekdb/tools/deploy/activate_obd.sh + $obd cluster destroy $ob_name -f 2>/dev/null || true + obd_cluster_deploy_and_start else - $obd cluster redeploy $ob_name + [[ -f $HOME/seekdb/tools/deploy/activate_obd.sh ]] && source $HOME/seekdb/tools/deploy/activate_obd.sh + $obd cluster destroy $ob_name -f 2>/dev/null || true + obd_cluster_deploy_and_start fi obd_init_cluster $mysqltest_cmd $INIT_FLIES --test-set=$TEST_CASES --sp-hint="$SP_HINT" $RESULT_ARGS $EXTRA_ARGS_WITHOUT_CASE 2>&1 | tee compare.out && ( exit ${PIPESTATUS[0]}) diff --git a/deps/init/oceanbase.el9.x86_64.deps b/deps/init/oceanbase.el9.x86_64.deps index 272274a9e..542700bda 100644 --- a/deps/init/oceanbase.el9.x86_64.deps +++ b/deps/init/oceanbase.el9.x86_64.deps @@ -62,6 +62,6 @@ obshell-4.4.1.1-32026031914.el8.x86_64.rpm target=community #obshell-4.5.0.0-12026050816.el8.x86_64.rpm target=community [test-utils] -ob-deploy-4.1.x-190.el8.x86_64.rpm target=community +ob-deploy-4.4.0-5.el8.x86_64.rpm target=community obclient-2.2.2-1.el8.x86_64.rpm target=community libobclient-2.2.2-3.el8.x86_64.rpm target=community From 9728dd8b9c542d30babe5d0d1b466563f266ca3a Mon Sep 17 00:00:00 2001 From: gy389672 Date: Wed, 1 Jul 2026 16:36:16 +0800 Subject: [PATCH 6/7] alter --- .github/script/seekdb/scripts/mysqltest_for_seekdb.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/script/seekdb/scripts/mysqltest_for_seekdb.sh b/.github/script/seekdb/scripts/mysqltest_for_seekdb.sh index f721d248a..da957141f 100755 --- a/.github/script/seekdb/scripts/mysqltest_for_seekdb.sh +++ b/.github/script/seekdb/scripts/mysqltest_for_seekdb.sh @@ -775,6 +775,8 @@ export -f obd_prepare_global export -f obd_prepare_config export -f obd_run_mysqltest export -f obd_init_cluster +export -f obd_ci_strip_obshell +export -f obd_cluster_deploy_and_start export -f is_case_selector_arg function run { From e2bcec5953d9a4539dab655a0891610a81c427ab Mon Sep 17 00:00:00 2001 From: gy389672 Date: Wed, 1 Jul 2026 19:28:17 +0800 Subject: [PATCH 7/7] alter mysqltest --- .../seekdb/scripts/mysqltest_for_seekdb.sh | 28 ++++--------------- 1 file changed, 5 insertions(+), 23 deletions(-) diff --git a/.github/script/seekdb/scripts/mysqltest_for_seekdb.sh b/.github/script/seekdb/scripts/mysqltest_for_seekdb.sh index da957141f..41c02c6af 100755 --- a/.github/script/seekdb/scripts/mysqltest_for_seekdb.sh +++ b/.github/script/seekdb/scripts/mysqltest_for_seekdb.sh @@ -398,29 +398,17 @@ function obd_prepare_bin { } -function obd_ci_strip_obshell { - # mirror 保留 obshell；启动前删掉部署目录里的二进制，让 obshell_start 插件 skip - rm -f "$DATA_PATH"/observer*/bin/obshell 2>/dev/null || true -} - -function obd_cluster_deploy_and_start { - [[ -f $HOME/seekdb/tools/deploy/activate_obd.sh ]] && source $HOME/seekdb/tools/deploy/activate_obd.sh - $obd cluster deploy $ob_name -c $HOME/seekdb/tools/deploy/config.yaml -f || return 1 - obd_ci_strip_obshell - $obd cluster start $ob_name -f && $obd cluster display $ob_name -} - function obd_init_cluster { retries=$reboot_retries while (( $retries > 0 )) do if [[ "$retries" == "$reboot_retries" ]] then - obd_cluster_deploy_and_start + [[ -f $HOME/seekdb/tools/deploy/activate_obd.sh ]] && source $HOME/seekdb/tools/deploy/activate_obd.sh + $obd cluster deploy $ob_name -c $HOME/seekdb/tools/deploy/config.yaml -f && $obd cluster start $ob_name -f && $obd cluster display $ob_name else [[ -f $HOME/seekdb/tools/deploy/activate_obd.sh ]] && source $HOME/seekdb/tools/deploy/activate_obd.sh - $obd cluster destroy $ob_name -f 2>/dev/null || true - obd_cluster_deploy_and_start + $obd cluster redeploy $ob_name -f fi retries=`expr $retries - 1` ./obclient -h 127.1 -P $MYSQL_PORT -u root -A -e "alter system set_tp tp_no = 509, error_code = 4016, frequency = 1;" @@ -576,13 +564,9 @@ function obd_run_mysqltest { obd_prepare_config echo "config after change:" cat $HOME/seekdb/tools/deploy/config.yaml - [[ -f $HOME/seekdb/tools/deploy/activate_obd.sh ]] && source $HOME/seekdb/tools/deploy/activate_obd.sh - $obd cluster destroy $ob_name -f 2>/dev/null || true - obd_cluster_deploy_and_start + $obd cluster destroy $ob_name && $obd cluster deploy $ob_name -c $HOME/seekdb/tools/deploy/config.yaml && $obd cluster start $ob_name -f && $obd cluster display $ob_name else - [[ -f $HOME/seekdb/tools/deploy/activate_obd.sh ]] && source $HOME/seekdb/tools/deploy/activate_obd.sh - $obd cluster destroy $ob_name -f 2>/dev/null || true - obd_cluster_deploy_and_start + $obd cluster redeploy $ob_name fi obd_init_cluster $mysqltest_cmd $INIT_FLIES --test-set=$TEST_CASES --sp-hint="$SP_HINT" $RESULT_ARGS $EXTRA_ARGS_WITHOUT_CASE 2>&1 | tee compare.out && ( exit ${PIPESTATUS[0]}) @@ -775,8 +759,6 @@ export -f obd_prepare_global export -f obd_prepare_config export -f obd_run_mysqltest export -f obd_init_cluster -export -f obd_ci_strip_obshell -export -f obd_cluster_deploy_and_start export -f is_case_selector_arg function run {