- Compass-ci - mailweb.openeuler.org

[PATCH v3 compass-ci] container/sub-fluentd: fix heartbeat error
by Wu Zhende 05 Nov '20

05 Nov '20

[Error] fluent.warn: Unknown heartbeat response received from 172.17.0.1:24224. It may service out heartbeat_type default is tcp, delete the "heartbeat_type udp" to use tcp Signed-off-by: Wu Zhende <wuzhende666(a)163.com> --- container/sub-fluentd/docker-fluentd.conf | 1 - 1 file changed, 1 deletion(-) diff --git a/container/sub-fluentd/docker-fluentd.conf b/container/sub-fluentd/docker-fluentd.conf index c674fb1..09fa461 100644 --- a/container/sub-fluentd/docker-fluentd.conf +++ b/container/sub-fluentd/docker-fluentd.conf @@ -56,7 +56,6 @@ @type forward flush_interval 0 send_timeout 60 - heartbeat_type udp heartbeat_interval 1 recover_wait 10 hard_timeout 60 -- 2.23.0

1 0

[PATCH v2 lkp-tests 1/3] lib/job.rb: no need puts the a warning
by Li Ping 04 Nov '20

04 Nov '20

[why] we can get hostname from the repo lab-z9 or get hostname from lkp-tests/hosts --- lib/job.rb | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/lib/job.rb b/lib/job.rb index 5c2c9517..86cf3fa1 100755 --- a/lib/job.rb +++ b/lib/job.rb @@ -340,10 +340,8 @@ class Job lab_hosts_file = get_lab_hosts_file if lab_hosts_file hosts_file = lab_hosts_file - end - - if File.file?(hosts_file) - hosts_file + elsif File.file?(hosts_file) + hosts_file else puts("hosts_file not exist: #{hosts_file}, maybe need check testbox field") nil -- 2.23.0

1 1

[PATCH v2 lkp-tests 3/3] lib/job2sh.rb: fix bug: can not find the file: pkg/$program/PKGBUILD
by Li Ping 04 Nov '20

04 Nov '20

Signed-off-by: Li Ping <15396232681(a)163.com> --- lib/job.rb | 15 ++++++--------- lib/job2sh.rb | 1 + 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/lib/job.rb b/lib/job.rb index 5632ad88..e45ae682 100755 --- a/lib/job.rb +++ b/lib/job.rb @@ -334,18 +334,15 @@ class Job end def get_hosts_file + lab_hosts_file = get_lab_hosts_file + hosts_file = lab_hosts_file + return hosts_file if hosts_file + hosts_file_name = @job['tbox_group'].split('--')[0] hosts_file = "#{LKP_SRC}/hosts/#{hosts_file_name}" + return hosts_file if File.file?(hosts_file) - lab_hosts_file = get_lab_hosts_file - if lab_hosts_file - hosts_file = lab_hosts_file - elsif File.file?(hosts_file) - hosts_file - else - puts("hosts_file not exist: #{hosts_file}, maybe need check testbox field") - nil - end + puts("hosts_file not exist: #{hosts_file}, maybe need check testbox field") end def include_files diff --git a/lib/job2sh.rb b/lib/job2sh.rb index 9c95ff4b..7e6a5d7c 100755 --- a/lib/job2sh.rb +++ b/lib/job2sh.rb @@ -350,6 +350,7 @@ class Job2sh < Job out_line out_line "\texport define_files='#{define_files.keys.join ' '}'" define_files.each do |file, val| + out_line "\tmkdir -p $LKP_SRC/$(dirname #{file})" out_line "\tcat > $LKP_SRC/#{file} <<'EOF'" out_line val out_line "EOF" -- 2.23.0

1 1

[PATCH v2 lkp-tests 2/3] lib/job.rb: fix bug: add_define_files not work
by Li Ping 04 Nov '20

04 Nov '20

