- Compass-ci - mailweb.openeuler.org

[PATCH compass-ci] scheduler/find_job_boot.cr: rename ipxe_response to custom_ipxe
by Cao Xueliang 03 Mar '21

03 Mar '21

Signed-off-by: Cao Xueliang <caoxl78320(a)163.com> --- src/scheduler/find_job_boot.cr | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/scheduler/find_job_boot.cr b/src/scheduler/find_job_boot.cr index a876abc..ce1a2f8 100644 --- a/src/scheduler/find_job_boot.cr +++ b/src/scheduler/find_job_boot.cr @@ -174,7 +174,7 @@ class Sched end private def get_boot_ipxe(job : Job) - return job["ipxe_response"] if job["suite"] == "install-iso" && job.has_key?("ipxe_response") + return job["custom_ipxe"] if job["suite"] == "install-iso" && job.has_key?("custom_ipxe") response = "#!ipxe\n\n" -- 2.23.0

1 1

[PATCH v2 compass-ci] scheduler/find_job_boot.cr: rename ipxe_response to custom_ipxe
by Cao Xueliang 03 Mar '21

03 Mar '21

Signed-off-by: Cao Xueliang <caoxl78320(a)163.com> --- doc/job/os_mount.md | 2 +- src/scheduler/find_job_boot.cr | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/job/os_mount.md b/doc/job/os_mount.md index f4b28bb..cbc5997 100644 --- a/doc/job/os_mount.md +++ b/doc/job/os_mount.md @@ -112,7 +112,7 @@ Notes: kernel_append_root: use_root_partition=zhangsan_local_for_iperf_20210218 save_root_partition=zhangsan_local_for_iperf_20210219 ``` -2. scheduler return the ipxe_response to testbox +2. scheduler return the custom_ipxe to testbox ``` #!ipxe diff --git a/src/scheduler/find_job_boot.cr b/src/scheduler/find_job_boot.cr index a876abc..ce1a2f8 100644 --- a/src/scheduler/find_job_boot.cr +++ b/src/scheduler/find_job_boot.cr @@ -174,7 +174,7 @@ class Sched end private def get_boot_ipxe(job : Job) - return job["ipxe_response"] if job["suite"] == "install-iso" && job.has_key?("ipxe_response") + return job["custom_ipxe"] if job["suite"] == "install-iso" && job.has_key?("custom_ipxe") response = "#!ipxe\n\n" -- 2.23.0

1 0

[PATCH lkp-tests] setup: add nic_irp
by Wei Jihui 03 Mar '21

03 Mar '21

this script is for nic irqbalance bind to cpu Signed-off-by: Wei Jihui <weijihuiall(a)163.com> --- setup/nic_irp | 41 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) create mode 100755 setup/nic_irp diff --git a/setup/nic_irp b/setup/nic_irp new file mode 100755 index 00000000..55a804dc --- /dev/null +++ b/setup/nic_irp @@ -0,0 +1,41 @@ +#!/bin/sh +# - nics +# - nics_ip +# - core_ranges + +. "$LKP_SRC"/lib/common.sh + +if [ -z "$nics" ]; then + echo "no nics found" >&2 + exit 1 +fi + +if [ -z "$core_ranges" ]; then + echo "no core ranges found" >&2 + exit 1 +fi + +main() +{ + pkill -9 irqbalance + + index=0 + for core_range in $core_ranges; do + local nic=${nics[$index]} + local nic_ip=${nics_ip[$index]} + local bind_core_nums=$(cpu_list_num $core_range) + + [ -n "$nic_ip" ] && { + ip addr add "$nic_ip"/24 dev "$nic" + ip link set "$nic" up + } + + ethtool -L $nic combined $bind_core_nums + $LKP_SRC/bin/set_nic_irq_affinity $core_range $nic + + ethtool -l $nic + index=$((index+1)) + done +} + +main -- 2.23.0

1 0

[PATCH lkp-tests] jobs: delete sysbench-mysql.yaml
by Wei Jihui 03 Mar '21

03 Mar '21

this task use cluster:cs-s1-a102-c1 from lab-z9, so move this job to lab-z9/jobs. Signed-off-by: Wei Jihui <weijihuiall(a)163.com> --- jobs/sysbench-mysql.yaml | 22 ---------------------- 1 file changed, 22 deletions(-) delete mode 100644 jobs/sysbench-mysql.yaml diff --git a/jobs/sysbench-mysql.yaml b/jobs/sysbench-mysql.yaml deleted file mode 100644 index 83795a18..00000000 --- a/jobs/sysbench-mysql.yaml +++ /dev/null @@ -1,22 +0,0 @@ -suite: sysbench-mysql -category: benchmark - -cluster: cs-lkp-hsw-ep5 - -if role server: - mysql: - -if role client: - 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: 600 - rand_type: special - rand_spec_pct: 100 - oltp_read_only: off - report_interval: 1 - events: 2000000000 -- 2.23.0

1 0

[PATCH lkp-tests] pkg/mysql/my.cnf: disable mysql resolve dns
by Wei Jihui 03 Mar '21

