MCOL-6022 mtr with extern

Author: mariadb-AlekseiBukhalov

build/run_mtr.sh

@@ -41,27 +41,26 @@ fi
 message "Running mtr tests..."
 
 execInnerDocker "${CONTAINER_NAME}" "chown -R mysql:mysql ${MTR_PATH}"
-execInnerDocker "${CONTAINER_NAME}" "mkdir -p /dev/shm/var/run && chown -R mysql:mysql /dev/shm/var/run"
 
 # 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 && systemctl daemon-reexec"
-execInnerDocker "${CONTAINER_NAME}" "systemctl stop mariadb"
+execInnerDocker "${CONTAINER_NAME}" "systemctl daemon-reload"
+execInnerDocker "${CONTAINER_NAME}" "systemctl start mariadb"
 
 # Set RAM consumption limits to avoid RAM contention b/w mtr and regression steps.
-#execInnerDocker "${CONTAINER_NAME}" "/usr/bin/mcsSetConfig SystemConfig CGroup just_no_group_use_local"
-#execInnerDocker "${CONTAINER_NAME}" "mariadb -e \"create database if not exists test;\""
-#execInnerDocker "${CONTAINER_NAME}" "systemctl restart mariadb-columnstore"
+execInnerDocker "${CONTAINER_NAME}" "/usr/bin/mcsSetConfig SystemConfig CGroup just_no_group_use_local"
+execInnerDocker "${CONTAINER_NAME}" "mariadb -e \"create database if not exists test;\""
+execInnerDocker "${CONTAINER_NAME}" "systemctl restart mariadb-columnstore"
 
 #TODO: should all actions until this point be a part of prepare_test_stage.sh?
 
 if [[ "${EVENT}" == "custom" || "${EVENT}" == "cron" ]]; then
-    execInnerDocker "${CONTAINER_NAME}" "wget -qO- https://cspkg.s3.amazonaws.com/mtr-test-data.tar.lz4 | lz4 -dc - | tar xf - -C /"  #TODO: Data for extended tests( out of scope of basic, bugfixes) set should be downloaded and unpacked for extended version only.
-    execInnerDocker "${CONTAINER_NAME}" "su -s /bin/bash mysql -c \"cd ${MTR_PATH} && perl ./mtr --parallel=auto --force --print-core=detailed --print-method=gdb --max-test-fail=0 --suite=columnstore/setup\""
+    execInnerDocker "${CONTAINER_NAME}" "cd ${MTR_PATH} && ./mtr --extern socket=${SOCKET_PATH} --parallel=auto --force --print-core=detailed --print-method=gdb --max-test-fail=0 --suite=columnstore/setup"
+    execInnerDocker "${CONTAINER_NAME}" "wget -qO- https://cspkg.s3.amazonaws.com/mtr-test-data.tar.lz4 | lz4 -dc - | tar xf - -C /"
 fi
 
 if [[ "${EVENT}" == "cron" ]]; then
-    execInnerDocker "${CONTAINER_NAME}" "su -s /bin/bash mysql -c \"cd ${MTR_PATH} && perl ./mtr --parallel=auto --force --print-core=detailed --print-method=gdb --max-test-fail=0 --suite=columnstore/${MTR_FULL_SET//,/,columnstore/}\""
+    execInnerDocker "${CONTAINER_NAME}" "cd ${MTR_PATH} && ./mtr --extern socket=${SOCKET_PATH} --parallel=auto --force --print-core=detailed --print-method=gdb --max-test-fail=0 --suite=columnstore/${MTR_FULL_SET//,/,columnstore/}"
 else
-    execInnerDocker "${CONTAINER_NAME}" "su -s /bin/bash mysql -c \"cd ${MTR_PATH} && perl ./mtr --parallel=auto --force --print-core=detailed --print-method=gdb --max-test-fail=0 --suite=columnstore/${MTR_SUITE_LIST//,/,columnstore/}\""
+    execInnerDocker "${CONTAINER_NAME}" "cd ${MTR_PATH} && ./mtr --extern socket=${SOCKET_PATH} --parallel=auto --force --print-core=detailed --print-method=gdb --max-test-fail=0 --suite=columnstore/${MTR_SUITE_LIST//,/,columnstore/}"
 fi