[why] multi-task job.yaml like this: program-0: xxx: program-1: xxx: the add_define_files will not work, because the following paths actually don't exist: $LKP_SRC/*/$program-$d $LKP_SRC/*/*/$program-$d $LKP_SRC/*/$program-$d/* $LKP_SRC/*/*/$program-$d/* Signed-off-by: Li Ping <15396232681(a)163.com> --- lib/job.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/job.rb b/lib/job.rb index 86cf3fa1..5632ad88 100755 --- a/lib/job.rb +++ b/lib/job.rb @@ -624,6 +624,7 @@ class Job programs_params_hash = @job["pp"] || {} program_name_list = programs_params_hash.keys || [] program_name_list.each do |program| + program = $1 if program =~ /^(.*)-\d+?/ # if job is run as makepkg, makepkg-deps, pack-deps, cci-makepkg, cci-depends # then use makepkg's benchmark as program to get define_files -- 2.23.0

1 0

[PATCH v4 lkp-tests] jobs/hackbench-git.yaml: fix datasize and threads filed
by Zhang Yale 04 Nov '20

04 Nov '20

[Why] hackbench-git is an old version required by the customer. The hackbench-git usage: hackbench [-pipe] <num groups> [process|thread] [loops] So fix datasize to loops, fix threads to thread. Signed-off-by: Zhang Yale <ylzhangah(a)qq.com> --- jobs/hackbench-git.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/jobs/hackbench-git.yaml b/jobs/hackbench-git.yaml index 12943c04..e2320621 100644 --- a/jobs/hackbench-git.yaml +++ b/jobs/hackbench-git.yaml @@ -1,4 +1,4 @@ -suite: hackbench +suite: hackbench-git category: benchmark disable_latency_stats: 1 @@ -11,13 +11,13 @@ nr_threads: - 10 - 20 iterations: 10 -datasize: 1000 +loops: 1000 runtime: 300 -hackbench: +hackbench-git: mode: - process - - threads + - thread ipc: - pipe - socket -- 2.23.0

3 4

[PATCH lkp-tests] depends: add sysbench-mysql-dev
by Zhang Yu 04 Nov '20

04 Nov '20

[why] Dependency for code compilation. Signed-off-by: Zhang Yu <2134782174(a)qq.com> --- distro/depends/sysbench-mysql-dev | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 distro/depends/sysbench-mysql-dev diff --git a/distro/depends/sysbench-mysql-dev b/distro/depends/sysbench-mysql-dev new file mode 100644 index 00000000..ca5b03d8 --- /dev/null +++ b/distro/depends/sysbench-mysql-dev @@ -0,0 +1,3 @@ +pkg-config +libmysqlclient-dev +mysql-server -- 2.23.0

1 0

[PATCH compass-ci] lkp-initrd: send the two vars necessary for rsync to rsync script
by Yu Chuan 04 Nov '20

04 Nov '20

[Why] When we rsync result lkp.cgz, we need the follow two vars: - lkp_initrd_user - ARCH Signed-off-by: Yu Chuan <13186087857(a)163.com> --- container/lkp-initrd/run | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/container/lkp-initrd/run b/container/lkp-initrd/run index a0c246f6ea31..34fe330727b0 100755 --- a/container/lkp-initrd/run +++ b/container/lkp-initrd/run @@ -27,5 +27,5 @@ echo "result: /srv/initrd/lkp/${lkp_initrd_user:-latest}/lkp-${ARCH}.cgz" # rsync lkp-${ARCH}.cgz if needed if [ -x /usr/local/bin/rsync-lkp-cgz ]; then - /usr/local/bin/rsync-lkp-cgz + /usr/local/bin/rsync-lkp-cgz "${lkp_initrd_user:-latest}" "${ARCH}" fi -- 2.23.0

1 0

[PATCH lkp-tests] pkg: add PKGBUILD of sysbench-mysql
by Zhang Yu 04 Nov '20

04 Nov '20

