From ecb77690c79b810ffd1bc46d39ba72940e6ba95c Mon Sep 17 00:00:00 2001
From: zhoupengcheng <zhoupengcheng11@huawei.com>
Date: Mon, 23 Oct 2023 11:01:36 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BD=BF=E7=94=A8=E6=96=B0=E7=9A=84mysql=5Fsys?=
 =?UTF-8?q?bench=5Fbenchmark.sh=E6=9B=BF=E6=8D=A2benchmark.sh?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 examples/tuning/mysql_sysbench/benchmark.sh   |  8 -----
 .../mysql_sysbench_benchmark.sh               |  4 +--
 examples/tuning/mysql_sysbench/prepare.sh     | 33 +++++++------------
 3 files changed, 14 insertions(+), 31 deletions(-)
 delete mode 100644 examples/tuning/mysql_sysbench/benchmark.sh

diff --git a/examples/tuning/mysql_sysbench/benchmark.sh b/examples/tuning/mysql_sysbench/benchmark.sh
deleted file mode 100644
index 4b4fab66..00000000
--- a/examples/tuning/mysql_sysbench/benchmark.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-TABLES={tables}
-TABLE_SIZE={table_size}
-
-sysbench --config-file=sysbench_config.cfg oltp_read_write --tables=$TABLES --table-size=$TABLE_SIZE --time=30 prepare
-
-taskset -c 2,3 sysbench --config-file=sysbench_config.cfg oltp_read_write --tables=$TABLES --table-size=$TABLE_SIZE --time=300 --mysql-ignore-errors=8005 run  > sysbench_oltp_read_write.log
-
-sysbench --config-file=sysbench_config.cfg oltp_read_write --tables=$TABLES --table-size=$TABLE_SIZE --mysql-ignore-errors=8005 cleanup
\ No newline at end of file
diff --git a/examples/tuning/mysql_sysbench/mysql_sysbench_benchmark.sh b/examples/tuning/mysql_sysbench/mysql_sysbench_benchmark.sh
index dda26d22..b35f6fc2 100644
--- a/examples/tuning/mysql_sysbench/mysql_sysbench_benchmark.sh
+++ b/examples/tuning/mysql_sysbench/mysql_sysbench_benchmark.sh
@@ -25,11 +25,11 @@ do
     fi
 done
 
-taskset -c 2,3 sysbench --config-file=sysbench_config.cfg oltp_read_write --tables=$TABLES --table-size=$TABLE_SIZE --time=300 --mysql-ignore-errors=8005 run  > sysbench_oltp_read_write.log
+taskset -c 2,3 sysbench --config-file=sysbench_config.cfg oltp_read_write --tables=$TABLES --table-size=$TABLE_SIZE --time=300 --mysql-ignore-errors=8005 run  > PATH//sysbench_oltp_read_write.log
 count=0
 while true
 do
-    val=$(cat mysql_sysbench/sysbench_oltp_read_write.log  | grep 'queries:' | awk -F '(' '{print $2}' | awk -F ' ' '{print $1}')
+    val=$(cat PATH/sysbench_oltp_read_write.log  | grep 'queries:' | awk -F '(' '{print $2}' | awk -F ' ' '{print $1}')
     if [ $val != "" ];then
         break
     elif [ $count == 10 ];then
diff --git a/examples/tuning/mysql_sysbench/prepare.sh b/examples/tuning/mysql_sysbench/prepare.sh
index 50d507da..973f80c7 100644
--- a/examples/tuning/mysql_sysbench/prepare.sh
+++ b/examples/tuning/mysql_sysbench/prepare.sh
@@ -96,33 +96,24 @@ if [ $? -ne 0 ]; then
     exit 1;   
 fi
 
-read -p "enter tables of sysbench to used:" tables
+read -p "enter table_num of sysbench to used:" tables
 read -p "enter table_size of sysbench to used:" table_size
 echo "update the client and server yaml files"
 sed -i "s#PATH#$path#g" $path/mysql_sysbench_client.yaml
 sed -i "s#PATH#$path#g" $path/get_eval.sh
-if [ "$is_restart" = "restart" ];then
-    sed -i "s#TABLES=.*#TABLES=$tables#g" $path/mysql_sysbench_benchmark.sh
-    sed -i "s#TABLE_SIZE=.*#TABLE_SIZE=$table_size#g" $path/mysql_sysbench_benchmark.sh
-
-    if [[ "$version" != *"20.03"* ]]; then
-        sed -i "s#startworkload:.*#startworkload: \"\`mysqld \& \` \& sleep 10\" #g" $path/mysql_sysbench_server.yaml
-        sed -i "s#stopworkload:.*#stopworkload: \"mysqladmin -S/var/lib/mysql/mysql.sock shutdown -uroot -p123456\" #g" $path/mysql_sysbench_server.yaml
-    else
-        sed -i "s#startworkload:.*#startworkload: \"taskset -c 0,1 systemctl start mysql\" #g" $path/mysql_sysbench_server.yaml
-        sed -i "s#stopworkload:.*#stopworkload: \"systemctl stop mysql\" #g" $path/mysql_sysbench_server.yaml
-    fi
+sed -i "s#TABLES=.*#TABLES=$tables#g" $path/mysql_sysbench_benchmark.sh
+sed -i "s#TABLE_SIZE=.*#TABLE_SIZE=$table_size#g" $path/mysql_sysbench_benchmark.sh
+sed -i "s#PATH#$path#g" $path/mysql_sysbench_benchmark.sh
+
+if [[ "$version" != *"20.03"* ]]; then
+	sed -i "s#startworkload:.*#startworkload: \"\`mysqld \& \` \& sleep 10\" #g" $path/mysql_sysbench_server.yaml
+	sed -i "s#stopworkload:.*#stopworkload: \"mysqladmin -S/var/lib/mysql/mysql.sock shutdown -uroot -p123456\" #g" $path/mysql_sysbench_server.yaml
 else
-    sed -i "s#mysql_sysbench_benchmark.sh#benchmark.sh#g" $path/mysql_sysbench_client.yaml
-    sed -i "s#PATH#$path#g" $path/server.yaml
-    sed -i "s#TABLES=.*#TABLES=$tables#g" $path/benchmark.sh
-    sed -i "s#TABLE_SIZE=.*#TABLE_SIZE=$table_size#g" $path/benchmark.sh
+	sed -i "s#startworkload:.*#startworkload: \"taskset -c 0,1 systemctl start mysql\" #g" $path/mysql_sysbench_server.yaml
+	sed -i "s#stopworkload:.*#stopworkload: \"systemctl stop mysql\" #g" $path/mysql_sysbench_server.yaml
 fi
 
 echo "copy the server yaml file to /etc/atuned/tuning/"
 rm -rf /etc/atuned/tuning/mysql_sysbench_server.yaml
-if [ "$is_restart" = "restart" ];then
-    cp $path/mysql_sysbench_server.yaml /etc/atuned/tuning/
-else
-    cp $path/server.yaml /etc/atuned/tuning/mysql_sysbench_server.yaml
-fi
+sed -i "s#PATH#$path#g" $path/server.yaml
+cp $path/server.yaml /etc/atuned/tuning/mysql_sysbench_server.yaml
-- 
Gitee