- Compass-ci - mailweb.openeuler.org

[PATCH v4 lkp-tests 1/2] jobs/iozone_with_block_size.yaml: add iozone_with_block_size.yaml
by Lu Kaiyi 29 Oct '20

29 Oct '20

[why] need test different block_size value Signed-off-by: Lu Kaiyi <2392863668(a)qq.com> --- jobs/iozone_with_block_size.yaml | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100644 jobs/iozone_with_block_size.yaml diff --git a/jobs/iozone_with_block_size.yaml b/jobs/iozone_with_block_size.yaml new file mode 100644 index 00000000..fb7933d8 --- /dev/null +++ b/jobs/iozone_with_block_size.yaml @@ -0,0 +1,25 @@ +suite: iozone +testcase: iozone +category: benchmark + +file_size: 4g +write_rewrite: 0 +read_reread: 1 +random_read_write: 2 + +block_size: +- 64k +- 256k +- 1m +- 4m +- 16m + +disk: 1HDD + +fs: +- xfs + +iosched: +- kyber + +iozone: -- 2.23.0

4 5

[PATCH lkp-tests] setup/sysctl: add sysctl params for nginx test
by Wei Jihui 29 Oct '20

29 Oct '20

nginx test need optimize network so add these parameters to setup/sysctl Signed-off-by: Wei Jihui <weijihuiall(a)163.com> --- setup/sysctl | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/setup/sysctl b/setup/sysctl index 8b7d8339..81374939 100755 --- a/setup/sysctl +++ b/setup/sysctl @@ -193,6 +193,15 @@ # - sc_hot_threshold_mbytes # - sc_cold_threshold_mbytes # - sc_drop_threshold_mbytes +# - sc_ipv4_tcp_tw_reuse +# - sc_ipv4_tcp_keepalive_time +# - sc_ipv4_tcp_fin_timeout +# - sc_ipv4_tcp_max_tw_buckets +# - sc_ipv4_tcp_max_syn_backlog +# - sc_ipv4_ip_local_port_range +# - sc_netdev_max_backlog +# - sc_rmem_max +# - sc_wmem_max . $LKP_SRC/lib/reproduce-log.sh @@ -390,5 +399,14 @@ [ -n "$sc_hot_threshold_mbytes" ] && log_eval "echo '$sc_hot_threshold_mbytes' > '/proc/sys/vm/hot_threshold_mbytes'" [ -n "$sc_cold_threshold_mbytes" ] && log_eval "echo '$sc_cold_threshold_mbytes' > '/proc/sys/vm/cold_threshold_mbytes'" [ -n "$sc_drop_threshold_mbytes" ] && log_eval "echo '$sc_drop_threshold_mbytes' > '/proc/sys/vm/drop_threshold_mbytes'" +[ -n "$sc_ipv4_tcp_tw_reuse" ] && log_eval "echo '$sc_ipv4_tcp_tw_reuse' > '/proc/sys/net/ipv4/tcp_tw_reuse'" +[ -n "$sc_ipv4_tcp_keepalive_time" ] && log_eval "echo '$sc_ipv4_tcp_keepalive_time' > '/proc/sys/net/ipv4/tcp_keepalive_time'" +[ -n "$sc_ipv4_tcp_fin_timeout" ] && log_eval "echo '$sc_ipv4_tcp_fin_timeout' > '/proc/sys/net/ipv4/tcp_fin_timeout'" +[ -n "$sc_ipv4_tcp_max_tw_buckets" ] && log_eval "echo '$sc_ipv4_tcp_max_tw_buckets' > '/proc/sys/net/ipv4/tcp_max_tw_buckets'" +[ -n "$sc_ipv4_tcp_max_syn_backlog" ] && log_eval "echo '$sc_ipv4_tcp_max_syn_backlog' > '/proc/sys/net/ipv4/tcp_max_syn_backlog'" +[ -n "$sc_ipv4_ip_local_port_range" ] && log_eval "echo '$sc_ipv4_ip_local_port_range' > '/proc/sys/net/ipv4/ip_local_port_range'" +[ -n "$sc_netdev_max_backlog" ] && log_eval "echo '$sc_netdev_max_backlog' > '/proc/sys/net/core/netdev_max_backlog'" +[ -n "$sc_rmem_max" ] && log_eval "echo '$sc_rmem_max' > '/proc/sys/net/core/rmem_max'" +[ -n "$sc_wmem_max" ] && log_eval "echo '$sc_wmem_max' > '/proc/sys/net/core/wmem_max'" exit 0 -- 2.23.0

4 3

[PATCH v6 compass-ci 4/5] container/ntp-server: ntp.conf
by Wang Chenglong 29 Oct '20

