- Compass-ci - mailweb.openeuler.org

[PATCH v4 lkp-tests 4/7] tests: add script for benchmarksql test tool
by Luan Shengde 30 Apr '21

30 Apr '21

Signed-off-by: Luan Shengde <shdluan(a)163.com> --- tests/benchmark-sql | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100755 tests/benchmark-sql diff --git a/tests/benchmark-sql b/tests/benchmark-sql new file mode 100755 index 000000000..6acac2847 --- /dev/null +++ b/tests/benchmark-sql @@ -0,0 +1,15 @@ +#!/bin/sh +# benchmark_pkg_name + +: "${benchmark_pkg_name:=benchmarksql5.0-for-mysql}" + +run_benchmark_mysql() +{ + cd "$HOME/$benchmark_pkg_name/run/" && { + ./runDatabaseBuild.sh props.conf + ./runBenchmark.sh props.conf + ./runDatabaseDestroy.sh props.conf + } +} + +run_benchmark_mysql -- 2.23.0

1 0

[PATCH v4 lkp-tests 3/7] stats: add extract scritp
by Luan Shengde 30 Apr '21

30 Apr '21

add stats script for benchmarksql Signed-off-by: Luan Shengde <shdluan(a)163.com> --- stats/benchmark-sql | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100755 stats/benchmark-sql diff --git a/stats/benchmark-sql b/stats/benchmark-sql new file mode 100755 index 000000000..d4794b4f4 --- /dev/null +++ b/stats/benchmark-sql @@ -0,0 +1,16 @@ +#!/usr/bin/env ruby + +# 11:28:16,052 [Thread-2] INFO jTPCC : Term-00, Measured tpmC (NewOrders) = 450.31 +# 11:28:16,052 [Thread-2] INFO jTPCC : Term-00, Measured tpmTOTAL = 999.71 +# 11:28:16,052 [Thread-2] INFO jTPCC : Term-00, Session Start = 2021-04-29 10:58:15 +# 11:28:16,052 [Thread-2] INFO jTPCC : Term-00, Session End = 2021-04-29 11:28:16 +# 11:28:16,052 [Thread-2] INFO jTPCC : Term-00, Transaction Count = 30003 + +while (line = STDIN.gets) + case line.chomp! + when /Measured tpmC $NewOrders$ = (\d*\.\d*)/ + puts "Measured_tpmC$NewOrders$: #{$1}" + when /Measured tpmTOTAL = (\d*\.\d*)/ + puts "Measured_tpmTOTAL: #{$1}" + end +end -- 2.23.0

1 0

[PATCH v4 lkp-tests 2/7] jobs: add job yaml
by Luan Shengde 30 Apr '21

30 Apr '21

add job yaml for benchmarksql Signed-off-by: Luan Shengde <shdluan(a)163.com> --- jobs/benchmark-sql.yaml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 jobs/benchmark-sql.yaml diff --git a/jobs/benchmark-sql.yaml b/jobs/benchmark-sql.yaml new file mode 100644 index 000000000..4563b666c --- /dev/null +++ b/jobs/benchmark-sql.yaml @@ -0,0 +1,16 @@ +suite: benchmark-sql + +mysql_user: +mysql_host: localhost +mysql_port: +mysql_db: +benchmark_db: tpcc +mysql_password: +data_dev: sdb + +cci-makepkg: + benchmark: mysql-8-0-20 + +mysql-8-0-20: + +benchmark-sql: -- 2.23.0

1 0

[PATCH v4 lkp-tests 1/7] jobs: add job yaml
by Luan Shengde 30 Apr '21

30 Apr '21

add job yaml for sysbench-mysql Signed-off-by: Luan Shengde <shdluan(a)163.com> --- jobs/sysbench-mysql.yaml | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 jobs/sysbench-mysql.yaml diff --git a/jobs/sysbench-mysql.yaml b/jobs/sysbench-mysql.yaml new file mode 100644 index 000000000..af017df4b --- /dev/null +++ b/jobs/sysbench-mysql.yaml @@ -0,0 +1,28 @@ +suite: sysbench-mysql + +mysql_user: +mysql_host: localhost +mysql_port: +mysql_db: +mysql_password: +data_dev: sdb + +cci-makepkg: + benchmark: mysql-8-0-20 + +mysql-8-0-20: + +sysbench-mysql: + oltp_test_mode: complex + max_requests: 0 + mysql_table_engine: innodb + oltp_tables_count: 1000 + oltp_table_size: 100000 + nr_threads: 256 + runtime: 60 + rand_type: special + rand_spec_pct: 100 + oltp_read_only: false + report_interval: 1 + events: 20000 + mysql_socket: /data/mysql/run/mysql.sock -- 2.23.0

