April 2021 - Compass-ci - mailweb.openeuler.org

[PATCH v4 lkp-tests 7/7] distro/depends: add install 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 v4 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 v4 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 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

[PATCH v3 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 v3 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 | 20 ++++++++++++++++++++ 1 file changed, 20 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..152253c4e --- /dev/null +++ b/jobs/benchmark-sql.yaml @@ -0,0 +1,20 @@ +suite: benchmark-sql + +os: openeuler +os_version: 20.03 +os_mount: initramfs + +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 v3 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 | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 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..6c6606ea2 --- /dev/null +++ b/jobs/sysbench-mysql.yaml @@ -0,0 +1,33 @@ +suite: sysbench-mysql + +os: openeuler +os_version: 20.03 +os_mount: initramfs + +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: + +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 compass-ci] lib/mail_job_result: optimize mail content
by Lu Weitao 30 Apr '21

30 Apr '21

optimize mail content limit max lines(100) of compare result Signed-off-by: Lu Weitao <luweitaobe(a)163.com> --- lib/mail_job_result.rb | 23 +++++++++++++++++------ 1 file changed, 17 insertions(+), 6 deletions(-) diff --git a/lib/mail_job_result.rb b/lib/mail_job_result.rb index 744b7d5c..7937de66 100644 --- a/lib/mail_job_result.rb +++ b/lib/mail_job_result.rb @@ -24,10 +24,10 @@ class MailJobResult def compose_mail set_submitter_info - context = get_compare_result(@job) + context = keep_100_lines(get_compare_result(@job)) return nil unless context - subject = "[Compass-CI] job: #{@job_id} compare result" + subject = "[Compass-CI] #{@job['commit_title'] || @job_id} comparsion" signature = "Regards\nCompass-CI\nhttps://gitee.com/openeuler/compass-ci" data = <<~BODY @@ -38,10 +38,17 @@ class MailJobResult Hi, Thanks for your participation in Kunpeng and software ecosystem! - Your Job: #{@job_id} had finished. - Bellow are comparsion result of the base_commit and current_commit: - \tbase_commit: #{@job['base_commit']} - \tcurrent_commit: #{@job['upstream_commit']} + Your job id: #{@job_id} + Bellow are comparsion result of the base commit and your commit: + \tbase commit: #{@job['base_commit']} + \tcommit_link: #{@job['upstream_url']}/commit/#{@job['base_commit']} + + \tyour commit: #{@job['upstream_commit']} + \tbranch: #{@job['upstream_branch']} + \tcommit_link: #{@job['upstream_url']}/commit/#{@job['upstream_commit']} + + compare command: + \tcompare upstream_commit=#{@job['base_commit']} upstream_commit=#{@job['upstream_commit']} --min_samples #{@job['nr_run']} #{context.to_s} \n\n#{signature}" BODY @@ -86,3 +93,7 @@ def get_compare_result(job) m_titles = [base_commit.slice(0, 16), commit_id.slice(0, 24)] compare_matrixes(matrices_list, suite_list, nil, m_titles, options: options) end + +def keep_100_lines(context) + context.split("\n")[0,99].join("\n") +end -- 2.23.0

1 0

[PATCH compass-ci] lib/mail_job_result: optimize mail content
by Lu Weitao 30 Apr '21

30 Apr '21

optimize mail content limit max lines(100) of compare result Signed-off-by: Lu Weitao <luweitaobe(a)163.com> --- lib/mail_job_result.rb | 29 +++++++++++++++++++++++------ 1 file changed, 23 insertions(+), 6 deletions(-) diff --git a/lib/mail_job_result.rb b/lib/mail_job_result.rb index 744b7d5c..0bf52b6e 100644 --- a/lib/mail_job_result.rb +++ b/lib/mail_job_result.rb @@ -24,10 +24,10 @@ class MailJobResult def compose_mail set_submitter_info - context = get_compare_result(@job) + context = keep_100_lines(get_compare_result(@job)) return nil unless context - subject = "[Compass-CI] job: #{@job_id} compare result" + subject = "[Compass-CI] commit: #{@job['upstream_commit']} comparsion result" signature = "Regards\nCompass-CI\nhttps://gitee.com/openeuler/compass-ci" data = <<~BODY @@ -38,10 +38,15 @@ class MailJobResult Hi, Thanks for your participation in Kunpeng and software ecosystem! - Your Job: #{@job_id} had finished. - Bellow are comparsion result of the base_commit and current_commit: - \tbase_commit: #{@job['base_commit']} - \tcurrent_commit: #{@job['upstream_commit']} + Bellow are comparsion result of the base commit and your commit: + \tbase commit: #{@job['base_commit']} + \tcommit_link: #{@job['upstream_url']}/commit/#{@job['base_commit']} + + \tyour commit: #{@job['upstream_commit']} + \tbranch: #{@job['upstream_branch']} + \tcommit_link: #{@job['upstream_url']}/commit/#{@job['upstream_commit']} + + compare upstream_commit=#{@job['base_commit']} upstream_commit=#{@job['upstream_commit']} --min_samples #{@job['nr_run']} #{context.to_s} \n\n#{signature}" BODY @@ -86,3 +91,15 @@ def get_compare_result(job) m_titles = [base_commit.slice(0, 16), commit_id.slice(0, 24)] compare_matrixes(matrices_list, suite_list, nil, m_titles, options: options) end + +def keep_100_lines(context) + num = 0 + new_context = '' + context.each_line do |line| + new_context += line + num += 1 + break if num > 99 + end + + new_context +end -- 2.23.0

2 3

Re: [PATCH lkp-tests 1/6] add job yaml for sysbenc
by Li Ping 30 Apr '21

30 Apr '21

sysbench-mysql Reply-To: In-Reply-To: <20210429133100.902627-1-shdluan(a)163.com> On Thu, Apr 29, 2021 at 09:30:55PM +0800, Luan Shengde wrote: >Signed-off-by: Luan Shengde <shdluan(a)163.com> >--- > jobs/sysbench-mysql.yaml | 33 +++++++++++++++++++++++++++++++++ > 1 file changed, 33 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..6c6606ea2 >--- /dev/null >+++ b/jobs/sysbench-mysql.yaml >@@ -0,0 +1,33 @@ >+suite: sysbench-mysql >+ >+os: openeuler >+os_version: 20.03 >+os_mount: initramfs >+ >+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: >+ >+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 >