29 Oct '20

Signed-off-by: Wang Chenglong <18509160991(a)163.com> --- container/ntp-server/ntp.conf | 60 +++++++++++++++++++++++++++++++++++ 1 file changed, 60 insertions(+) create mode 100644 container/ntp-server/ntp.conf diff --git a/container/ntp-server/ntp.conf b/container/ntp-server/ntp.conf new file mode 100644 index 0000000..67dd1b0 --- /dev/null +++ b/container/ntp-server/ntp.conf @@ -0,0 +1,60 @@ +# For more information about this file, see the ntp.conf(5) man page. + +# Record the frequency of the system clock. +driftfile /var/lib/ntp/drift + +# Permit time synchronization with our time source, but do not +# permit the source to query or modify the service on this system. +restrict default nomodify notrap nopeer noepeer noquery + +# Permit association with pool servers. +restrict source nomodify notrap noepeer noquery + +# Permit all access over the loopback interface. This could +# be tightened as well, but to do so would effect some of +# the administrative functions. +restrict 127.0.0.1 +restrict ::1 + +# Hosts on local network are less restricted. +restrict 172.0.0.0 mask 255.0.0.0 nomodify notrap + +# Use public servers from the pool.ntp.org project. +# Please consider joining the pool (http://www.pool.ntp.org/join.html) +# pool 2.openEuler.pool.ntp.org iburst +server 0.centos.pool.ntp.org +server 0.asia.pool.ntp.org +server ntp.sjtu.edu.cn +server ntp1.aliyun.com + +# When all ntp servers on Internet are inaccessible, it will use +# it's local time to give service to the ntp clients. +# If not set, the ntp server will go to stratum 16 and cannot serve +# any ntp clients when it loses connection with upstream ntp servers. +# This is common in a LAN environment isolated with Internet. +server 127.127.1.0 +fudge 127.127.1.0 stratum 8 + +# Reduce the maximum number of servers used from the pool. +tos maxclock 5 + +# Enable public key cryptography. +# crypto + +includefile /etc/ntp/crypto/pw + +# Key file containing the keys and key identifiers used when operating +# with symmetric key cryptography. +keys /etc/ntp/keys + +# Specify the key identifiers which are trusted. +# trustedkey 4 8 42 + +# Specify the key identifier to use with the ntpdc utility. +# requestkey 8 + +# Specify the key identifier to use with the ntpq utility. +# controlkey 8 + +# Enable writing of statistics records. +# statistics clockstats cryptostats loopstats peerstats -- 2.23.0

1 0

[PATCH v6 compass-ci 3/5] container/ntp-server: build
by Wang Chenglong 29 Oct '20

29 Oct '20

Signed-off-by: Wang Chenglong <18509160991(a)163.com> --- container/ntp-server/build | 5 +++++ 1 file changed, 5 insertions(+) create mode 100755 container/ntp-server/build diff --git a/container/ntp-server/build b/container/ntp-server/build new file mode 100755 index 0000000..7826fb2 --- /dev/null +++ b/container/ntp-server/build @@ -0,0 +1,5 @@ +#!/bin/bash +# SPDX-License-Identifier: MulanPSL-2.0+ +# Copyright (c) 2020 Huawei Technologies Co., Ltd. All rights reserved. + +docker build -t ntp-server . -- 2.23.0

1 0

[PATCH v6 compass-ci 2/5] container/ntp-server: start-server.sh
by Wang Chenglong 29 Oct '20

29 Oct '20

[What] start ntp-server and specify the log file. Signed-off-by: Wang Chenglong <18509160991(a)163.com> --- container/ntp-server/start-server.sh | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100755 container/ntp-server/start-server.sh diff --git a/container/ntp-server/start-server.sh b/container/ntp-server/start-server.sh new file mode 100755 index 0000000..bf87bd5 --- /dev/null +++ b/container/ntp-server/start-server.sh @@ -0,0 +1,7 @@ +#!/bin/sh +# SPDX-License-Identifier: MulanPSL-2.0+ +# Copyright (c) 2020 Huawei Technologies Co., Ltd. All rights reserved. + +/usr/sbin/ntpd -g -l /var/log/ntpstats/ntpd.log + +exec "$@" -- 2.23.0

1 0

[PATCH compass-ci] sparrow/3-code: fix no such file or directory
by Zhang Yale 29 Oct '20

29 Oct '20