1 0

[PATCH v2 lkp-tests] resize virtual rootfs from 50% to 90% memory, for docker no sapce error
by Zhang Dewan 30 Apr '21

30 Apr '21

Signed-off-by: Zhang Dewan <513619464(a)qq.com> --- lib/bootstrap.sh | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/lib/bootstrap.sh b/lib/bootstrap.sh index 417c8662a..82a1c17d7 100755 --- a/lib/bootstrap.sh +++ b/lib/bootstrap.sh @@ -57,6 +57,35 @@ mount_tmpfs() mount -t tmpfs -o mode=1777 tmp /tmp } +resize_virtual_rootfs() +{ + # tmpfs and rootfs default use 50% memory: + # + # root@taishan200-2280-2s48p-256g--a13 ~# mount | head -n 1 + # rootfs on / type rootfs (rw,size=133395136k,nr_inodes=2084299) + # + # root@taishan200-2280-2s48p-256g--a13 ~# df -h / + # Filesystem Size Used Avail Use% Mounted on + # rootfs 128G 114G 14G 90% / + # + # this maybe cause the docker no space error. + + if mount | head -n 1 | grep "type rootfs" > /dev/null + then + echo "Set the rootfs to 90% memory" + mount -o remount,rw,size=90% rootfs / + fi + # Test Result: + # root@taishan200-2280-2s64p-256g--a125 ~# free -g + # total used free shared buff/cache available + # Mem: 255Gi 8.5Gi 243Gi 2.7Gi 2.9Gi 224Gi + # Swap: 0B 0B 0B + # root@taishan200-2280-2s64p-256g--a125 ~# df -h / + # Filesystem Size Used Avail Use% Mounted on + # rootfs 230G 2.7G 228G 2% / + +} + get_net_devices() { local net_devices @@ -737,6 +766,7 @@ boot_init() mount_kernel_fs mount_tmpfs + resize_virtual_rootfs redirect_stdout_stderr echo 'Kernel tests: Boot OK!' -- 2.23.0

1 0

[PATCH compass-ci] sparrow/README.md: specify the correct filename in source cmd
by Xu Xijian 30 Apr '21

30 Apr '21

Signed-off-by: Xu Xijian <hdxuxijian(a)163.com> --- sparrow/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sparrow/README.md b/sparrow/README.md index 532b7f9..a519497 100644 --- a/sparrow/README.md +++ b/sparrow/README.md @@ -61,7 +61,7 @@ 本文以/c/lkp-tests/jobs/目录下已有的通用测试用例host-info.yaml为例 - 使环境变量生效 ```bash - source /etc/profile.d/compass-ci + source /etc/profile.d/compass.sh ``` - 使用[submit命令](https://gitee.com/wu_fengguang/compass-ci/blob/master/doc/manu… -- 2.23.0

1 0

[PATCH v3 lkp-tests 7/7] distro/depends: add depend for benchmarktool
by Luan Shengde 30 Apr '21

30 Apr '21

Signed-off-by: Luan Shengde <shdluan(a)163.com> --- distro/depends/mysql-8-0-20-dev | 1 + 1 file changed, 1 insertion(+) diff --git a/distro/depends/mysql-8-0-20-dev b/distro/depends/mysql-8-0-20-dev index 23c6ff661..05583bef9 100644 --- a/distro/depends/mysql-8-0-20-dev +++ b/distro/depends/mysql-8-0-20-dev @@ -14,3 +14,4 @@ libmpc libmpc-devel mpfr mpfr-devel +java -- 2.23.0

1 0

[PATCH v3 lkp-tests 6/7] pkg/mysql-8-0-20: add build install benchmarksql
by Luan Shengde 30 Apr '21

30 Apr '21

Signed-off-by: Luan Shengde <shdluan(a)163.com> --- pkg/mysql-8-0-20/PKGBUILD | 51 ++++++++++++++++++++++++++++++++------- 1 file changed, 42 insertions(+), 9 deletions(-) diff --git a/pkg/mysql-8-0-20/PKGBUILD b/pkg/mysql-8-0-20/PKGBUILD index 66df6b33f..26247c6f0 100644 --- a/pkg/mysql-8-0-20/PKGBUILD +++ b/pkg/mysql-8-0-20/PKGBUILD @@ -7,13 +7,14 @@ url="http://www.mysql.com" license=('GPLv2') source=("git://$GIT_SERVER/upstream/m/my-sql_with_boostkit_patch/my-sql_with_boostkit_patch.git" "git://$GIT_SERVER/upstream/g/gcc/gcc.git" + "https://mirrors.huaweicloud.com/kunpeng/archive/kunpeng_solution/database/p…" "my.cnf") -md5sums=('SKIP' 'SKIP' '99c4965aa870c475000993f52a0dee66') +md5sums=('SKIP' 'SKIP' 'f33c03fd48ff5993dca6d00b53a46da4' '99c4965aa870c475000993f52a0dee66') build() { - build_gcc build_mysql + build_benchmarksql } build_gcc() @@ -47,9 +48,8 @@ build_gcc() --with-stage1-ldflags='-Wl,-z,relro,-z,now' \ --with-boot-ldflags='-Wl,-z,relro,-z,now' \ --with-multilib-list=lp64 - make -j96 - make install & - wait + make -j96 > /dev/null + make install > /dev/null } } @@ -58,6 +58,11 @@ build_mysql() unset CPPFLAGS unset CFLAGS unset CXXFLAGS + + cd $srcdir/my-sql_with_boostkit_patch && { + grep 3f3d2692fd05a18011d93dcadeef661f386595ac compass-ci.cfg || build_gcc + } + cd $srcdir/my-sql_with_boostkit_patch/$pkgname-$pkgver CMAKE=cmake @@ -65,8 +70,36 @@ build_mysql() mkdir -p build cd build && { - $CMAKE .. -DBUILD_CONFIG=mysql_release -DCMAKE_INSTALL_PREFIX=/usr/local/mysql -DMYSQL_DATADIR=/data/mysql/data -DSYSCONFDIR=/etc -DWITH_BOOST=../boost/boost_1_70_0/ - make -j96 + $CMAKE .. -DBUILD_CONFIG=mysql_release -DCMAKE_INSTALL_PREFIX=/usr/local/mysql -DMYSQL_DATADIR=/data/mysql/data -DSYSCONFDIR=/etc -DWITH_BOOST=../boost/boost_1_70_0/ > /dev/null + make -j96 > /dev/null + } +} + +build_benchmarksql() +{ + cd $srcdir && { + cp -r benchmarksql5.0-for-mysql "$HOME/" + chmod -R 777 "$HOME/benchmarksql5.0-for-mysql" + } + + cd "$HOME/benchmarksql5.0-for-mysql/run" && { + chmod 777 *.sh + sed -i \ + -e '/^conn=/ s|mysql://.*:3306|mysql://localhost:3306|' \ + -e '/^user=/cuser=root' \ + -e '/^password=/cpassword=mysql_password' \ + -e '/^warehouses=/cwarehouses=1000' \ + -e '/^loadWorkers=/cloadWorkers=100' \ + -e '/^terminals=/cterminals=200' \ + -e '/^runTxnsPerTerminal=/crunTxnsPerTerminal=0' \ + -e '/^runMins=/crunMins=30' \ + -e '/^limitTxnsPerMin=/climitTxnsPerMin=1000' \ + -e '/^terminalWarehouseFixed=/cterminalWarehouseFixed=true' \ + -e '/^newOrderWeight=/cnewOrderWeight=45' \ + -e '/^paymentWeight=/cpaymentWeight=43' \ + -e '/^orderStatusWeight=/corderStatusWeight=4' \ + -e '/^deliveryWeight=/cdeliveryWeight=4' \ + props.conf } } @@ -75,6 +108,6 @@ package() cp my.cnf /etc/ cd $srcdir/my-sql_with_boostkit_patch/$pkgname-$pkgver/build && { - make install - } + make install > /dev/null + } } -- 2.23.0

