- Compass-ci - mailweb.openeuler.org

[PATCH v3 compass-ci 5/5] feat: 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..8f35f22 --- /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

2 2

[PATCH v4 compass-ci 5/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..8f35f22 --- /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 lkp-tests] tests/test-tools: upload the results and logs from mugen
by Li Ping 29 Oct '20

29 Oct '20

Signed-off-by: Li Ping <15396232681(a)163.com> --- tests/test-tools | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/tests/test-tools b/tests/test-tools index cee882aa..dba3d9f8 100755 --- a/tests/test-tools +++ b/tests/test-tools @@ -6,6 +6,9 @@ cd $BENCHMARK_ROOT/test-tools/mugen || exit : "${testsuite:=smoke-testing}" : "${case:=oe_test_dd_001}" +f_log=$BENCHMARK_ROOT/test-tools/mugen/logs +f_result=$BENCHMARK_ROOT/test-tools/mugen/results + set_env() { bash runoet.sh -c @@ -35,3 +38,7 @@ run() } run + +upload_files -t results $f_log +upload_files -t results $f_result + -- 2.23.0

1 0

[PATCH v2 compass-ci] container/netdata: use json-file save logs
by Wu Zhende 29 Oct '20

29 Oct '20

[Why] netdata is a performance check tool and does not need to send logs to fluentd for analysis. Signed-off-by: Wu Zhende <wuzhende666(a)163.com> --- container/netdata/start | 2 ++ 1 file changed, 2 insertions(+) diff --git a/container/netdata/start b/container/netdata/start index a3009a9..58fb675 100755 --- a/container/netdata/start +++ b/container/netdata/start @@ -17,6 +17,8 @@ cmd=( -v /var/run/docker.sock:/var/run/docker.sock:ro -v /srv/cache/netdata_cache:/var/cache/netdata -v /srv/cache/netdata_lib:/var/lib/netdata + --log-driver json-file + --log-opt max-size=1g --cap-add SYS_PTRACE --security-opt apparmor=unconfined netdata/netdatalkp -- 2.23.0

1 0

[PATCH v3 compass-ci 4/5] feat: container/ntp-server: star
by Wang Chenglong 29 Oct '20

29 Oct '20

Signed-off-by: Wang Chenglong <18509160991(a)163.com> --- container/ntp-server/start | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100755 container/ntp-server/start diff --git a/container/ntp-server/start b/container/ntp-server/start new file mode 100755 index 0000000..6e7479e --- /dev/null +++ b/container/ntp-server/start @@ -0,0 +1,16 @@ +#!/bin/bash +# SPDX-License-Identifier: MulanPSL-2.0+ +# Copyright (c) 2020 Huawei Technologies Co., Ltd. All rights reserved. + +. ../defconfig.sh + +docker_rm ntp_server +cmd=( + docker run + -id + --name=ntp_server + -p 123:123/udp + ntp_server:latest +) + +"${cmd[@]}" -- 2.23.0

1 0

[PATCH v3 compass-ci 3/5] feat: 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 | 57 +++++++++++++++++++++++++++++++++++ 1 file changed, 57 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..3152fd3 --- /dev/null +++ b/container/ntp-server/ntp.conf @@ -0,0 +1,57 @@ +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 1.centos.pool.ntp.org +server 2.centos.pool.ntp.org +server 3.centos.pool.ntp.org + +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 v3 compass-ci 2/5] feat: 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 | 16 ++++++++++++++++ 1 file changed, 16 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..6d95bf2 --- /dev/null +++ b/container/ntp-server/Dockerfile @@ -0,0 +1,16 @@ +# SPDX-License-Identifier: MulanPSL-2.0+ +# Copyright (c) 2020 Huawei Technologies Co., Ltd. All rights reserved. + +FROM centos:7 + +RUN yum repolist +RUN yum -y install ntp \ + && yum clean all + +COPY ntp.conf /etc/ntp.conf +COPY start-server.sh / + +EXPOSE 123 + +ENTRYPOINT ["/start-server.sh"] +CMD ["sh"] -- 2.23.0

1 0

[PATCH compass-ci] job.cr: add key "kernel_version" for initramfs
by Xu Xijian 29 Oct '20

29 Oct '20

When run job with initramfs, there is a default combination of kernel, modules and headers, and I add a key "kernel_version" to make it optional. Signed-off-by: Xu Xijian <xuxijian(a)huawei.com> --- src/lib/job.cr | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/src/lib/job.cr b/src/lib/job.cr index 8f5dd36..c8b9dc6 100644 --- a/src/lib/job.cr +++ b/src/lib/job.cr @@ -85,6 +85,7 @@ class Job kernel_append_root kernel_params docker_image + kernel_version ) macro method_missing(call) @@ -281,8 +282,9 @@ class Job end private def set_kernel_uri + vmlinuz_sub_path = "#{kernel_version}" == "default" ? "vmlinuz" : "boot/vmlinuz-#{kernel_version}" self["kernel_uri"] = "kernel #{OS_HTTP_PREFIX}" + - "#{JobHelper.service_path("#{SRV_OS}/#{os_dir}/vmlinuz")}" + "#{JobHelper.service_path("#{SRV_OS}/#{os_dir}/#{vmlinuz_sub_path}")}" end private def kernel_common_params @@ -303,10 +305,16 @@ class Job temp_initrds = [] of String osimage_dir = "#{SRV_INITRD}/osimage/#{os_dir}" + boot_dir = "#{SRV_OS}/#{os_dir}/boot" + self["kernel_version"] ||= "default" temp_initrds << "#{INITRD_HTTP_PREFIX}" + "#{JobHelper.service_path("#{osimage_dir}/current")}" temp_initrds << "#{INITRD_HTTP_PREFIX}" + "#{JobHelper.service_path("#{osimage_dir}/run-ipconfig.cgz")}" + temp_initrds << "#{OS_HTTP_PREFIX}" + + "#{JobHelper.service_path("#{boot_dir}/modules-#{kernel_version}.cgz")}" + temp_initrds << "#{OS_HTTP_PREFIX}" + + "#{JobHelper.service_path("#{boot_dir}/headers-#{kernel_version}.cgz")}" temp_initrds.concat(initrd_deps.split(/ /)) unless initrd_deps.empty? temp_initrds.concat(initrd_pkg.split(/ /)) unless initrd_pkg.empty? -- 2.23.0