03 Mar '21

[mysql server error] [Server] IP address '172.x.x.x.' could not be resolved: Name or service not known Signed-off-by: Wei Jihui <weijihuiall(a)163.com> --- pkg/mysql/my.cnf | 1 + 1 file changed, 1 insertion(+) diff --git a/pkg/mysql/my.cnf b/pkg/mysql/my.cnf index d95811dd..c657234d 100644 --- a/pkg/mysql/my.cnf +++ b/pkg/mysql/my.cnf @@ -16,6 +16,7 @@ default_authentication_plugin=mysql_native_password user=mysql memlock=on bind-address=0.0.0.0 +skip-name-resolve skip-grant-tables lc-messages=en_US -- 2.23.0

1 0

[PATCH v4 lkp-tests] daemon: add mysql
by Wei Jihui 03 Mar '21

03 Mar '21

add mysql for sysbench-mysql test Signed-off-by: Wei Jihui <weijihuiall(a)163.com> --- daemon/mysql | 91 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 91 insertions(+) create mode 100755 daemon/mysql diff --git a/daemon/mysql b/daemon/mysql new file mode 100755 index 00000000..35409eba --- /dev/null +++ b/daemon/mysql @@ -0,0 +1,91 @@ +#!/bin/sh +# - data_dev +# mysql_user +# mysql_host +# mysql_port +# mysql_db +# mysql_password +. $LKP_SRC/lib/common.sh + +: "${mysql_user:=root}" +: "${mysql_host:=$server}" +: "${mysql_port:=3306}" +: "${mysql_db:=sysbench_test}" +: "${mysql_password:=mysql_password}" + +prepare() +{ + systemctl stop firewalld >/dev/null 2>&1 + iptables -F >/dev/null 2>&1 + systemctl start tuned >/dev/null 2>&1 +} + +insmod_getcpu() +{ + if [ -d "/getcpu" ]; then + cd /getcpu && insmod getcpu-hi.ko + else + echo "this test will not use getcpu optimize to bind core." + fi +} + +create_basedir() +{ + mkdir -p /data + mkfs.xfs -f /dev/"$data_dev" + mount /dev/"$data_dev" /data + + mkdir -p /data/mysql/data /data/mysql/share /data/mysql/tmp /data/mysql/run /data/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 + + "$mysqld" --user=mysql --basedir=/data/mysql --datadir=/data/mysql/data/ --initialize --port="$mysql_port" + 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;" + sed -i '/^skip-grant-tables/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 +} + +start_mysql() +{ + numactl -C 0-92 -i 0-3 "$mysqld" --defaults-file=/etc/my.cnf --port="$mysql_port" & + sleep 20 +} + +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" + + prepare + insmod_getcpu + create_basedir + configure_mysql + create_database + start_mysql +} +main -- 2.23.0

1 0

[PATCH v2 compass-ci] src/lib/sched.cr: update tbox state when testbox request job
by Wei Jihui 03 Mar '21

03 Mar '21

tbox state is running when job interruption, this tbox will always rebooting if no new job, so update tbox state when it requests job every time. Signed-off-by: Wei Jihui <weijihuiall(a)163.com> --- src/lib/sched.cr | 1 + 1 file changed, 1 insertion(+) diff --git a/src/lib/sched.cr b/src/lib/sched.cr index bec90cd..51f493e 100644 --- a/src/lib/sched.cr +++ b/src/lib/sched.cr @@ -159,6 +159,7 @@ class Sched "time" => get_time, "deadline" => deadline } + @redis.update_wtmp(testbox.to_s, hash) @es.update_tbox(testbox.to_s, hash) end -- 2.23.0

1 0

[PATCH compass-ci] scheduler/find_job_boot.cr: update tbox state when testbox requesting
by Wei Jihui 03 Mar '21

03 Mar '21

tbox state is running when job interruption, this tbox will always rebooting if no new job, so update tbox state when it requests job every time. Signed-off-by: Wei Jihui <weijihuiall(a)163.com> --- src/lib/sched.cr | 1 + 1 file changed, 1 insertion(+) diff --git a/src/lib/sched.cr b/src/lib/sched.cr index bec90cd..51f493e 100644 --- a/src/lib/sched.cr +++ b/src/lib/sched.cr @@ -159,6 +159,7 @@ class Sched "time" => get_time, "deadline" => deadline } + @redis.update_wtmp(testbox.to_s, hash) @es.update_tbox(testbox.to_s, hash) end -- 2.23.0

1 0

[PATCH compass-ci] qemu/kvm.sh: use "command -v" to check before assigning value to qemu instead of assigning directly
by Lin Jiaxin 03 Mar '21

03 Mar '21