2 1

Re: [PATCH lkp-tests 2/6] add job yaml for benmarksql
by Li Ping 30 Apr '21

30 Apr '21

benchmark-sql Reply-To: In-Reply-To: <20210429133100.902627-2-shdluan(a)163.com> On Thu, Apr 29, 2021 at 09:30:56PM +0800, Luan Shengde wrote: >Signed-off-by: Luan Shengde <shdluan(a)163.com> >--- > jobs/benchmark-sql.yaml | 20 ++++++++++++++++++++ > 1 file changed, 20 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..152253c4e >--- /dev/null >+++ b/jobs/benchmark-sql.yaml >@@ -0,0 +1,20 @@ >+suite: benchmark-sql >+ >+os: openeuler >+os_version: 20.03 >+os_mount: initramfs >+ >+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 >

2 1

[PATCH lkp-tests] install-iso-sync-rootfs: delete cgz content for firstboot reboot
by Yu Chuan 30 Apr '21

30 Apr '21

[Why] In install-iso-firstboot step, we put the reboot-after-systemd-logind.cgz to rootfs, so we need delete all file in that cgz before we archive the result rootfs. Signed-off-by: Yu Chuan <13186087857(a)163.com> --- distro/depends/install-iso-sync-rootfs | 1 + tests/install-iso-sync-rootfs | 28 ++++++++++++++++++++++++++ 2 files changed, 29 insertions(+) diff --git a/distro/depends/install-iso-sync-rootfs b/distro/depends/install-iso-sync-rootfs index 2abb6b833291..41c472eda77e 100644 --- a/distro/depends/install-iso-sync-rootfs +++ b/distro/depends/install-iso-sync-rootfs @@ -1,2 +1,3 @@ nfs-common lvm2 +wget diff --git a/tests/install-iso-sync-rootfs b/tests/install-iso-sync-rootfs index b74c7bed2044..c2b64a2b44d8 100755 --- a/tests/install-iso-sync-rootfs +++ b/tests/install-iso-sync-rootfs @@ -53,6 +53,31 @@ prepare_exclude_file() done } +delete_firstboot_cgz() +{ + local cgz_url="http://${INITRD_HTTP_HOST}:${INITRD_HTTP_PORT}/initrd/custom_bootstrap/reboot-after-systemd-logind.cgz" + + local tmp_dir="/tmp/$(basename $cgz_url)_${ROOTFS_SUFFIX}" + rm -rf $tmp_dir && mkdir -p $tmp_dir && cd $tmp_dir + + wget $cgz_url || { + log_info "wget cgz failed, skip delete it: $cgz_url" + return 0 + } + + gzip -dc reboot-after-systemd-logind.cgz | cpio -id + + [ -d "custom_bootstrap" ] || { + log_info "cannot find custom_bootstrap dir after unzip" + return 0 + } + + for i in $(find custom_bootstrap/* -not -type d) + do + rm -f ${lv_rootfs_mount_point}/${i#custom_bootstrap/} + done +} + sync_rootfs_to_nfs_server() { # mount nfs rootfs @@ -70,6 +95,9 @@ sync_rootfs_to_nfs_server() mkdir -p ${lv_rootfs_mount_point} mount /dev/mapper/${VG_NAME}-${iso_os}_${iso_arch}_${iso_version}_${ROOTFS_SUFFIX} ${lv_rootfs_mount_point} || die "mount lv rootfs failed" + # delete cgz for firstboot reboot + delete_firstboot_cgz + # sync rootfs local exclude_file=/tmp/exclude_file_${ROOTFS_SUFFIX} -- 2.23.0

1 0

[PATCH v4 lkp-tests] add email feedback for rpmbuild-pkg
by Li Ping 30 Apr '21

30 Apr '21

tests/rpmbuild-pkg: add a new input parameter whether_email [usage]: rpmbuild-pkg: whether_email: 1 when job failed, send an rpmbuild failed email. when job run success, send an rpmbuild success email. Signed-off-by: Li Ping <1477412247(a)qq.com> --- lib/email.sh | 35 +++++++++++++++++++++++++++++++++++ tests/rpmbuild-pkg | 24 ++++++++++++++++++++++++ 2 files changed, 59 insertions(+) diff --git a/lib/email.sh b/lib/email.sh index b5e56df79..a6e0bc3ba 100755 --- a/lib/email.sh +++ b/lib/email.sh @@ -96,6 +96,41 @@ Compass-CI " } +rpmbuild_report() +{ + email_content="To: $author_email +Subject: [NOTIFY Compass-CI] rpmbuild report + +Dear $author_name: + + $rpmbuild_result + +Regards +Compass-CI +" +} + +rpmbuild_success_content() +{ + rpmbuild_result="Your RPM Package is successfully built. + +You can click the follow link to obtain your RPM Package: +http://api.compass-ci.openeuler.org:20012/rpm/pub/${os}-${os_version}/${compat_os}/${os_arch}/Packages + +And you can click the following link to view RPM Package build details: +http://api.compass-ci.openeuler.org:${SRV_HTTP_RESULT_PORT:-20007}$result_root" + + rpmbuild_report +} + +rpmbuild_failed_content() +{ + rpmbuild_result="Sorry to inform you that RPM Package built failed, you can click the following link to view details. +http://api.compass-ci.openeuler.org:${SRV_HTTP_RESULT_PORT:-20007}$result_root" + + rpmbuild_report +} + send_email() { local subject=$1 diff --git a/tests/rpmbuild-pkg b/tests/rpmbuild-pkg index 3dd75b896..5ad5caf56 100755 --- a/tests/rpmbuild-pkg +++ b/tests/rpmbuild-pkg @@ -5,6 +5,7 @@ # - repo_addr # - custom_repo_name # - custom_repo_addr +# - whether_email # Git repo jobs only use the first two parameters, SRPMs jobs use all # user can add custom_repo_name and custom_repo_addr to setup # local repo, value can be an array @@ -12,6 +13,7 @@ . $LKP_SRC/lib/debug.sh . $LKP_SRC/lib/upload.sh . $LKP_SRC/lib/rpm.sh +. $LKP_SRC/lib/email.sh : "${compat_os:=budding-openeuler}" @@ -19,6 +21,13 @@ dest_dir="/rpm/upload/${os}-${os_version}/${compat_os}" +die() +{ + rpmbuild_email "rpmbuild_failed" + echo "$@" 1>&2 + exit 99 +} + from_git() { package_name=${upstream_repo##*/} @@ -29,6 +38,20 @@ from_git() download_upstream_repo } +git_pretty_format() +{ + curl -sS -H 'Content-Type: Application/json' -XPOST "$LKP_SERVER"':8100/git_command' -d '{"git_repo": "'${upstream_dir}/${upstream_repo}.git'", "git_command": ["git-log","-n1","--pretty=format:'$1'", "'${upstream_commit}'"]}' +} + +rpmbuild_email() +{ + [ -n "$whether_email" ] && { + author_email=$(git_pretty_format "%ae") + author_name=$(git_pretty_format "%an") + send_email $1 + } +} + from_srpm() { [ -n "$repo_name" ] || die "repo_name is empty" @@ -143,3 +166,4 @@ add_repo build_rpm upload_rpm_pkg update_repo_mq +rpmbuild_email "rpmbuild_success" -- 2.23.0

1 0

[PATCH lkp-tests] alter the tmpfs use 90% memory
by Zhang Dewan 30 Apr '21

30 Apr '21

Signed-off-by: Zhang Dewan <513619464(a)qq.com> --- lib/bootstrap.sh | 27 ++++++++++++++++++++++----- 1 file changed, 22 insertions(+), 5 deletions(-) diff --git a/lib/bootstrap.sh b/lib/bootstrap.sh index 417c8662a..124b872bd 100755 --- a/lib/bootstrap.sh +++ b/lib/bootstrap.sh @@ -57,6 +57,27 @@ 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 + +} + get_net_devices() { local net_devices @@ -88,10 +109,6 @@ net_devices_link() test_ping() { - has_cmd ping || { - echo "command not found: ping, skip ping test." - return 0 - } ping -c 1 -w 1 $LKP_SERVER > /dev/null } @@ -411,7 +428,6 @@ install_rpms() [ -d /opt/rpms ] || return echo "install $(ls /opt/rpms/*.rpm)" rpm -ivh --force --ignoresize /opt/rpms/*.rpm - rm -f /opt/rpms/*.rpm } try_get_and_set_distro() @@ -737,6 +753,7 @@ boot_init() mount_kernel_fs mount_tmpfs + resize_virtual_rootfs redirect_stdout_stderr echo 'Kernel tests: Boot OK!' -- 2.23.0

2 2

[PATCH v2 lkp-tests] tests/self-test: send result email to commiter and author
by Wu Zhende 30 Apr '21

30 Apr '21

Signed-off-by: Wu Zhende <wuzhende666(a)163.com> --- lib/email.sh | 8 ++++++-- tests/self-test | 18 ++++++++++++++++++ 2 files changed, 24 insertions(+), 2 deletions(-) diff --git a/lib/email.sh b/lib/email.sh index b5e56df79..99863aa1b 100755 --- a/lib/email.sh +++ b/lib/email.sh @@ -82,10 +82,14 @@ Compass-CI selftest_content() { - email_content="To: $my_email + email_content="To: $recipient_email Subject: [NOTIFY Compass-CI] Self-test report -Dear $my_name: +Dear $author_name and $commiter: + + commit_id: $commit_id + + commit_subject: $commit_subject Your self-test groud_id=selftest job result is: diff --git a/tests/self-test b/tests/self-test index fb3e87b17..11786ac3f 100755 --- a/tests/self-test +++ b/tests/self-test @@ -28,5 +28,23 @@ submit_job() log_info "selftest job result: $report_content" } +get_commit_info() +{ + cd /c/compass-ci || exit + + commit_id=$(git log -1 --format="%H") + commit_subject=$(git log -1 --format="%s") + + author_name=$(git log -1 --format="%an") + author_email=$(git log -1 --format="%ae") + + commiter=$(git log -1 --format="%cn") + commiter_email=$(git log -1 --format="%ce") + + recipient_email="$author_email;$commiter_email" + +} + +get_commit_info submit_job send_email selftest -- 2.23.0

1 0

[PATCH lkp-tests] tsets/self-test: send result email to commiter and author
by Wu Zhende 30 Apr '21

30 Apr '21

Signed-off-by: Wu Zhende <wuzhende666(a)163.com> --- lib/email.sh | 8 ++++++-- tests/self-test | 18 ++++++++++++++++++ 2 files changed, 24 insertions(+), 2 deletions(-) diff --git a/lib/email.sh b/lib/email.sh index b5e56df79..99863aa1b 100755 --- a/lib/email.sh +++ b/lib/email.sh @@ -82,10 +82,14 @@ Compass-CI selftest_content() { - email_content="To: $my_email + email_content="To: $recipient_email Subject: [NOTIFY Compass-CI] Self-test report -Dear $my_name: +Dear $author_name and $commiter: + + commit_id: $commit_id + + commit_subject: $commit_subject Your self-test groud_id=selftest job result is: diff --git a/tests/self-test b/tests/self-test index fb3e87b17..11786ac3f 100755 --- a/tests/self-test +++ b/tests/self-test @@ -28,5 +28,23 @@ submit_job() log_info "selftest job result: $report_content" } +get_commit_info() +{ + cd /c/compass-ci || exit + + commit_id=$(git log -1 --format="%H") + commit_subject=$(git log -1 --format="%s") + + author_name=$(git log -1 --format="%an") + author_email=$(git log -1 --format="%ae") + + commiter=$(git log -1 --format="%cn") + commiter_email=$(git log -1 --format="%ce") + + recipient_email="$author_email;$commiter_email" + +} + +get_commit_info submit_job send_email selftest -- 2.23.0

1 0

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

29 Apr '21

Signed-off-by: Luan Shengde <shdluan(a)163.com> --- pkg/mysql-8-0-20/PKGBUILD | 42 +++++++++++++++++++++++++++++++++++---- 1 file changed, 38 insertions(+), 4 deletions(-) diff --git a/pkg/mysql-8-0-20/PKGBUILD b/pkg/mysql-8-0-20/PKGBUILD index 66df6b33f..de56cf918 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() @@ -58,6 +59,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 @@ -70,11 +76,39 @@ build_mysql() } } +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 + } +} + package() { cp my.cnf /etc/ cd $srcdir/my-sql_with_boostkit_patch/$pkgname-$pkgver/build && { - make install - } + make install + } } -- 2.23.0

1 0

[PATCH v2 lkp-tests 5/6] tests: add init database for benchmark
by Luan Shengde 29 Apr '21

29 Apr '21

Signed-off-by: Luan Shengde <shdluan(a)163.com> --- tests/mysql-8-0-20 | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/tests/mysql-8-0-20 b/tests/mysql-8-0-20 index 990a053d7..e982eb92e 100755 --- a/tests/mysql-8-0-20 +++ b/tests/mysql-8-0-20 @@ -4,13 +4,16 @@ # 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() @@ -40,6 +43,8 @@ configure_mysql() 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 } @@ -48,6 +53,7 @@ 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" -u "$mysql_user" -p"$mysql_password" -e "create database $benchmark_db;" "$mysql_server" stop sleep 10 } -- 2.23.0

1 0

[PATCH v2 lkp-tests 4/6] add script for benchmarksql
by Luan Shengde 29 Apr '21

29 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

[PATCH v2 lkp-tests 3/6] stats: add stats file for benchmarksql
by Luan Shengde 29 Apr '21

29 Apr '21

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 v2 lkp-tests 2/6] add job yaml for benchmarksql
by Luan Shengde 29 Apr '21

29 Apr '21

Signed-off-by: Luan Shengde <shdluan(a)163.com> --- jobs/benchmark-sql.yaml | 20 ++++++++++++++++++++ 1 file changed, 20 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..152253c4e --- /dev/null +++ b/jobs/benchmark-sql.yaml @@ -0,0 +1,20 @@ +suite: benchmark-sql + +os: openeuler +os_version: 20.03 +os_mount: initramfs + +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 v2 lkp-tests 1/6] add job yaml for sysbench
by Luan Shengde 29 Apr '21

29 Apr '21

Signed-off-by: Luan Shengde <shdluan(a)163.com> --- jobs/sysbench-mysql.yaml | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 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..6c6606ea2 --- /dev/null +++ b/jobs/sysbench-mysql.yaml @@ -0,0 +1,33 @@ +suite: sysbench-mysql + +os: openeuler +os_version: 20.03 +os_mount: initramfs + +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: + +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 lkp-tests 6/6] pkg/mysql-8-0-20: add build install benchmarksql
by Luan Shengde 29 Apr '21

29 Apr '21

Signed-off-by: Luan Shengde <shdluan(a)163.com> --- pkg/mysql-8-0-20/PKGBUILD | 42 +++++++++++++++++++++++++++++++++++---- 1 file changed, 38 insertions(+), 4 deletions(-) diff --git a/pkg/mysql-8-0-20/PKGBUILD b/pkg/mysql-8-0-20/PKGBUILD index 66df6b33f..cf7a96d6b 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() @@ -58,6 +59,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 @@ -70,11 +76,39 @@ build_mysql() } } +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=10' \ + -e '/^loadWorkers=/cloadWorkers=10' \ + -e '/^terminals=/cterminals=10' \ + -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 + } +} + package() { cp my.cnf /etc/ cd $srcdir/my-sql_with_boostkit_patch/$pkgname-$pkgver/build && { - make install - } + make install + } } -- 2.23.0

1 1

[PATCH lkp-tests 5/6] tests: add init database for benchmark
by Luan Shengde 29 Apr '21

29 Apr '21

Signed-off-by: Luan Shengde <shdluan(a)163.com> --- tests/mysql-8-0-20 | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/tests/mysql-8-0-20 b/tests/mysql-8-0-20 index 990a053d7..e982eb92e 100755 --- a/tests/mysql-8-0-20 +++ b/tests/mysql-8-0-20 @@ -4,13 +4,16 @@ # 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() @@ -40,6 +43,8 @@ configure_mysql() 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 } @@ -48,6 +53,7 @@ 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" -u "$mysql_user" -p"$mysql_password" -e "create database $benchmark_db;" "$mysql_server" stop sleep 10 } -- 2.23.0

1 1

[PATCH lkp-tests 4/6] tests: add script for benchmarksql
by Luan Shengde 29 Apr '21

29 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 1

[PATCH lkp-tests 3/6] add stats file
by Luan Shengde 29 Apr '21

29 Apr '21

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 1

[PATCH lkp-tests 2/6] add job yaml for benmarksql
by Luan Shengde 29 Apr '21

29 Apr '21

Signed-off-by: Luan Shengde <shdluan(a)163.com> --- jobs/benchmark-sql.yaml | 20 ++++++++++++++++++++ 1 file changed, 20 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..152253c4e --- /dev/null +++ b/jobs/benchmark-sql.yaml @@ -0,0 +1,20 @@ +suite: benchmark-sql + +os: openeuler +os_version: 20.03 +os_mount: initramfs + +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 lkp-tests 1/6] add job yaml for sysbenc
by Luan Shengde 29 Apr '21

29 Apr '21

Signed-off-by: Luan Shengde <shdluan(a)163.com> --- jobs/sysbench-mysql.yaml | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 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..6c6606ea2 --- /dev/null +++ b/jobs/sysbench-mysql.yaml @@ -0,0 +1,33 @@ +suite: sysbench-mysql + +os: openeuler +os_version: 20.03 +os_mount: initramfs + +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: + +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 lab-z9] add host-info
by Zhang Dewan 29 Apr '21

29 Apr '21

Signed-off-by: Zhang Dewan <513619464(a)qq.com> --- hosts/taishan200-2280-2s64p-256g--a111 | 19 ++++++++++++++++ hosts/taishan200-2280-2s64p-256g--a134 | 19 ++++++++++++++++ hosts/taishan200-2280-2s64p-256g--a135 | 21 +++++++++++++++++ hosts/taishan200-2280-2s64p-256g--a136 | 21 +++++++++++++++++ hosts/taishan200-2280-2s64p-256g--a46 | 20 +++++++++++++++++ hosts/taishan200-2280-2s64p-256g--a82 | 31 ++++++++++++++++++++++++++ 6 files changed, 131 insertions(+) create mode 100644 hosts/taishan200-2280-2s64p-256g--a111 create mode 100644 hosts/taishan200-2280-2s64p-256g--a134 create mode 100644 hosts/taishan200-2280-2s64p-256g--a135 create mode 100644 hosts/taishan200-2280-2s64p-256g--a136 create mode 100644 hosts/taishan200-2280-2s64p-256g--a46 create mode 100644 hosts/taishan200-2280-2s64p-256g--a82 diff --git a/hosts/taishan200-2280-2s64p-256g--a111 b/hosts/taishan200-2280-2s64p-256g--a111 new file mode 100644 index 0000000..cc94ef3 --- /dev/null +++ b/hosts/taishan200-2280-2s64p-256g--a111 @@ -0,0 +1,19 @@ +memory: 128G +nr_hdd_partitions: 2 +hdd_partitions: + - /dev/disk/by-id/scsi-350000399886b6fa5 + - /dev/disk/by-id/scsi-350000399886b69c9 +mac_addr: + - 44:67:47:85:f1:1d + - 44:67:47:85:f1:1e + - 44:67:47:85:f1:1f + - 44:67:47:85:f1:20 + - 44:a1:91:9f:9a:da + - 44:a1:91:9f:9a:db + - 44:a1:91:9f:9a:dc + - 44:a1:91:9f:9a:dd +arch: aarch64 +nr_node: 4 +nr_cpu: 128 +model_name: Kunpeng-920 +ipmi_ip: 9.3.11.4 diff --git a/hosts/taishan200-2280-2s64p-256g--a134 b/hosts/taishan200-2280-2s64p-256g--a134 new file mode 100644 index 0000000..bf223d2 --- /dev/null +++ b/hosts/taishan200-2280-2s64p-256g--a134 @@ -0,0 +1,19 @@ +memory: 128G +nr_hdd_partitions: 2 +hdd_partitions: + - /dev/disk/by-id/scsi-35000c500bd685123 + - /dev/disk/by-id/scsi-35000c500bd6a1bef +mac_addr: + - cc:05:77:fe:d0:44 + - cc:05:77:fe:d0:45 + - cc:05:77:fe:d0:46 + - cc:05:77:fe:d0:47 + - 44:a1:91:9f:ae:ba + - 44:a1:91:9f:ae:bb + - 44:a1:91:9f:ae:bc + - 44:a1:91:9f:ae:bd +arch: aarch64 +nr_node: 4 +nr_cpu: 128 +model_name: Kunpeng-920 +ipmi_ip: 9.3.14.3 diff --git a/hosts/taishan200-2280-2s64p-256g--a135 b/hosts/taishan200-2280-2s64p-256g--a135 new file mode 100644 index 0000000..1a64502 --- /dev/null +++ b/hosts/taishan200-2280-2s64p-256g--a135 @@ -0,0 +1,21 @@ +memory: 256G +nr_hdd_partitions: 4 +hdd_partitions: + - /dev/disk/by-id/scsi-350000399b88bf94d + - /dev/disk/by-id/scsi-350000399b883bbf5 + - /dev/disk/by-id/scsi-350000399b883b77d + - /dev/disk/by-id/scsi-350000399b88bf9ed +mac_addr: + - 44:67:47:86:1a:28 + - 44:67:47:86:1a:29 + - 44:67:47:86:1a:2a + - 44:67:47:86:1a:2b + - 44:67:47:86:1a:2c + - 44:67:47:86:1a:2d + - 44:67:47:86:1a:2e + - 44:67:47:86:1a:2f +arch: aarch64 +nr_node: 4 +nr_cpu: 96 +model_name: Kunpeng-920 +ipmi_ip: 9.3.14.4 diff --git a/hosts/taishan200-2280-2s64p-256g--a136 b/hosts/taishan200-2280-2s64p-256g--a136 new file mode 100644 index 0000000..6623ab5 --- /dev/null +++ b/hosts/taishan200-2280-2s64p-256g--a136 @@ -0,0 +1,21 @@ +memory: 256G +nr_hdd_partitions: 4 +hdd_partitions: + - /dev/disk/by-id/scsi-35000c500c278b1f7 + - /dev/disk/by-id/scsi-35000c500c27e7efb + - /dev/disk/by-id/scsi-35000c500c27f345f + - /dev/disk/by-id/scsi-35000c500c27d013b +mac_addr: + - 44:67:47:c9:df:f2 + - 44:67:47:c9:df:f3 + - 44:67:47:c9:df:f4 + - 44:67:47:c9:df:f5 + - 44:67:47:c9:df:f6 + - 44:67:47:c9:df:f7 + - 44:67:47:c9:df:f8 + - 44:67:47:c9:df:f9 +arch: aarch64 +nr_node: 4 +nr_cpu: 96 +model_name: Kunpeng-920 +ipmi_ip: 9.3.14.5 diff --git a/hosts/taishan200-2280-2s64p-256g--a46 b/hosts/taishan200-2280-2s64p-256g--a46 new file mode 100644 index 0000000..ba03287 --- /dev/null +++ b/hosts/taishan200-2280-2s64p-256g--a46 @@ -0,0 +1,20 @@ +memory: 128G +nr_hdd_partitions: 2 +hdd_partitions: + - /dev/disk/by-id/scsi-35000039988694285 + - /dev/disk/by-id/scsi-350000399886a564d + - /dev/disk/by-id/scsi-350000399886a564d-part1 +mac_addr: + - 44:67:47:85:f8:4d + - 44:67:47:85:f8:4e + - 44:67:47:85:f8:4f + - 44:67:47:85:f8:50 + - cc:05:77:ee:b0:4f + - cc:05:77:ee:b0:50 + - cc:05:77:ee:b0:51 + - cc:05:77:ee:b0:52 +arch: aarch64 +nr_node: 4 +nr_cpu: 128 +model_name: Kunpeng-920 +ipmi_ip: 9.3.2.11 diff --git a/hosts/taishan200-2280-2s64p-256g--a82 b/hosts/taishan200-2280-2s64p-256g--a82 new file mode 100644 index 0000000..02e8376 --- /dev/null +++ b/hosts/taishan200-2280-2s64p-256g--a82 @@ -0,0 +1,31 @@ +memory: 256G +nr_hdd_partitions: 1 +nr_ssd_partitions: 1 +hdd_partitions: + - /dev/disk/by-id/scsi-3500003999812edd1 + - /dev/disk/by-id/scsi-3500003999812edd1-part1 + - /dev/disk/by-id/scsi-3500003999812edd1-part2 + - /dev/disk/by-id/scsi-3500003999812edd1-part3 +ssd_partitions: + - /dev/disk/by-id/ata-SAMSUNG_MZ7LH480HAHQ-00005_S45PNA2MB43947 + - /dev/disk/by-id/ata-SAMSUNG_MZ7LH480HAHQ-00005_S45PNA2MB43947-part1 + - /dev/disk/by-id/ata-SAMSUNG_MZ7LH480HAHQ-00005_S45PNA2MB43947-part2 + - /dev/disk/by-id/ata-SAMSUNG_MZ7LH480HAHQ-00005_S45PNA2MB43947-part3 +mac_addr: + - 84:46:fe:26:d0:59 + - 84:46:fe:26:d0:5a + - 84:46:fe:26:d0:5b + - 84:46:fe:26:d0:5c + - ac:b3:b5:1e:bd:fb + - ac:b3:b5:1e:bd:fc + - ac:b3:b5:1e:bd:fd + - ac:b3:b5:1e:bd:fe + - ac:b3:b5:1e:bc:ab + - ac:b3:b5:1e:bc:ac + - ac:b3:b5:1e:bc:ad + - ac:b3:b5:1e:bc:ae +arch: aarch64 +nr_node: 4 +nr_cpu: 128 +model_name: Kunpeng-920 +ipmi_ip: 9.3.6.11 -- 2.23.0

1 0

git count
by Wu Fengguang 29 Apr '21

29 Apr '21

Liu Yinsi is our code star,thanks Liu Yinsi! lys@crystal ~/todo/bin% ./git-count 20 Liu Yinsi 13 Yu Chuan 12 Li Yuanchao 11 Lu Weitao 9 Cao Xueliang 9 Luan Shengde 8 Bai Jing 8 Liu Shaofei 8 Wu Zhende 3 Xu Xijian 3 Wang Chenglong 3 Lin Jiaxin 3 Li Ping 2 Wei Jihui 2 Wu Fengguang 2 Wang Yong 1 Cui Yili 0 Du Kaitian 0 Zhang Yale 0 Zhang Dewan

1 0

help star
by Wu Fengguang 29 Apr '21

29 Apr '21

Wei Jihui is our help star again, thanks Wei Jihui! 12.0 Wei Jihui 10.5 Liu Yinsi 9.2 Wu Zhende 8.2 Yu Chuan 8.1 Li Yuanchao 7.0 Lu Weitao 6.4 Zhang Dewan 6.1 Cao Xueliang 5.2 Luan Shengde 4.2 Lin Jiaxin 3.6 Xu Xijian 2.6 Wu Fengguang 2.0 Wang Chenglong 1.4 Liu Shaofei 1.3 Wang Yong 1.2 Bai Jing 0.8 Li Ping 0.0 Du Kaitian 0.0 Zhang Yale 0.0 Cui Yili

1 0

review star
by Wu Fengguang 29 Apr '21

29 Apr '21

: wqUser-Agent: Mutt/1.10.1 (2018-07-13) User-Agent: Mutt/1.10.1 (2018-07-13) Xu Xijian is our review star, thanks Xu Xijian! lys@crystal ~/todo/bin% ./review-star Review email records in the last 7 days total review paragraph point people 24 18 22 16 Xu Xijian 48 17 25 11 Wei Jihui 39 9 18 8 Luan Shengde 143 12 14 7 Cao Xueliang 46 7 6 6 Liu Shaofei 7 3 2 4 Zhang Dewan 11 3 5 1 Li Ping 53 2 2 1 Liu Yinsi 19 2 2 1 Wang Yong 5 0 0 0 Cui Yili 27 0 0 0 Li Yuanchao 48 2 9 0 Yu Chuan 24 0 0 0 Wu Zhende 20 0 0 0 Bai Jing 7 1 1 0 Lin Jiaxin 18 0 0 0 Lu Weitao 42 0 0 0 Wang Chenglong 8 0 0 0 Wu Fengguang

1 0

[PATCH lkp-tests] bin/run-ipconfig: support the configuration of multiple network cards
by Cui Yili 29 Apr '21

29 Apr '21

[why] rewrite the configure_networking function to support the configuration of multiple network cards. Signed-off-by: Cui Yili <2268260388(a)qq.com> --- bin/run-ipconfig | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/bin/run-ipconfig b/bin/run-ipconfig index 0f80feafe..ceff60f6f 100755 --- a/bin/run-ipconfig +++ b/bin/run-ipconfig @@ -6,6 +6,43 @@ export PATH="$PATH:/usr/lib/klibc/bin" IP=$DIRECT_IP +# rewrite the configure_networking function +# to support the configuration of multiple network cards +configure_networking() +{ + for device in /sys/class/net/* ; do + if [ -f "$device/address" ]; then + DEVICE=${device##*/} + + [ "${DEVICE}" = "lo" ] && continue + [ "${DEVICE}" = "docker0" ] && continue + + for ROUNDTTT in 2 3 4 6 9 16 25 36 64 100; do + + [ -e /run/net-"${DEVICE}".conf ] && break + case ${IP} in + none|off) + # Do nothing + ;; + ""|on|any) + # Bring up device + ipconfig -t ${ROUNDTTT} "${DEVICE}" + ;; + dhcp|bootp|rarp|both) + ipconfig -t ${ROUNDTTT} -c "${IP}" -d "${DEVICE}" + ;; + *) + ipconfig -t ${ROUNDTTT} -d "$IP" + ;; + esac + done + + . "/run/net-${DEVICE}.conf" + fi + done + +} + read_ip() { for x in $(cat /proc/cmdline) -- 2.23.0