1 0

[PATCH v3 lkp-tests 5/7] tests: add init database for benchmarksql
by Luan Shengde 30 Apr '21

30 Apr '21

Signed-off-by: Luan Shengde <shdluan(a)163.com> --- tests/mysql-8-0-20 | 66 +++++++++++++++++++++++++--------------------- 1 file changed, 36 insertions(+), 30 deletions(-) diff --git a/tests/mysql-8-0-20 b/tests/mysql-8-0-20 index 990a053d7..4a49e0233 100755 --- a/tests/mysql-8-0-20 +++ b/tests/mysql-8-0-20 @@ -4,69 +4,75 @@ # mysql_host # mysql_port # mysql_db +# benchmark_db # mysql_password + . $LKP_SRC/lib/common.sh : "${mysql_user:=root}" : "${mysql_host:=127.0.0.1}" : "${mysql_port:=3306}" : "${mysql_db:=sysbench_test}" +: "${benchmark_db:=tpcc}" : "${mysql_password:=mysql_password}" create_basedir() { - mkdir -p /data - mkfs.xfs -f /dev/"$data_dev" - mount /dev/"$data_dev" /data + mkdir -p /data + mkfs.xfs -f /dev/"$data_dev" + mount /dev/"$data_dev" /data - mkdir -p /data/mysql/{data,share,tmp,run,log} + mkdir -p /data/mysql/{data,share,tmp,run,log} - useradd mysql - touch /data/mysql/log/mysql.log - chown -R mysql:mysql /data - chown -R mysql:mysql /data/mysql/log/mysql.log + useradd mysql + touch /data/mysql/log/mysql.log + chown -R mysql:mysql /data + chown -R mysql:mysql /data/mysql/log/mysql.log } configure_mysql() { - if [ ! -f $mysqld ] || [ ! -f $mysql ] || [ ! -f $mysql_server ]; then - echo "mysql is not installed!" && exit 1 - fi + if [ ! -f $mysqld ] || [ ! -f $mysql ] || [ ! -f $mysql_server ]; then + echo "mysql is not installed!" && exit 1 + fi - "$mysqld" --user=mysql --datadir=/data/mysql/data --basedir=/data/mysql --initialize --port="$mysql_port" - sleep 10 + "$mysqld" --user=mysql --datadir=/data/mysql/data --basedir=/data/mysql --initialize --port="$mysql_port" + sleep 10 - "$mysql_server" start - sleep 10 + "$mysql_server" start + sleep 10 - "$mysql" -u "$mysql_user" -e "flush privileges; use mysql; alter user 'root'@'localhost' identified by '$mysql_password'; flush privileges;" - "$mysql_server" restart - sleep 10 + "$mysql" -u "$mysql_user" -e "flush privileges; use mysql; alter user 'root'@'localhost' identified by '$mysql_password'; flush privileges;" + sed -i '/^skip-grant-tables/d' /etc/my.cnf + sed -i '/^skip-name-resolve/d' /etc/my.cnf + "$mysql_server" restart + sleep 10 } create_database() { - "$mysql" -u "$mysql_user" -p"$mysql_password" -e "use mysql; update user set host ='%' where user='root'; flush privileges;" - "$mysql" -u "$mysql_user" -p"$mysql_password" -e "create database $mysql_db;" - "$mysql_server" stop - sleep 10 + "$mysql" -u "$mysql_user" -p"$mysql_password" -e "use mysql; update user set host ='%' where user='root'; flush privileges;" + "$mysql" -u "$mysql_user" -p"$mysql_password" -e "create database $mysql_db;" + "$mysql" -u "$mysql_user" -p"$mysql_password" -e "create database $benchmark_db;" + "$mysql_server" stop + sleep 10 } start_mysql() { - "$mysql_server" start & + "$mysql_server" start & wait } main() { - local mysql="/usr/local/mysql/bin/mysql" - local mysqld="/usr/local/mysql/bin/mysqld" - local mysql_server="/usr/local/mysql/support-files/mysql.server" + local mysql="/usr/local/mysql/bin/mysql" + local mysqld="/usr/local/mysql/bin/mysqld" + local mysql_server="/usr/local/mysql/support-files/mysql.server" - create_basedir - configure_mysql - create_database - start_mysql + create_basedir + configure_mysql + create_database + start_mysql } main -- 2.23.0

1 0

[PATCH v3 lkp-tests 4/7] tests: add script for benchmarksql test tool
by Luan Shengde 30 Apr '21

30 Apr '21

Signed-off-by: Luan Shengde <shdluan(a)163.com> --- tests/benchmark-sql | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100755 tests/benchmark-sql diff --git a/tests/benchmark-sql b/tests/benchmark-sql new file mode 100755 index 000000000..2ec6a7317 --- /dev/null +++ b/tests/benchmark-sql @@ -0,0 +1,17 @@ +#!/bin/sh +# benchmark_pkg_name + +: "${benchmark_pkg_name:=benchmarksql5.0-for-mysql}" + +run_benchmark_mysql() +{ + scripts=(runDatabaseBuild.sh runBenchmark.sh runDatabaseDestroy.sh) + + cd "$HOME/$benchmark_pkg_name/run/" && { + ./runDatabaseBuild.sh props.conf + ./runBenchmark.sh props.conf + ./runDatabaseDestroy.sh props.conf + } +} + +run_benchmark_mysql -- 2.23.0

1 0