[Why] when run dev-env in centos system error like this: ./dev-env:line 41: ./os/centos: No such file or directory. Signed-off-by: Zhang Yale <zhangyale3(a)huawei.com> --- sparrow/3-code/dev-env | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sparrow/3-code/dev-env b/sparrow/3-code/dev-env index 11c7fb0..7703786 100755 --- a/sparrow/3-code/dev-env +++ b/sparrow/3-code/dev-env @@ -38,4 +38,4 @@ EOF source /etc/os-release -. $(dirname ${BASH_SOURCE[0]})/os/${ID} +[ -f "${ID}" ] && . $(dirname ${BASH_SOURCE[0]})/os/${ID} -- 2.23.0

3 4

[PATCH v2 compass-ci] container/rsync-server: modify data upload directory
by Cui Yili 29 Oct '20

29 Oct '20

[why] Modify data upload directory to upload qemu image. qemu image uploaded by the user, used for testing [how] Change the rsync.conf configuration and docker operating parameters. Signed-off-by: cuiyili <2268260388(a)qq.com> --- container/rsync-server/rsyncd.conf | 6 ++++-- container/rsync-server/start | 4 ++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/container/rsync-server/rsyncd.conf b/container/rsync-server/rsyncd.conf index 528e8bd..dd8f128 100644 --- a/container/rsync-server/rsyncd.conf +++ b/container/rsync-server/rsyncd.conf @@ -1,10 +1,12 @@ uid = lkp gid = lkp +port = 11387 use chroot = no +log file=/var/log/rsync.log -[result] -path = /result +[upload] +path = /srv/initrd/qemu-image read only = no max connections = 200 refuse options = delete diff --git a/container/rsync-server/start b/container/rsync-server/start index 4124192..6fa3de2 100755 --- a/container/rsync-server/start +++ b/container/rsync-server/start @@ -9,9 +9,9 @@ cmd=( docker run -id --name=rsync_server - -v /srv/result:/result + -v /srv/initrd/qemu-image:/srv/initrd/qemu-image -v /etc/localtime:/etc/localtime:ro - -p 873:873 + -p 11387:11387 rsync_server:latest ) -- 2.23.0

3 2

[PATCH v3 lkp-tests] tests/build-pkg: modify save location for *.cgz file
by Liu Shaofei 29 Oct '20

29 Oct '20

[why] the path of *.cgz file generated by build-pkg script cannot be obtained during test. So the path of cgz need to be changed. [how] below is example for openeuler: latest.cgz -> f71820d6055373c9b9381615e28a28f307bb2df4.cgz f71820d6055373c9b9381615e28a28f307bb2df4.cgz v1.8.1.cgz -> 92c89f904a14d4bfc25abcd2c3d5c2da35a589d6.cgz 92c89f904a14d4bfc25abcd2c3d5c2da35a589d6.cgz v1.5.1.cgz -> df0584e46db9e7b412626deab10b923504745b2c.cgz df0584e46db9e7b412626deab10b923504745b2c.cgz Signed-off-by: Liu Shaofei <liushaofei5(a)huawei.com> --- tests/build-pkg | 21 +++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) diff --git a/tests/build-pkg b/tests/build-pkg index b10b1497..7eef126d 100755 --- a/tests/build-pkg +++ b/tests/build-pkg @@ -2,10 +2,12 @@ # - os # - os_arch # - os_version +# - os_mount # - pkgbuild_repo # - upstream_repo # - upstream_url # - upstream_commit +# - upstream_tag ## makepkg is a script that automates the building of packages; it can download and validate source files, ## check dependencies, configure build-time settings, compile the sources, install into a temporary root, @@ -21,15 +23,19 @@ check_vars() [ -n "$os_version" ] || die "os_version is empty" [ -n "$pkgbuild_repo" ] || die "pkgbuild_repo is empty" [ -n "$upstream_commit" ] || die "upstream_commit is empty" + [ -n "$os_mount" ] || die "os_mount is empty" } mount_dest() { + [[ "$os_mount" = "cifs" ]] && os_mount="nfs" + pack_to=${os_mount}/${os}/${os_arch}/${os_version} + PKG_MNT=/initrd/build-pkg mkdir -p "$PKG_MNT" [ -n "$LKP_SERVER" ] && { - mount $LKP_SERVER:$PKG_MNT $PKG_MNT || die "Failed to run mount" + mount -t cifs -o guest,vers=1.0,noacl,nouser_xattr //$LKP_SERVER$PKG_MNT $PKG_MNT || die "Failed to run mount" } } @@ -75,12 +81,23 @@ build_source_pkg() sed -i "s|^source=.*|${upstream_source}|g" PKGBUILD } - cgz_name="$PKG_MNT/${pkgname}/${upstream_commit}.cgz" + cgz_name="$PKG_MNT/${pack_to}/${pkgname}/${upstream_commit}.cgz" PACMAN=true BUILDDIR=$TMP CARCH=$os_arch PKGEXT=.cgz CGZDEST="$cgz_name" \ $LKP_SRC/sbin/makepkg -A --check --config $LKP_SRC/etc/makepkg.conf 2>&1 } +create_softlink() +{ + [ -n "$upstream_tag" ] || return 0 + [ -e "$PKG_MNT/${pack_to}/${upstream_tag}.cgz" ] && return 0 + + ln -sf "$(basename $(realpath ${cgz_name}))" "$PKG_MNT/${pack_to}/${pkgname}/${upstream_tag}.cgz" || return 0 + echo "create soft link: $PKG_MNT/${pack_to}/${pkgname}/${upstream_tag}.cgz -> $(basename $(realpath ${cgz_name}))" +} + check_vars mount_dest request_pkg build_source_pkg +create_softlink + -- 2.23.0