1 0

[PATCH compass-ci] sbin/auto_submit: add commit_title
by Li Yuanchao 29 Apr '21

29 Apr '21

So it would be easy for user to find the commit. Signed-off-by: Li Yuanchao <lyc163mail(a)163.com> --- sbin/auto_submit | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/sbin/auto_submit b/sbin/auto_submit index 595053e..08193e5 100755 --- a/sbin/auto_submit +++ b/sbin/auto_submit @@ -81,7 +81,9 @@ class AutoSubmit base_commit = %x(git -C #{mirror_dir} merge-base master #{branch}).chomp argvs_for_base.push("upstream_commit=#{base_commit}") system(argvs_for_base.join(' ')) - return "author_email=#{author_email} committer_email=#{committer_email} base_commit=#{base_commit}" + commit_title = %x(git -C #{mirror_dir} log --format=%s -1 #{commit_id}).chomp + + return "author_email=#{author_email} committer_email=#{committer_email} base_commit=#{base_commit} commit_title=#{commit_title}" end def submit_specific_branch(submit_argv, newrefs_info, branches) -- 2.23.0

2 2

[PATCH v3 lkp-tests] add email feedback for rpmbuild-pkg
by Li Ping 29 Apr '21

29 Apr '21

tests/rpmbuild-pkg: add a new input parameter whether_email [usage]: rpmbuild-pkg: whether_email: 1 when job failed, send an rpmbuild failed email. when job run success, send an rpmbuild success email. Signed-off-by: Li Ping <1477412247(a)qq.com> --- lib/email.sh | 37 +++++++++++++++++++++++++++++++++++++ tests/rpmbuild-pkg | 15 +++++++++++++++ 2 files changed, 52 insertions(+) diff --git a/lib/email.sh b/lib/email.sh index b5e56df79..0082e852d 100755 --- a/lib/email.sh +++ b/lib/email.sh @@ -96,6 +96,43 @@ Compass-CI " } +rpmbuild_report() +{ + local author_email=$(git_pretty_format "%ae") + local author_name=$(git_pretty_format "%an") + email_content="To: $author_email +Subject: [NOTIFY Compass-CI] rpmbuild report + +Dear $author_name: + + $rpmbuild_result + +Regards +Compass-CI +" +} + +rpmbuild_success_content() +{ + rpmbuild_result="Your RPM Package is successfully built. + +You can click the follow link to obtain your RPM Package: +http://api.compass-ci.openeuler.org:20012/rpm/pub/${os}-${os_version}/${compat_os}/${os_arch}/Packages + +And you can click the following link to view RPM Package build details: +http://api.compass-ci.openeuler.org:${SRV_HTTP_RESULT_PORT:-20007}$result_root" + + rpmbuild_report +} + +rpmbuild_failed_content() +{ + rpmbuild_result="Sorry to inform you that RPM Package built failed, you can click the following link to view details. +http://api.compass-ci.openeuler.org:${SRV_HTTP_RESULT_PORT:-20007}$result_root" + + rpmbuild_report +} + send_email() { local subject=$1 diff --git a/tests/rpmbuild-pkg b/tests/rpmbuild-pkg index 3dd75b896..970418848 100755 --- a/tests/rpmbuild-pkg +++ b/tests/rpmbuild-pkg @@ -5,6 +5,7 @@ # - repo_addr # - custom_repo_name # - custom_repo_addr +# - whether_email # Git repo jobs only use the first two parameters, SRPMs jobs use all # user can add custom_repo_name and custom_repo_addr to setup # local repo, value can be an array @@ -12,6 +13,7 @@ . $LKP_SRC/lib/debug.sh . $LKP_SRC/lib/upload.sh . $LKP_SRC/lib/rpm.sh +. $LKP_SRC/lib/email.sh : "${compat_os:=budding-openeuler}" @@ -19,6 +21,13 @@ dest_dir="/rpm/upload/${os}-${os_version}/${compat_os}" +die() +{ + [ -n "$whether_email" ] && send_email "rpmbuild_failed" + echo "$@" 1>&2 + exit 99 +} + from_git() { package_name=${upstream_repo##*/} @@ -29,6 +38,11 @@ from_git() download_upstream_repo } +git_pretty_format() +{ + curl -sS -H 'Content-Type: Application/json' -XPOST "$LKP_SERVER"':8100/git_command' -d '{"git_repo": "'${upstream_dir}/${upstream_repo}.git'", "git_command": ["git-log","-n1","--pretty=format:'$1'", "'${upstream_commit}'"]}' +} + from_srpm() { [ -n "$repo_name" ] || die "repo_name is empty" @@ -143,3 +157,4 @@ add_repo build_rpm upload_rpm_pkg update_repo_mq +[ -n "$whether_email" ] && send_email "rpmbuild_success" -- 2.23.0

1 0

[PATCH compass-ci] lib/job.cr: change borrow runtime 10 days to 30 days
by Cao Xueliang 29 Apr '21

29 Apr '21

Signed-off-by: Cao Xueliang <caoxl78320(a)163.com> --- src/lib/job.cr | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/lib/job.cr b/src/lib/job.cr index bb4ef96..98b2c3d 100644 --- a/src/lib/job.cr +++ b/src/lib/job.cr @@ -439,12 +439,12 @@ class Job # only job.yaml for borrowing machine has the key: ssh_pub_key return unless @hash.has_key?("ssh_pub_key") - # the maxmum borrowing time is limited no more than 10 days. + # the maxmum borrowing time is limited no more than 30 days. # case the runtime/sleep value count beyond the limit, # it will throw error message and prevent the submit for borrowing machine. # runtime value is converted to second. - max_run_time = 10 * 24 * 3600 - error_msg = "\nMachine borrow time(runtime/sleep) cannot exceed 10 days. Consider re-borrow.\n" + max_run_time = 30 * 24 * 3600 + error_msg = "\nMachine borrow time(runtime/sleep) cannot exceed 30 days. Consider re-borrow.\n" if @hash["pp"]["sleep"].as_i? sleep_run_time = @hash["pp"]["sleep"] -- 2.23.0

1 0

[PATCH compass-ci] sparrow/8-testbox: add multi-qemu
by Liu Yinsi 29 Apr '21

29 Apr '21

run qemu testboxes for user locally deploy ci env, if the host is virtual, not run qemu. Signed-off-by: Liu Yinsi <liuyinsi(a)163.com> --- sparrow/8-testbox/multi-qemu | 7 +++++++ sparrow/install-tiny | 1 + 2 files changed, 8 insertions(+) create mode 100755 sparrow/8-testbox/multi-qemu diff --git a/sparrow/8-testbox/multi-qemu b/sparrow/8-testbox/multi-qemu new file mode 100755 index 00000000..8a995cdb --- /dev/null +++ b/sparrow/8-testbox/multi-qemu @@ -0,0 +1,7 @@ +#!/bin/bash +# SPDX-License-Identifier: MulanPSL-2.0+ +# Copyright (c) 2020 Huawei Technologies Co., Ltd. All rights reserved. + +dmidecode -s system-product-name | grep -iq "virtual" && exit + +nohup $CCI_SRC/providers/multi-qemu -n vm-2p8g -c 10 -q vm-2p8g.$(arch) & diff --git a/sparrow/install-tiny b/sparrow/install-tiny index 40358a4c..a81f2d5c 100755 --- a/sparrow/install-tiny +++ b/sparrow/install-tiny @@ -24,3 +24,4 @@ cd $CCI_SRC/sparrow || exit 5-build/register-account 7-systemd/systemd-setup 8-testbox/multi-docker +8-testbox/multi-qemu -- 2.23.0

2 2

[PATCH lkp-tests] jobs: add borrow-30d.yaml
by Liu Yinsi 29 Apr '21

29 Apr '21

Signed-off-by: Liu Yinsi <liuyinsi(a)163.com> --- jobs/borrow-30d.yaml | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 jobs/borrow-30d.yaml diff --git a/jobs/borrow-30d.yaml b/jobs/borrow-30d.yaml new file mode 100644 index 000000000..e24fd6480 --- /dev/null +++ b/jobs/borrow-30d.yaml @@ -0,0 +1,14 @@ +suite: borrow +testcase: borrow + +runtime: 30d +ssh_pub_key: <%= + begin + File.read("#{ENV['HOME']}/.ssh/id_rsa.pub").chomp + rescue + nil + end + %> +sshd: +# sleep at the bottom +sleep: -- 2.23.0

1 0

[PATCH compass-ci] sparrow/0-package: add gem dep nokogiri for libvirt
by Xu Xijian 29 Apr '21

29 Apr '21

Signed-off-by: Xu Xijian <hdxuxijian(a)163.com> --- sparrow/0-package/common | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sparrow/0-package/common b/sparrow/0-package/common index 82c09ff..a827a65 100755 --- a/sparrow/0-package/common +++ b/sparrow/0-package/common @@ -8,7 +8,8 @@ public_network_ok && { gem sources -r https://rubygems.org/ -a https://gems.ruby-china.com/ - gem install --no-user-install git activesupport rest-client cucumber json faye-websocket elasticsearch bunny + gem install --no-user-install git activesupport rest-client cucumber json faye-websocket elasticsearch bunny \ + nokogiri } grep -q '^lkp:' /etc/passwd || useradd -u 1090 lkp -- 2.23.0

1 0

[PATCH v2 compass-ci] sparrow/0-package: add deps libxml2-devel libxslt-devel
by Xu Xijian 29 Apr '21

29 Apr '21

These 2 deps are for nokogiri, and nokogiri is dep of libvirt. Signed-off-by: Xu Xijian <hdxuxijian(a)163.com> --- sparrow/0-package/os/centos | 2 ++ sparrow/0-package/os/openEuler | 2 ++ 2 files changed, 4 insertions(+) diff --git a/sparrow/0-package/os/centos b/sparrow/0-package/os/centos index d4d1045..3f7dcac 100755 --- a/sparrow/0-package/os/centos +++ b/sparrow/0-package/os/centos @@ -26,6 +26,8 @@ pkgs=( curl sudo iputils + libxml2-devel + libxslt-devel ) yum install -y --skip-broken "${pkgs[@]}" diff --git a/sparrow/0-package/os/openEuler b/sparrow/0-package/os/openEuler index 5829a12..5153239 100755 --- a/sparrow/0-package/os/openEuler +++ b/sparrow/0-package/os/openEuler @@ -29,6 +29,8 @@ pkgs=( curl sudo iputils + libxml2-devel + libxslt-devel ) public_network_ok && { -- 2.23.0

1 0

[PATCH compass-ci 4/4] lib/mail_job_result.rb: fix incorrect logic
by Lu Weitao 29 Apr '21

29 Apr '21

Signed-off-by: Lu Weitao <luweitaobe(a)163.com> --- lib/mail_job_result.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/mail_job_result.rb b/lib/mail_job_result.rb index 389ad26a..744b7d5c 100644 --- a/lib/mail_job_result.rb +++ b/lib/mail_job_result.rb @@ -77,7 +77,7 @@ def get_compare_result(job) commit_id = job['upstream_commit'] return nil unless base_commit && commit_id - condition_list = [{'base_commit' => base_commit}, {'upstream_commit' => commit_id}] + condition_list = [{'upstream_commit' => base_commit}, {'upstream_commit' => commit_id}] options = { :min_samples => min_samples, :no_print => true} matrices_list, suite_list = create_matrices_list(condition_list, options[:min_samples]) -- 2.23.0

1 0