[why] The sysbench 1.0.19 version is required in test. Signed-off-by: Zhang Yu <2134782174(a)qq.com> --- pkg/sysbench-mysql | 1 - pkg/sysbench-mysql/PKGBUILD | 23 +++++++++++++++++++++++ 2 files changed, 23 insertions(+), 1 deletion(-) delete mode 120000 pkg/sysbench-mysql create mode 100644 pkg/sysbench-mysql/PKGBUILD diff --git a/pkg/sysbench-mysql b/pkg/sysbench-mysql deleted file mode 120000 index a6f8719d..00000000 --- a/pkg/sysbench-mysql +++ /dev/null @@ -1 +0,0 @@ -sysbench \ No newline at end of file diff --git a/pkg/sysbench-mysql/PKGBUILD b/pkg/sysbench-mysql/PKGBUILD new file mode 100644 index 00000000..d9f342a5 --- /dev/null +++ b/pkg/sysbench-mysql/PKGBUILD @@ -0,0 +1,23 @@ +pkgname=sysbench +pkgver=1.0 +pkgrel=19 +pkgdesc="Benchmark tool for evaluating OS parameters that are important for a system running a database under intensive load." +url="https://github.com/akopytov/sysbench.git" +arch=('x86_64' 'i386' 'aarch64') +license=('GPL') +source=("https://github.com/akopytov/sysbench/archive/$pkgver.$pkgrel.tar.gz") +md5sums=('2912bfe7238cac7351459019a84e2557') + +build() { + cd "$pkgname-$pkgver.$pkgrel" + ./autogen.sh + ./configure --with-mysql-includes=/usr/local/mysql/include/ --with-mysql-libs=/usr/local/mysql/lib/ --disable-dependency-tracking + make -j4 +} + +package() { + cd "$pkgname-$pkgver.$pkgrel" + make DESTDIR=$pkgdir install + [[ $os == openeuler ]] && mkdir -p $pkgdir/usr/lib64 + cp -rpf /usr/local/mysql/lib/* $pkgdir/usr/lib64/ +} -- 2.23.0

1 0

[PATCH compass-ci] sbin: fix git-bisect script get incomplete error_id info
by Cao Xueliang 04 Nov '20

04 Nov '20

[why] Before: use error_id="build-pkg.report-uri=~https://api.github.com/_private/browser/errors~" get error_id="build-pkg.report-uri" After: use error_id="build-pkg.report-uri=~https://api.github.com/_private/browser/errors~" get error_id="build-pkg.report-uri=~https://api.github.com/_private/browser/errors~" Signed-off-by: Cao Xueliang <caoxl78320(a)163.com> --- sbin/git-bisect | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/sbin/git-bisect b/sbin/git-bisect index 4744a02..86f79d4 100755 --- a/sbin/git-bisect +++ b/sbin/git-bisect @@ -12,10 +12,9 @@ require_relative '../lib/mail_bisect_result' def parse_argv items = {} ARGV.each do |item| - key, value = item.split('=') + key, value = item.split('=', 2) if key && value - value_list = value.split(',') - items[key] = value_list.length > 1 ? value_list : value + items[key] = value end end items -- 2.23.0

2 1

[PATCH lkp-tests] fio: fix error when test with write mode
by Wei Jihui 04 Nov '20

04 Nov '20

[Why] when test fio with write mode, an error is reported: fio: /dev/sda appears mounted, and 'allow_mounted_write' isn't set. [How] add allow_mounted_write when write mode Signed-off-by: Wei Jihui <weijihuiall(a)163.com> --- setup/fio-setup-basic | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/setup/fio-setup-basic b/setup/fio-setup-basic index 58ebeb80..f90963aa 100755 --- a/setup/fio-setup-basic +++ b/setup/fio-setup-basic @@ -116,6 +116,12 @@ $create_task ioscheduler=$ioscheduler" fi +if [[ "$rw" =~ "write" ]]; then + create_task="\ +$create_task +allow_mounted_write=1" +fi + if parse_bool -q "$time_based"; then create_task=" $create_task -- 2.23.0

2 1