The original logic is to first assign a value to qemu and then check. This will cause qemu to be equal to a wrong value rather than "". [log] [INFO] 2021-03-03 15:05:09 qemu.sh: less /srv/cci/serial/logs/vm-2p16g.taishan200-2280-2s64p-256g--a10-0 /c/compass-ci/providers/qemu/kvm.sh: line 209: qemu-kvm: command not found Signed-off-by: Lin Jiaxin <ljx.joe(a)qq.com> --- providers/qemu/kvm.sh | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/providers/qemu/kvm.sh b/providers/qemu/kvm.sh index fdaf254..dcab81a 100755 --- a/providers/qemu/kvm.sh +++ b/providers/qemu/kvm.sh @@ -71,7 +71,9 @@ check_kernel() check_qemu() { # debian has both qemu-system-x86_64 and qemu-system-riscv64 command - [[ $kernel =~ 'riscv64' ]] && qemu=qemu-system-riscv64 + [[ $kernel =~ 'riscv64' ]] && { + command -v qemu-system-riscv64 > /dev/null && qemu=qemu-system-riscv64 + } } check_initrds() @@ -139,9 +141,12 @@ set_qemu() qemu-kvm ) - for qemu in "${qemus[@]}" + for qemu_candidate in "${qemus[@]}" do - command -v "$qemu" > /dev/null && break + command -v "$qemu_candidate" > /dev/null && { + qemu="$qemu_candidate" + break + } done check_qemu -- 2.23.0

1 0

[PATCH compass-ci] doc: correct the field which allow user add custom kernel params
by Yu Chuan 03 Mar '21

03 Mar '21

[Why] After search in code, 'kernel_custom_params' is the field which allow user add custom kernel param in job.yaml, not 'kernel_append_root'. [Reference] - src/scheduler/kernel_params.cr ``` private def kernel_custom_params return @hash["kernel_custom_params"] if @hash["kernel_custom_params"]? end private def set_kernel_params kernel_params_values = "#{kernel_common_params()} #{kernel_custom_params()} #{self.kernel_append_root} #{kernel_console()}" kernel_params_values = kernel_params_values.split(" ").map(&.strip()).reject!(&.empty?) @hash["kernel_params"] = JSON.parse(kernel_params_values.to_json) @hash["ipxe_kernel_params"] = JSON.parse(initrds_basename.to_json) end ``` Signed-off-by: Yu Chuan <13186087857(a)163.com> --- doc/job/os_mount.md | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/doc/job/os_mount.md b/doc/job/os_mount.md index f4b28bb4b4c7..0e57d9ea36db 100644 --- a/doc/job/os_mount.md +++ b/doc/job/os_mount.md @@ -56,7 +56,7 @@ The brief flow is as follows: ## persistent rootfs data -When you need to persist the rootfs data of a job, and use it in the subsequent job(s), two fields in `kernel_append_root` will help you: `save_root_partition`, `use_root_partition`. +When you need to persist the rootfs data of a job, and use it in the subsequent job(s), two fields in `kernel_custom_params` will help you: `save_root_partition`, `use_root_partition`. The brief flow is as follows: @@ -87,12 +87,12 @@ Demo usage: rootfs data of job-20210218.yaml so that it can be used by the subsequent jobs. Then you need add the follow field in your job-20210218.yaml: - kernel_append_root: save_root_partition=zhangsan_local_for_iperf_20210218 + kernel_custom_params: save_root_partition=zhangsan_local_for_iperf_20210218 - in 20210219, you submit a job-20210219.yaml, and you want to use the rootfs data of job-20210218.yaml. Then you need add the follow field in your job-20210219.yaml: - kernel_append_root: use_root_partition=zhangsan_local_for_iperf_20210218 + kernel_custom_params: use_root_partition=zhangsan_local_for_iperf_20210218 ``` Notes: @@ -109,7 +109,7 @@ Notes: os_arch: aarch64 os_version: 20.03 os_mount: local - kernel_append_root: use_root_partition=zhangsan_local_for_iperf_20210218 save_root_partition=zhangsan_local_for_iperf_20210219 + kernel_custom_params: use_root_partition=zhangsan_local_for_iperf_20210218 save_root_partition=zhangsan_local_for_iperf_20210219 ``` 2. scheduler return the ipxe_response to testbox @@ -118,7 +118,7 @@ Notes: #!ipxe dhcp initrd http://${http_server_ip}:${http_server_port}/os/openeuler/aarch64/20.03-iso-snapshots/${timestamp}/initrd.lkp - kernel http://${http_server_ip}:${http_server_port}/os/openeuler/aarch64/20.03-iso-snapshots/${timestamp}/boot/vmlinuz root=/dev/mapper/os-openeuler_aarch64_20.03 rootfs_src=${nfs_server_ip}:os/openeuler/aarch64/20.03-iso-snapshots/${timestamp} initrd=initrd.lkp ${kernel_append_root} + kernel http://${http_server_ip}:${http_server_port}/os/openeuler/aarch64/20.03-iso-snapshots/${timestamp}/boot/vmlinuz root=/dev/mapper/os-openeuler_aarch64_20.03 rootfs_src=${nfs_server_ip}:os/openeuler/aarch64/20.03-iso-snapshots/${timestamp} initrd=initrd.lkp ${kernel_custom_params} boot ``` -- 2.23.0

1 0