From cc9712edcddce5acdda956b8bf708b5b5365bb14 Mon Sep 17 00:00:00 2001
From: Leonid Fedorov <leonid.fedorov@mariadb.com>
Date: Thu, 31 Jul 2025 12:16:13 +0000
Subject: [PATCH] Run basic mtr without extern

---
 build/run_mtr.sh | 50 ++++++++++++++++++++++++++++++++----------------
 build/utils.sh   |  6 +++++-
 2 files changed, 39 insertions(+), 17 deletions(-)

diff --git a/build/run_mtr.sh b/build/run_mtr.sh
index 8c015e7df..4b861fb9e 100755
--- a/build/run_mtr.sh
+++ b/build/run_mtr.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-set -eo pipefail
+set -eox pipefail
 
 SCRIPT_LOCATION=$(dirname "$0")
 source "$SCRIPT_LOCATION"/utils.sh
@@ -9,8 +9,19 @@ optparse.define short=c long=container-name desc="Name of the Docker container w
 optparse.define short=d long=distro desc="Linux distro for which mtr is runned" variable=DISTRO
 optparse.define short=s long=suite-list desc="Comma-separated list of test suites to run" variable=MTR_SUITE_LIST
 optparse.define short=e long=triggering-event desc="Event that triggers testrun" variable=EVENT
+optparse.define short=D long=download-data desc="Download and extract data from S3 for extended MTR" variable=DOWNLOAD_DATA default false value true
+optparse.define short=F long=full-mtr desc="Run Full Mtr" variable=FULL_MTR default false value true
+
 source $(optparse.build)
 
+if [[ "${EVENT}" == "cron" ]]; then
+    FULL_MTR = true
+fi
+
+if [[ $FULL_MTR = true ]]; then
+    DOWNLOAD_DATA=true
+fi
+
 MTR_FULL_SET="basic,bugfixes,devregression,autopilot,extended,multinode,oracle,1pmonly"
 
 echo "Arguments received: $@"
@@ -21,10 +32,10 @@ if [[ "$EUID" -ne 0 ]]; then
 fi
 
 for flag in CONTAINER_NAME DISTRO EVENT MTR_SUITE_LIST; do
-  if [[ -z "${!flag}" ]]; then
-    error "Missing required flag: -${flag:0:1} / --${flag,,}"
-    exit 1
-  fi
+    if [[ -z "${!flag}" ]]; then
+        error "Missing required flag: -${flag:0:1} / --${flag,,}"
+        exit 1
+    fi
 done
 
 if [[ -z $(docker ps -q --filter "name=${CONTAINER_NAME}") ]]; then
@@ -34,10 +45,8 @@ fi
 
 select_pkg_format ${DISTRO}
 
-
 message "Running mtr tests..."
 
-
 # disable systemd 'ProtectSystem' (we need to write to /usr/share/)
 execInnerDocker "${CONTAINER_NAME}" "sed -i /ProtectSystem/d \$(systemctl show --property FragmentPath mariadb | sed s/FragmentPath=//) || true"
 execInnerDocker "${CONTAINER_NAME}" "systemctl daemon-reload"
@@ -48,9 +57,8 @@ execInnerDocker "${CONTAINER_NAME}" "/usr/bin/mcsSetConfig SystemConfig CGroup j
 execInnerDocker "${CONTAINER_NAME}" "mariadb -e \"create database if not exists test;\""
 execInnerDocker "${CONTAINER_NAME}" "systemctl restart mariadb-columnstore"
 
-
-VERSION_GREATER_THAN_10=$(execInnerDocker "${CONTAINER_NAME}" "mariadb -N -s -e 'SELECT (sys.version_major(), sys.version_minor(), sys.version_patch()) >= (11, 4, 0);'")
-SOCKET_PATH=$(execInnerDocker "${CONTAINER_NAME}" "mariadb -e \"show variables like 'socket';\" | grep socket | cut -f2")
+VERSION_GREATER_THAN_10=$(execInnerDockerStripped "${CONTAINER_NAME}" "mariadb -N -s -e 'SELECT (sys.version_major(), sys.version_minor(), sys.version_patch()) >= (11, 4, 0);'")
+SOCKET_PATH=$(execInnerDockerStripped "${CONTAINER_NAME}" "mariadb -e \"show variables like 'socket';\" | grep socket | cut -f2")
 
 SERVERNAME="mysql"
 if [[ $VERSION_GREATER_THAN_10 == "1" ]]; then