2 1

[PATCH v2 compass-ci] container/logging-es: optimize bulk write performance
by Wu Zhende 29 Oct '20

29 Oct '20

[Why] fluentd uses "bulk" to continuously write data to es. The es write capability needs to be optimized to adapt to high-concurrency scenarios. Signed-off-by: Wu Zhende <wuzhende666(a)163.com> --- container/logging-es/Dockerfile | 12 ++++++++---- container/logging-es/start | 12 ++++++++++++ 2 files changed, 20 insertions(+), 4 deletions(-) diff --git a/container/logging-es/Dockerfile b/container/logging-es/Dockerfile index 7f91f65..7199cba 100644 --- a/container/logging-es/Dockerfile +++ b/container/logging-es/Dockerfile @@ -7,10 +7,14 @@ FROM gagara/elasticsearch-oss-arm64:7.6.2 MAINTAINER Wu Zhende <wuzhende666(a)163.com> -RUN sed -i 's:#network.host\: _site_:network.host\: 0.0.0.0:' /usr/share/elasticsearch/config/elasticsearch.yml; -RUN sed -i '$a path.data: /srv/es/logging-es' /usr/share/elasticsearch/config/elasticsearch.yml; -RUN sed -i '$a node.name: node-1' /usr/share/elasticsearch/config/elasticsearch.yml; -RUN sed -i '$a cluster.initial_master_nodes: ["node-1"]' /usr/share/elasticsearch/config/elasticsearch.yml; +RUN sed -i 's:#network.host\: _site_:network.host\: 0.0.0.0:' /usr/share/elasticsearch/config/elasticsearch.yml && \ + sed -i '$a path.data: /srv/es/logging-es' /usr/share/elasticsearch/config/elasticsearch.yml && \ + sed -i '$a node.name: node-1' /usr/share/elasticsearch/config/elasticsearch.yml && \ + sed -i '$a cluster.initial_master_nodes: ["node-1"]' /usr/share/elasticsearch/config/elasticsearch.yml && \ + sed -i '$a indices.memory.index_buffer_size: 30%' /usr/share/elasticsearch/config/elasticsearch.yml && \ + sed -i '$a thread_pool.write.queue_size: 2000' /usr/share/elasticsearch/config/elasticsearch.yml && \ + sed -i "s/-Xms1g/-Xms32g/g" /usr/share/elasticsearch/config/jvm.options && \ + sed -i "s/-Xmx1g/-Xmx32g/g" /usr/share/elasticsearch/config/jvm.options RUN mkdir /usr/share/elasticsearch/tmp && \ chown -R 1090:1090 /usr/share/elasticsearch diff --git a/container/logging-es/start b/container/logging-es/start index 9be7a5b..25ed36b 100755 --- a/container/logging-es/start +++ b/container/logging-es/start @@ -19,3 +19,15 @@ cmd=( ) "${cmd[@]}" + +echo "Please wait 60s for setting index" +sleep 60 + +curl -H "Content-Type: application/json" -XPUT "localhost:9202/_settings" -d ' +{ + "index": { + "refresh_interval": "120s", + "translog.durability": "async", + "translog.sync_interval": "120s", + "translog.flush_threshold_size": "1024mb"} +}' -- 2.23.0

2 1

[PATCH v4 lkp-tests 2/2] tests/iozone: add specified parameter for iozone test
by Lu Kaiyi 29 Oct '20

29 Oct '20

[why] need to test write, rewrite, read, reread, random write, random read for different block_size. [How] add judement for variable $block_size to execute iozone command with specificed parameter. Signed-off-by: Lu Kaiyi <2392863668(a)qq.com> --- tests/iozone | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/tests/iozone b/tests/iozone index 3095ce80..c3b758e9 100755 --- a/tests/iozone +++ b/tests/iozone @@ -1,4 +1,9 @@ #!/bin/sh +# - block_size +# - file_size +# - write_rewrite +# - read_reread +# - random_read_write ## IOzone is a filesystem benchmark tool. The benchmark generates ## and measures a variety of file operations. @@ -7,7 +12,17 @@ for mnt in $mount_points do - cmd="iozone -a -f $mnt/iozonetest" + cmd="iozone" + if [ -n "$block_size" ]; then + cmd+=" -r $block_size" + [ -n "$file_size" ] && cmd+=" -s $file_size" + [ -n "$write_rewrite" ] && cmd+=" -i $write_rewrite" + [ -n "$read_reread" ] && cmd+=" -i $read_reread" + [ -n "$random_read_write" ] && cmd+=" -i $random_read_write" + else + cmd+=" -a" + fi + cmd+=" -f $mnt/iozonetest" log_echo "$cmd &" $cmd > $TMP/iozone-$i & i=$((i+1)) -- 2.23.0

2 1

2025

2024

2023

2022

2021

2020

Compass-ci