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

[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