4 5

[PATCH v5 compass-ci 1/5] container/ntp-server: Dockerfile
by Wang Chenglong 29 Oct '20

29 Oct '20

[What] The docker file for build a container to provide network time synchronization service for virtual and physical machines. Signed-off-by: Wang Chenglong <18509160991(a)163.com> --- container/ntp-server/Dockerfile | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 container/ntp-server/Dockerfile diff --git a/container/ntp-server/Dockerfile b/container/ntp-server/Dockerfile new file mode 100644 index 0000000..76f2a0e --- /dev/null +++ b/container/ntp-server/Dockerfile @@ -0,0 +1,18 @@ +# SPDX-License-Identifier: MulanPSL-2.0+ +# Copyright (c) 2020 Huawei Technologies Co., Ltd. All rights reserved. + +FROM centos:7 +MAINTAINER Wang Chenglong <18509160991(a)163.com> + +RUN yum repolist +RUN yum -y install ntp && \ + yum clean all +RUN ln -fs /usr/share/zoneinfo/Asia/Shanghai /etc/localtime + +COPY ntp.conf /etc/ntp.conf +COPY start-server.sh / + +EXPOSE 123 + +ENTRYPOINT ["/start-server.sh"] +CMD ["sh"] -- 2.23.0

3 4

[PATCH v2 compass-ci] delimiter: refactor init job content
by Cao Xueliang 29 Oct '20

29 Oct '20

[why] There are two files need init job content, then use a function to wrap the code. Signed-off-by: Cao Xueliang <caoxl78320(a)163.com> --- lib/git_bisect.rb | 8 +------- src/delimiter/find-commit/bisect_run_script.rb | 3 +-- src/delimiter/utils.rb | 18 ++++++++++++++++++ 3 files changed, 20 insertions(+), 9 deletions(-) diff --git a/lib/git_bisect.rb b/lib/git_bisect.rb index c548861..9033db2 100644 --- a/lib/git_bisect.rb +++ b/lib/git_bisect.rb @@ -35,13 +35,7 @@ class GitBisect end def set_bad_job - @bad_job = @es.query_by_id @bad_job_id - raise "es query job id: #{@bad_job_id} failed!" unless @bad_job - - @bad_job.delete('uuid') - @bad_job.delete('stats') - @bad_job.delete('id') - @bad_job.delete('error_ids') + @bad_job = Utils.init_job_content(@bad_job_id) end def set_upstream diff --git a/src/delimiter/find-commit/bisect_run_script.rb b/src/delimiter/find-commit/bisect_run_script.rb index d5e4226..4877d79 100755 --- a/src/delimiter/find-commit/bisect_run_script.rb +++ b/src/delimiter/find-commit/bisect_run_script.rb @@ -18,8 +18,7 @@ class GitBisectRun end def git_bisect - job = @es.query_by_id @job_id - job.delete('stats') if job.key?('stats') + job = Utils.init_job_content(@job_id) commit = `git -C #{@work_dir} log --pretty=format:"%H" -1` job['upstream_commit'] = commit get_bisect_status job diff --git a/src/delimiter/utils.rb b/src/delimiter/utils.rb index 82cb918..679c8d9 100644 --- a/src/delimiter/utils.rb +++ b/src/delimiter/utils.rb @@ -87,5 +87,23 @@ module Utils return 'good' end + + def init_job_content(job_id) + es = ESQuery.new + job = es.query_by_id(job_id) + raise "es query job id: #{job_id} failed!" unless job + + job['bad_job_id'] = job_id + job['suite'] = 'bisect' + + job.delete('id') + job.delete('uuid') + job.delete('error_ids') + job.delete('start_time') + job.delete('end_time') + job.delete('loadavg') + + return job + end end end -- 2.23.0

1 0