@@ -63,18 +71,28 @@ else
     MTR_PATH="/usr/share/${SERVERNAME}/${SERVERNAME}-test"
 fi
 
-
 message "Running mtr tests from $MTR_PATH with $SOCKET_PATH and version >=11.4 $VERSION_GREATER_THAN_10"
 
 execInnerDocker "${CONTAINER_NAME}" "chown -R mysql:mysql ${MTR_PATH}"
 
-if [[ "${EVENT}" == "custom" || "${EVENT}" == "cron" ]]; then
+if [[ $DOWNLOAD_DATA = true ]]; then
     execInnerDocker "${CONTAINER_NAME}" "wget -qO- https://cspkg.s3.amazonaws.com/mtr-test-data.tar.lz4 | lz4 -dc - | tar xf - -C /"
     execInnerDocker "${CONTAINER_NAME}" "cd ${MTR_PATH} && ./mtr --extern socket=${SOCKET_PATH} --force --print-core=detailed --print-method=gdb --max-test-fail=0 --suite=columnstore/setup"
 fi
 
-if [[ "${EVENT}" == "cron" ]]; then
-    execInnerDocker "${CONTAINER_NAME}" "cd ${MTR_PATH} && ./mtr --extern socket=${SOCKET_PATH} --force --print-core=detailed --print-method=gdb --max-test-fail=0 --suite=columnstore/${MTR_FULL_SET//,/,columnstore/}"
+EXTERN_FLAG=""
+
+if [[ $FULL_MTR = true ]]; then
+    EXTERN_FLAG="--extern socket=${SOCKET_PATH}"
+fi
+
+MTR_RUN_COMMAND="cd ${MTR_PATH} && ./mtr ${EXTERN_FLAG} --force --print-core=detailed --print-method=gdb --max-test-fail=0 --big-test \
+                                  --verbose-restart --skip-test=rocksdb_hotbackup*"
+
+if [[ $FULL_MTR = true ]]; then
+    MTR_RUN_COMMAND="$MTR_RUN_COMMAND --suite=columnstore/${MTR_FULL_SET//,/,columnstore/}"
 else
-    execInnerDocker "${CONTAINER_NAME}" "cd ${MTR_PATH} && ./mtr --extern socket=${SOCKET_PATH} --force --print-core=detailed --print-method=gdb --max-test-fail=0 --suite=columnstore/${MTR_SUITE_LIST//,/,columnstore/}"
-fi
\ No newline at end of file
+    MTR_RUN_COMMAND="$MTR_RUN_COMMAND --suite=columnstore/${MTR_SUITE_LIST//,/,columnstore/}"
+fi
+
+execInnerDocker "${CONTAINER_NAME}" "${MTR_RUN_COMMAND}"
diff --git a/build/utils.sh b/build/utils.sh
index 92bb775f0..e90eb522c 100644
--- a/build/utils.sh
+++ b/build/utils.sh
@@ -536,7 +536,7 @@ function execInnerDocker() {
   local container_name=$1
   shift 1 # Remove first arg (container_name)
 
-  docker exec -t "$container_name" bash -c "$@" | tr -d '[:space:]'
+  docker exec -t "$container_name" bash -c "$@"
   local dockerCommandExitCode=$?
 
   if [[ $dockerCommandExitCode -ne 0 ]]; then
@@ -545,6 +545,10 @@ function execInnerDocker() {
   fi
 }
 
+function execInnerDockerStripped() {
+  execInnerDocker "$@" | tr -d '[:space:]'
+}
+
 function execInnerDockerNoTTY() {
   local container_name=$1
   shift 1