- Compass-ci - mailweb.openeuler.org

[PATCH compass-ci] extract-stats: add Fiber.yield after spawn operation
by Cao Xueliang 12 Apr '21

12 Apr '21

Signed-off-by: Cao Xueliang <caoxl78320(a)163.com> --- src/extract-stats/extract_stats.cr | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/extract-stats/extract_stats.cr b/src/extract-stats/extract_stats.cr index c35d3ec..89cd89e 100644 --- a/src/extract-stats/extract_stats.cr +++ b/src/extract-stats/extract_stats.cr @@ -42,8 +42,7 @@ module ExtractStats task = tasks.delete_at(0) spawn { StatsWorker.new.handle(task.key, channel) } - - sleep 1 + Fiber.yield end end @@ -63,8 +62,7 @@ module ExtractStats while true key = channel.receive spawn { StatsWorker.new.handle(key, channel) } - - sleep 1 + Fiber.yield end end end -- 2.23.0

1 0

[PATCH lkp-tests] sshd: always exec sshd before start test
by Wei Jihui 12 Apr '21

12 Apr '21

submit -i ssh.yaml job.yaml before: run_test $LKP_SRC/tests/wrapper job start_daemon $LKP_SRC/daemon/sshd run_test $LKP_SRC/tests/wrapper sl now: run_setup $LKP_SRC/setup/sshd run_test $LKP_SRC/tests/wrapper job run_test $LKP_SRC/tests/wrapper sleep Signed-off-by: Wei Jihui <weijihuiall(a)163.com> --- {daemon => setup}/sshd | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename {daemon => setup}/sshd (100%) diff --git a/daemon/sshd b/setup/sshd similarity index 100% rename from daemon/sshd rename to setup/sshd -- 2.23.0

1 0

[PATCH compass-ci] sched: we can search the job in es before return job id in submit job
by Cao Xueliang 09 Apr '21

09 Apr '21

use refresh=wait_for to make sure the job can be searched before consume the job. Signed-off-by: Cao Xueliang <caoxl78320(a)163.com> --- src/scheduler/elasticsearch_client.cr | 2 ++ src/scheduler/find_job_boot.cr | 1 + 2 files changed, 3 insertions(+) diff --git a/src/scheduler/elasticsearch_client.cr b/src/scheduler/elasticsearch_client.cr index f32256b..58bed08 100644 --- a/src/scheduler/elasticsearch_client.cr +++ b/src/scheduler/elasticsearch_client.cr @@ -142,6 +142,7 @@ class Elasticsearch::Client return @client.create( { :index => "jobs", :type => "_doc", + :refresh => "wait_for", :id => job_id, :body => job_content, } @@ -152,6 +153,7 @@ class Elasticsearch::Client return @client.update( { :index => "jobs", :type => "_doc", + :refresh => "wait_for", :id => job_id, :body => {:doc => job_content}, } diff --git a/src/scheduler/find_job_boot.cr b/src/scheduler/find_job_boot.cr index 4f49394..41fa89f 100644 --- a/src/scheduler/find_job_boot.cr +++ b/src/scheduler/find_job_boot.cr @@ -76,6 +76,7 @@ class Sched if job_id begin job = @es.get_job(job_id.to_s) + @log.warn("job_is_nil, job id=#{job_id.to_s}") unless job rescue ex @log.warn("Invalid job (id=#{job_id}) in es. Info: #{ex}") @log.warn(ex.inspect_with_backtrace) -- 2.23.0

1 0

[PATCH v1 compass-ci 3/3] scheduler: add my start script for running myself scheduler
by Cao Xueliang 08 Apr '21

08 Apr '21

Signed-off-by: Cao Xueliang <caoxl78320(a)163.com> --- container/scheduler/my-start | 85 ++++++++++++++++++++++++++++++++++++ 1 file changed, 85 insertions(+) create mode 100755 container/scheduler/my-start diff --git a/container/scheduler/my-start b/container/scheduler/my-start new file mode 100755 index 0000000..8d800f9 --- /dev/null +++ b/container/scheduler/my-start @@ -0,0 +1,85 @@ +#!/usr/bin/env ruby +# SPDX-License-Identifier: MulanPSL-2.0+ +# Copyright (c) 2020 Huawei Technologies Co., Ltd. All rights reserved. +# frozen_string_literal: true + +require 'set' +require_relative '../defconfig.rb' + +names = Set.new %w[ + SCHED_HOST + SCHED_PORT + REDIS_HOST + REDIS_PORT + ES_HOST + ES_PORT + OS_HTTP_HOST + OS_HTTP_PORT + INITRD_HTTP_HOST + INITRD_HTTP_PORT + TASKQUEUE_PORT + TASKQUEUE_HOST + GIT_SERVER + MASTER_FLUENTD_HOST + MASTER_FLUENTD_PORT + SSHR_PORT + SSHR_PORT_BASE + SSHR_PORT_LEN + SRV_HTTP_CCI_HOST + SRV_HTTP_CCI_PORT + lab +] + +defaults = relevant_defaults(names) +defaults['SSHR_PORT'] ||= 5051 +defaults['SSHR_PORT_BASE'] ||= 21000 +defaults['SSHR_PORT_LEN'] ||= 2000 +defaults['SCHED_PORT'] ||= '3000' +defaults['SCHED_HOST'] ||= '172.17.0.1' +defaults['MASTER_FLUENTD_PORT'] ||= '24224' +defaults['SRV_HTTP_CCI_PORT'] ||= '11307' +env = docker_env(defaults) + +CCI_REPOS = ENV['CCI_REPOS'] || '/c' +DEFAULT_LKP = "#{CCI_REPOS}/lkp-tests" +DEFAULT_CCI = "#{CCI_REPOS}/compass-ci" +LAB = defaults['lab'] || 'z9' +SCHED_PORT = defaults['SCHED_PORT'] +SCHED_HOST = defaults['SCHED_HOST'] + +docker_rm "s001-alpine-#{SCHED_PORT}" + +bind_list = [] +[SCHED_HOST, '172.17.0.1'].uniq.each do |ip| + bind_list << '-p' + bind_list << "#{ip}:#{SCHED_PORT}:#{SCHED_PORT}" +end + +cmd = %W[ + docker run + --restart=always + --name s001-alpine-#{SCHED_PORT} + -d + -u 1090:1090 +] + bind_list + env + %W[ + -e CCI_REPOS=#{CCI_REPOS} + -e LKP_SRC=#{DEFAULT_LKP} + -e CCI_SRC=#{DEFAULT_CCI} + -v #{ENV['LKP_SRC']}:#{DEFAULT_LKP} + -v #{ENV['CCI_SRC']}:#{DEFAULT_CCI} + -v #{CCI_REPOS}/lab-#{LAB}:#{CCI_REPOS}/lab-#{LAB} + -v /srv/cci/scheduler/alpine:/srv/cci/scheduler + -v /etc/compass-ci:/etc/compass-ci:ro + -v /etc/localtime:/etc/localtime:ro + -v /srv/result:/srv/result + -v /srv/initrd:/srv/initrd:ro + -v /srv/os:/srv/os:ro + --log-opt mode=non-blocking + --log-opt max-buffer-size=4m + --log-opt tag=scheduler-#{SCHED_PORT} + sch-ruby-a:v0.00d-#{SCHED_PORT} +] + +cmd += ['sh', '-c', 'umask 002 && ./scheduler'] + +system(*cmd) -- 2.23.0

1 0

[PATCH v1 compass-ci 2/3] container: add scheduler-nginx for multiple scheduler nodes
by Cao Xueliang 08 Apr '21

08 Apr '21

use nginx as load balancing for multiple scheduler nodes. Signed-off-by: Cao Xueliang <caoxl78320(a)163.com> --- container/scheduler-nginx/Dockerfile | 8 +++++++ container/scheduler-nginx/build | 9 ++++++++ container/scheduler-nginx/nginx.conf | 29 +++++++++++++++++++++++++ container/scheduler-nginx/start | 32 ++++++++++++++++++++++++++++ 4 files changed, 78 insertions(+) create mode 100644 container/scheduler-nginx/Dockerfile create mode 100755 container/scheduler-nginx/build create mode 100644 container/scheduler-nginx/nginx.conf create mode 100755 container/scheduler-nginx/start diff --git a/container/scheduler-nginx/Dockerfile b/container/scheduler-nginx/Dockerfile new file mode 100644 index 0000000..2cc430b --- /dev/null +++ b/container/scheduler-nginx/Dockerfile @@ -0,0 +1,8 @@ +# SPDX-License-Identifier: MulanPSL-2.0+ +# Copyright (c) 2020 Huawei Technologies Co., Ltd. All rights reserved. + +FROM nginx:alpine + +MAINTAINER Cao Xueliang <caoxl78320(a)163.com> + +COPY nginx.conf /etc/nginx/ diff --git a/container/scheduler-nginx/build b/container/scheduler-nginx/build new file mode 100755 index 0000000..4b491d9 --- /dev/null +++ b/container/scheduler-nginx/build @@ -0,0 +1,9 @@ +#!/bin/sh +# SPDX-License-Identifier: MulanPSL-2.0+ +# Copyright (c) 2020 Huawei Technologies Co., Ltd. All rights reserved. + +. ../defconfig.sh + +docker_skip_rebuild "scheduler-nginx" + +docker build -t scheduler-nginx . diff --git a/container/scheduler-nginx/nginx.conf b/container/scheduler-nginx/nginx.conf new file mode 100644 index 0000000..c8c3783 --- /dev/null +++ b/container/scheduler-nginx/nginx.conf @@ -0,0 +1,29 @@ +# This is a default site configuration which will simply return 404, preventing +# chance access to any other virtualhost. +events { + worker_connections 65535; +} + +http{ + upstream sched { + server 172.17.0.1:3001; + server 172.17.0.1:3002; + server 172.17.0.1:3003; + } + + + server { + listen 3000 default_server; + listen [::]:3000 default_server; + + location / { + proxy_pass http://sched; + proxy_read_timeout 1814400; + } + + location = /404.html { + internal; + } + } +} + diff --git a/container/scheduler-nginx/start b/container/scheduler-nginx/start new file mode 100755 index 0000000..dc2dfbc --- /dev/null +++ b/container/scheduler-nginx/start @@ -0,0 +1,32 @@ +#!/usr/bin/env ruby +# SPDX-License-Identifier: MulanPSL-2.0+ +# Copyright (c) 2020 Huawei Technologies Co., Ltd. All rights reserved. +# frozen_string_literal: true + +require 'set' +require_relative '../defconfig.rb' + +names = Set.new %w[ + SCHED_PORT +] + +defaults = relevant_defaults(names) +SCHED_PORT = defaults['SCHED_PORT'] +env = docker_env(defaults) + +docker_rm 'scheduler-nginx' + +cmd = %w[ + docker run + --name scheduler-nginx + --restart=always + -d +] + env + %W[ + -p #{SCHED_PORT}:#{SCHED_PORT} + -v /etc/localtime:/etc/localtime:ro + --log-opt mode=non-blocking + --log-opt max-buffer-size=4m + scheduler-nginx +] + +system(*cmd) -- 2.23.0

1 0

[PATCH v1 compass-ci 1/3] container: deploy three scheduler as the nginx upstream
by Cao Xueliang 08 Apr '21

08 Apr '21

use port 3001, 3002, 3003 as the scheduler port. Signed-off-by: Cao Xueliang <caoxl78320(a)163.com> --- container/scheduler/start | 41 +++++++++++++++++++++++---------------- sparrow/3-code/dev-env | 7 +++++++ 2 files changed, 31 insertions(+), 17 deletions(-) diff --git a/container/scheduler/start b/container/scheduler/start index 8d800f9..b13b396 100755 --- a/container/scheduler/start +++ b/container/scheduler/start @@ -7,8 +7,8 @@ require 'set' require_relative '../defconfig.rb' names = Set.new %w[ - SCHED_HOST SCHED_PORT + SCHED_NODES REDIS_HOST REDIS_PORT ES_HOST @@ -35,36 +35,42 @@ defaults['SSHR_PORT'] ||= 5051 defaults['SSHR_PORT_BASE'] ||= 21000 defaults['SSHR_PORT_LEN'] ||= 2000 defaults['SCHED_PORT'] ||= '3000' -defaults['SCHED_HOST'] ||= '172.17.0.1' defaults['MASTER_FLUENTD_PORT'] ||= '24224' defaults['SRV_HTTP_CCI_PORT'] ||= '11307' +sched_nodes = defaults.delete('SCHED_NODES') +SCHED_PORT = defaults.delete('SCHED_PORT') + +sched_nodes.each do |node| + docker_rm "s001-alpine-#{node['port']}" +end env = docker_env(defaults) CCI_REPOS = ENV['CCI_REPOS'] || '/c' DEFAULT_LKP = "#{CCI_REPOS}/lkp-tests" DEFAULT_CCI = "#{CCI_REPOS}/compass-ci" LAB = defaults['lab'] || 'z9' -SCHED_PORT = defaults['SCHED_PORT'] -SCHED_HOST = defaults['SCHED_HOST'] -docker_rm "s001-alpine-#{SCHED_PORT}" +sched_nodes.each do |node| + node_host = node['host'] + node_port = node['port'] -bind_list = [] -[SCHED_HOST, '172.17.0.1'].uniq.each do |ip| - bind_list << '-p' - bind_list << "#{ip}:#{SCHED_PORT}:#{SCHED_PORT}" -end + bind_list = [] + [node_host, '172.17.0.1'].uniq.each do |ip| + bind_list << '-p' + bind_list << "#{ip}:#{node_port}:#{node_port}" + end -cmd = %W[ + cmd = %W[ docker run - --restart=always - --name s001-alpine-#{SCHED_PORT} + --name s001-alpine-#{node_port} -d -u 1090:1090 -] + bind_list + env + %W[ + ] + bind_list + env + %W[ -e CCI_REPOS=#{CCI_REPOS} -e LKP_SRC=#{DEFAULT_LKP} -e CCI_SRC=#{DEFAULT_CCI} + -e SCHED_PORT=#{node_port} + -v /srv/tmp/public:/c/cci/scheduler/public -v #{ENV['LKP_SRC']}:#{DEFAULT_LKP} -v #{ENV['CCI_SRC']}:#{DEFAULT_CCI} -v #{CCI_REPOS}/lab-#{LAB}:#{CCI_REPOS}/lab-#{LAB} @@ -78,8 +84,9 @@ cmd = %W[ --log-opt max-buffer-size=4m --log-opt tag=scheduler-#{SCHED_PORT} sch-ruby-a:v0.00d-#{SCHED_PORT} -] + ] -cmd += ['sh', '-c', 'umask 002 && ./scheduler'] + cmd += ['sh', '-c', 'umask 002 && ./scheduler'] -system(*cmd) + system(*cmd) +end diff --git a/sparrow/3-code/dev-env b/sparrow/3-code/dev-env index 7327083..fd529e7 100755 --- a/sparrow/3-code/dev-env +++ b/sparrow/3-code/dev-env @@ -77,6 +77,13 @@ ES_HOST: $ES_HOST ES_PORT: $ES_PORT SCHED_HOST: $sched_host SCHED_PORT: $sched_port +SCHED_NODES: + - host: $sched_host + port: 3001 + - host: $sched_host + port: 3002 + - host: $sched_host + port: 3003 LKP_SERVER: $server_ip GIT_SERVER: $git_server OS_HTTP_HOST: $OS_HTTP_HOST -- 2.23.0

1 0

[PATCH compass-ci] scheduler: add my start script for running myself scheduler
by Cao Xueliang 08 Apr '21

08 Apr '21

Signed-off-by: Cao Xueliang <caoxl78320(a)163.com> --- container/scheduler/my-start | 85 ++++++++++++++++++++++++++++++++++++ 1 file changed, 85 insertions(+) create mode 100755 container/scheduler/my-start diff --git a/container/scheduler/my-start b/container/scheduler/my-start new file mode 100755 index 0000000..8d800f9 --- /dev/null +++ b/container/scheduler/my-start @@ -0,0 +1,85 @@ +#!/usr/bin/env ruby +# SPDX-License-Identifier: MulanPSL-2.0+ +# Copyright (c) 2020 Huawei Technologies Co., Ltd. All rights reserved. +# frozen_string_literal: true + +require 'set' +require_relative '../defconfig.rb' + +names = Set.new %w[ + SCHED_HOST + SCHED_PORT + REDIS_HOST + REDIS_PORT + ES_HOST + ES_PORT + OS_HTTP_HOST + OS_HTTP_PORT + INITRD_HTTP_HOST + INITRD_HTTP_PORT + TASKQUEUE_PORT + TASKQUEUE_HOST + GIT_SERVER + MASTER_FLUENTD_HOST + MASTER_FLUENTD_PORT + SSHR_PORT + SSHR_PORT_BASE + SSHR_PORT_LEN + SRV_HTTP_CCI_HOST + SRV_HTTP_CCI_PORT + lab +] + +defaults = relevant_defaults(names) +defaults['SSHR_PORT'] ||= 5051 +defaults['SSHR_PORT_BASE'] ||= 21000 +defaults['SSHR_PORT_LEN'] ||= 2000 +defaults['SCHED_PORT'] ||= '3000' +defaults['SCHED_HOST'] ||= '172.17.0.1' +defaults['MASTER_FLUENTD_PORT'] ||= '24224' +defaults['SRV_HTTP_CCI_PORT'] ||= '11307' +env = docker_env(defaults) + +CCI_REPOS = ENV['CCI_REPOS'] || '/c' +DEFAULT_LKP = "#{CCI_REPOS}/lkp-tests" +DEFAULT_CCI = "#{CCI_REPOS}/compass-ci" +LAB = defaults['lab'] || 'z9' +SCHED_PORT = defaults['SCHED_PORT'] +SCHED_HOST = defaults['SCHED_HOST'] + +docker_rm "s001-alpine-#{SCHED_PORT}" + +bind_list = [] +[SCHED_HOST, '172.17.0.1'].uniq.each do |ip| + bind_list << '-p' + bind_list << "#{ip}:#{SCHED_PORT}:#{SCHED_PORT}" +end + +cmd = %W[ + docker run + --restart=always + --name s001-alpine-#{SCHED_PORT} + -d + -u 1090:1090 +] + bind_list + env + %W[ + -e CCI_REPOS=#{CCI_REPOS} + -e LKP_SRC=#{DEFAULT_LKP} + -e CCI_SRC=#{DEFAULT_CCI} + -v #{ENV['LKP_SRC']}:#{DEFAULT_LKP} + -v #{ENV['CCI_SRC']}:#{DEFAULT_CCI} + -v #{CCI_REPOS}/lab-#{LAB}:#{CCI_REPOS}/lab-#{LAB} + -v /srv/cci/scheduler/alpine:/srv/cci/scheduler + -v /etc/compass-ci:/etc/compass-ci:ro + -v /etc/localtime:/etc/localtime:ro + -v /srv/result:/srv/result + -v /srv/initrd:/srv/initrd:ro + -v /srv/os:/srv/os:ro + --log-opt mode=non-blocking + --log-opt max-buffer-size=4m + --log-opt tag=scheduler-#{SCHED_PORT} + sch-ruby-a:v0.00d-#{SCHED_PORT} +] + +cmd += ['sh', '-c', 'umask 002 && ./scheduler'] + +system(*cmd) -- 2.23.0

1 0

[PATCH compass-ci 3/3] container: add scheduler-nginx for multiple scheduler nodes
by Cao Xueliang 08 Apr '21

08 Apr '21

use nginx as load balancing for multiple scheduler nodes. Signed-off-by: Cao Xueliang <caoxl78320(a)163.com> --- container/scheduler-nginx/Dockerfile | 8 +++++++ container/scheduler-nginx/build | 9 ++++++++ container/scheduler-nginx/nginx.conf | 29 +++++++++++++++++++++++++ container/scheduler-nginx/start | 32 ++++++++++++++++++++++++++++ 4 files changed, 78 insertions(+) create mode 100644 container/scheduler-nginx/Dockerfile create mode 100755 container/scheduler-nginx/build create mode 100644 container/scheduler-nginx/nginx.conf create mode 100755 container/scheduler-nginx/start diff --git a/container/scheduler-nginx/Dockerfile b/container/scheduler-nginx/Dockerfile new file mode 100644 index 0000000..2cc430b --- /dev/null +++ b/container/scheduler-nginx/Dockerfile @@ -0,0 +1,8 @@ +# SPDX-License-Identifier: MulanPSL-2.0+ +# Copyright (c) 2020 Huawei Technologies Co., Ltd. All rights reserved. + +FROM nginx:alpine + +MAINTAINER Cao Xueliang <caoxl78320(a)163.com> + +COPY nginx.conf /etc/nginx/ diff --git a/container/scheduler-nginx/build b/container/scheduler-nginx/build new file mode 100755 index 0000000..4b491d9 --- /dev/null +++ b/container/scheduler-nginx/build @@ -0,0 +1,9 @@ +#!/bin/sh +# SPDX-License-Identifier: MulanPSL-2.0+ +# Copyright (c) 2020 Huawei Technologies Co., Ltd. All rights reserved. + +. ../defconfig.sh + +docker_skip_rebuild "scheduler-nginx" + +docker build -t scheduler-nginx . diff --git a/container/scheduler-nginx/nginx.conf b/container/scheduler-nginx/nginx.conf new file mode 100644 index 0000000..c8c3783 --- /dev/null +++ b/container/scheduler-nginx/nginx.conf @@ -0,0 +1,29 @@ +# This is a default site configuration which will simply return 404, preventing +# chance access to any other virtualhost. +events { + worker_connections 65535; +} + +http{ + upstream sched { + server 172.17.0.1:3001; + server 172.17.0.1:3002; + server 172.17.0.1:3003; + } + + + server { + listen 3000 default_server; + listen [::]:3000 default_server; + + location / { + proxy_pass http://sched; + proxy_read_timeout 1814400; + } + + location = /404.html { + internal; + } + } +} + diff --git a/container/scheduler-nginx/start b/container/scheduler-nginx/start new file mode 100755 index 0000000..dc2dfbc --- /dev/null +++ b/container/scheduler-nginx/start @@ -0,0 +1,32 @@ +#!/usr/bin/env ruby +# SPDX-License-Identifier: MulanPSL-2.0+ +# Copyright (c) 2020 Huawei Technologies Co., Ltd. All rights reserved. +# frozen_string_literal: true + +require 'set' +require_relative '../defconfig.rb' + +names = Set.new %w[ + SCHED_PORT +] + +defaults = relevant_defaults(names) +SCHED_PORT = defaults['SCHED_PORT'] +env = docker_env(defaults) + +docker_rm 'scheduler-nginx' + +cmd = %w[ + docker run + --name scheduler-nginx + --restart=always + -d +] + env + %W[ + -p #{SCHED_PORT}:#{SCHED_PORT} + -v /etc/localtime:/etc/localtime:ro + --log-opt mode=non-blocking + --log-opt max-buffer-size=4m + scheduler-nginx +] + +system(*cmd) -- 2.23.0

1 0

[PATCH compass-ci 2/3] container: deploy three scheduler as the nginx upstream
by Cao Xueliang 08 Apr '21

08 Apr '21

use port 3001, 3002, 3003 as the scheduler port. Signed-off-by: Cao Xueliang <caoxl78320(a)163.com> --- container/scheduler/start | 43 +++++++++++++++++++++++---------------- sparrow/3-code/dev-env | 7 +++++++ 2 files changed, 32 insertions(+), 18 deletions(-) diff --git a/container/scheduler/start b/container/scheduler/start index 8d800f9..70e6dbe 100755 --- a/container/scheduler/start +++ b/container/scheduler/start @@ -7,8 +7,8 @@ require 'set' require_relative '../defconfig.rb' names = Set.new %w[ - SCHED_HOST SCHED_PORT + SCHED_NODES REDIS_HOST REDIS_PORT ES_HOST @@ -35,36 +35,42 @@ defaults['SSHR_PORT'] ||= 5051 defaults['SSHR_PORT_BASE'] ||= 21000 defaults['SSHR_PORT_LEN'] ||= 2000 defaults['SCHED_PORT'] ||= '3000' -defaults['SCHED_HOST'] ||= '172.17.0.1' defaults['MASTER_FLUENTD_PORT'] ||= '24224' defaults['SRV_HTTP_CCI_PORT'] ||= '11307' +sched_nodes = defaults.delete('SCHED_NODES') +SCHED_PORT = defaults.delete('SCHED_PORT') + +sched_nodes.each do |node| + docker_rm "s001-alpine-#{node['port']}" +end env = docker_env(defaults) CCI_REPOS = ENV['CCI_REPOS'] || '/c' DEFAULT_LKP = "#{CCI_REPOS}/lkp-tests" DEFAULT_CCI = "#{CCI_REPOS}/compass-ci" LAB = defaults['lab'] || 'z9' -SCHED_PORT = defaults['SCHED_PORT'] -SCHED_HOST = defaults['SCHED_HOST'] -docker_rm "s001-alpine-#{SCHED_PORT}" +sched_nodes.each do |node| + node_host = node['host'] + node_port = node['port'] -bind_list = [] -[SCHED_HOST, '172.17.0.1'].uniq.each do |ip| - bind_list << '-p' - bind_list << "#{ip}:#{SCHED_PORT}:#{SCHED_PORT}" -end + bind_list = [] + [node_host, '172.17.0.1'].uniq.each do |ip| + bind_list << '-p' + bind_list << "#{ip}:#{node_port}:#{node_port}" + end -cmd = %W[ + cmd = %W[ docker run - --restart=always - --name s001-alpine-#{SCHED_PORT} + --name s001-alpine-#{node_port} -d -u 1090:1090 -] + bind_list + env + %W[ + ] + bind_list + env + %W[ -e CCI_REPOS=#{CCI_REPOS} -e LKP_SRC=#{DEFAULT_LKP} -e CCI_SRC=#{DEFAULT_CCI} + -e SCHED_PORT=#{node_port} + -v /srv/tmp/public:/c/cci/scheduler/public -v #{ENV['LKP_SRC']}:#{DEFAULT_LKP} -v #{ENV['CCI_SRC']}:#{DEFAULT_CCI} -v #{CCI_REPOS}/lab-#{LAB}:#{CCI_REPOS}/lab-#{LAB} @@ -76,10 +82,11 @@ cmd = %W[ -v /srv/os:/srv/os:ro --log-opt mode=non-blocking --log-opt max-buffer-size=4m - --log-opt tag=scheduler-#{SCHED_PORT} + --log-opt tag=scheduler-#{node_port} sch-ruby-a:v0.00d-#{SCHED_PORT} -] + ] -cmd += ['sh', '-c', 'umask 002 && ./scheduler'] + cmd += ['sh', '-c', 'umask 002 && ./scheduler'] -system(*cmd) + system(*cmd) +end diff --git a/sparrow/3-code/dev-env b/sparrow/3-code/dev-env index 7327083..fd529e7 100755 --- a/sparrow/3-code/dev-env +++ b/sparrow/3-code/dev-env @@ -77,6 +77,13 @@ ES_HOST: $ES_HOST ES_PORT: $ES_PORT SCHED_HOST: $sched_host SCHED_PORT: $sched_port +SCHED_NODES: + - host: $sched_host + port: 3001 + - host: $sched_host + port: 3002 + - host: $sched_host + port: 3003 LKP_SERVER: $server_ip GIT_SERVER: $git_server OS_HTTP_HOST: $OS_HTTP_HOST -- 2.23.0

1 0

[PATCH compass-ci 1/3] sparrow: add /srv/tmp/public in permission
by Cao Xueliang 08 Apr '21

08 Apr '21

The "/srv/tmp" stores temporary files, scheduler mount public dir in the dir for now. Signed-off-by: Cao Xueliang <caoxl78320(a)163.com> --- sparrow/1-storage/permission | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sparrow/1-storage/permission b/sparrow/1-storage/permission index 3d9bdfa..db33a93 100755 --- a/sparrow/1-storage/permission +++ b/sparrow/1-storage/permission @@ -12,6 +12,7 @@ chmod_dir=( /srv/cci/Maildir /srv/rabbitmq /c/git-repos + /srv/tmp/public ) chmod 775 "${chmod_dir[@]}" @@ -25,6 +26,7 @@ chown_dir=( /srv/cci/serial/fluentd-pos /srv/cci/libvirt-xml /srv/rabbitmq + /srv/tmp/public ) chown lkp:lkp "${chown_dir[@]}" -- 2.23.0

1 0

[PATCH compass-ci 1/2] extract-stats/stats_worker.cr: add errid to the job
by Wu Zhende 08 Apr '21

08 Apr '21

Save errid in es as type "text". In this way, we can search for errid by keyword. Signed-off-by: Wu Zhende <wuzhende666(a)163.com> --- src/extract-stats/stats_worker.cr | 26 +++++++++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-) diff --git a/src/extract-stats/stats_worker.cr b/src/extract-stats/stats_worker.cr index 56dad9e..e371bf3 100644 --- a/src/extract-stats/stats_worker.cr +++ b/src/extract-stats/stats_worker.cr @@ -1,3 +1,4 @@ +# SPDX-License-Identifier: GPL-2.0-only # SPDX-License-Identifier: MulanPSL-2.0+ # Copyright (c) 2020 Huawei Technologies Co., Ltd. All rights reserved. require "../lib/etcd_client" @@ -8,6 +9,9 @@ require "./regression_client" require "./constants.cr" class StatsWorker + @@metric_failure = File.read("#{ENV["LKP_SRC"]}/etc/failure").strip.split("\n").as(Array(String)) + @@__is_failure_cache = Hash(String, Bool).new + def initialize @es = Elasticsearch::Client.new @etcd = EtcdClient.new @@ -45,6 +49,21 @@ class StatsWorker system "#{ENV["CCI_SRC"]}/sbin/mail-job #{job_id}" end + def is_failure(stats_field) + if @@__is_failure_cache.has_key?(stats_field) + @@__is_failure_cache[stats_field] + else + @@__is_failure_cache[stats_field] = __is_failure(stats_field) + end + end + + def __is_failure(stats_field) + return false if stats_field.index(".time.") + return false if stats_field.index(".timestamp.") + return true if @@metric_failure.any? { |pattern| stats_field =~ %r{^#{pattern}} } + false + end + def store_stats_es(result_root : String, job_id : String, queue_path : String) stats_path = "#{result_root}/stats.json" return unless File.exists?(stats_path) @@ -53,8 +72,13 @@ class StatsWorker JSON.parse(file) end + errid = Array(String).new + stats.as_h.keys.each do |k| + errid << k.to_s if is_failure(k.to_s) + end + update_content = Hash(String, Array(String) | Hash(String, JSON::Any)).new - update_content.merge!({"stats" => stats.as_h}) + update_content.merge!({"stats" => stats.as_h, "errid" => errid}) error_ids = get_error_ids_by_json(result_root) update_content.merge!({"error_ids" => error_ids}) unless error_ids.empty? -- 2.23.0

2 1

[PATCH compass-ci 2/2] sbin/es-jobs-mapping.sh: add errid
by Wu Zhende 08 Apr '21

08 Apr '21

The errid of the text type is added. Can use errid's keyword as a query. Signed-off-by: Wu Zhende <wuzhende666(a)163.com> --- sbin/es-jobs-mapping.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sbin/es-jobs-mapping.sh b/sbin/es-jobs-mapping.sh index 1c4aa43..28067e2 100755 --- a/sbin/es-jobs-mapping.sh +++ b/sbin/es-jobs-mapping.sh @@ -85,6 +85,9 @@ else "suite": { "type": "keyword" }, + "errid": { + "type": "text" + }, "category": { "type": "keyword" }, -- 2.23.0

1 0

[PATCH compass-ci] sbin/es-jobs-mapping.sh: add submit_date field
by Lu Weitao 08 Apr '21

08 Apr '21

Signed-off-by: Lu Weitao <luweitaobe(a)163.com> --- sbin/es-jobs-mapping.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/sbin/es-jobs-mapping.sh b/sbin/es-jobs-mapping.sh index 1c4aa43..fbfd4be 100755 --- a/sbin/es-jobs-mapping.sh +++ b/sbin/es-jobs-mapping.sh @@ -150,6 +150,10 @@ else "type": "date", "format": "yyyy-MM-dd HH:mm:ss" }, + "submit_date": { + "type": "date", + "format": "yyyy-MM-dd" + }, "user": { "type": "keyword" }, -- 2.23.0

1 0

[PATCH compass-ci] src/lib/job.cr: when os_mount=local, add suffix '-iso' to os_version automically
by Xu Xijian 08 Apr '21

08 Apr '21

The version change example like follows: 1. 20.03 => 20.03-iso 2. 20.03-iso => 20.03-iso, no need to add iso suffix, just keep Signed-off-by: Xu Xijian <hdxuxijian(a)163.com> --- src/lib/job.cr | 1 + 1 file changed, 1 insertion(+) diff --git a/src/lib/job.cr b/src/lib/job.cr index f62073d..d83bbe5 100644 --- a/src/lib/job.cr +++ b/src/lib/job.cr @@ -240,6 +240,7 @@ class Job end private def set_os_dir + self["os_version"] = "#{os_version}".chmop("-iso") + "-iso" if "#{self.os_mount}" == "local" self["os_dir"] = "#{os}/#{os_arch}/#{os_version}" end -- 2.23.0

1 0

[PATCH v2 compass-ci] update container expose port
by Cui Yili 08 Apr '21

08 Apr '21

Signed-off-by: Cui Yili <2268260388(a)qq.com> --- container/minio/start | 2 +- container/openresty-proxy-cache/start | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/container/minio/start b/container/minio/start index 1798cfa..2cbc9c8 100755 --- a/container/minio/start +++ b/container/minio/start @@ -7,7 +7,7 @@ docker_rm minio cmd=( docker run -d - -p 11321:9000 + -p 20014:9000 --name minio -v /etc/localtime:/etc/localtime:ro -v /srv/minio/:/srv/minio/ diff --git a/container/openresty-proxy-cache/start b/container/openresty-proxy-cache/start index a1f095d..59e2a28 100755 --- a/container/openresty-proxy-cache/start +++ b/container/openresty-proxy-cache/start @@ -11,8 +11,8 @@ cmd=( docker run -d --name openresty-proxy-cache --restart=always - -p 11333:80 - -p 11334:443 + -p 20015:80 + -p 20016:443 -v $PWD/nginx.conf:/usr/local/openresty/nginx/conf/nginx.conf -v /srv/initrd/tar:/srv/initrd/tar:ro -v /etc/localtime:/etc/localtime:ro -- 2.23.0

1 0

[PATCH compass-ci] lib/git_mirror.rb: take git fail count into calculation of priority
by Li Yuanchao 07 Apr '21

07 Apr '21

If a repo git clone or git fetch failed many times, it would be put to the end of the queue. Signed-off-by: Li Yuanchao <lyc163mail(a)163.com> --- lib/git_mirror.rb | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/lib/git_mirror.rb b/lib/git_mirror.rb index ad8847a..bcdb077 100644 --- a/lib/git_mirror.rb +++ b/lib/git_mirror.rb @@ -323,6 +323,11 @@ class MirrorMain @es_client.index(index: 'repo', type: '_doc', id: git_repo, body: body) end + def update_fail_count(git_repo, possible_new_refs) + @fork_stat[git_repo][:clone_fail_cnt] += 1 if possible_new_refs == -2 + @fork_stat[git_repo][:fetch_fail_cnt] += 1 if possible_new_refs == -1 + end + def update_stat_fetch(git_repo) @fork_stat[git_repo][:queued] = false offset_fetch = @fork_stat[git_repo][:offset_fetch] @@ -338,7 +343,6 @@ class MirrorMain end def update_stat_new_refs(git_repo) - @fork_stat[git_repo][:priority] += 1 offset_new_refs = @fork_stat[git_repo][:offset_new_refs] offset_new_refs = 0 if offset_new_refs >= 10 update_new_refs_info(git_repo, offset_new_refs) @@ -346,6 +350,7 @@ class MirrorMain def update_fork_stat(git_repo, possible_new_refs) update_stat_fetch(git_repo) + update_fail_count(git_repo, possible_new_refs) git_fail_log(git_repo, possible_new_refs) if possible_new_refs.negative? update_stat_new_refs(git_repo) if possible_new_refs.positive? && last_commit_new?(git_repo) new_repo_log(git_repo) if possible_new_refs == 2 @@ -416,7 +421,8 @@ class MirrorMain def get_fork_stat(git_repo) fork_stat = { queued: false, - priority: 0, + fetch_fail_cnt: 0, + clone_fail_cnt: 0, fetch_time: [], offset_fetch: 0, new_refs_time: [], @@ -581,18 +587,20 @@ class MirrorMain mirror_dir = "/srv/git/#{@git_info[git_repo]['belong']}/#{git_repo}" mirror_dir = "#{mirror_dir}.git" unless @git_info[git_repo]['is_submodule'] - return old_pri + Math.cbrt(STEP_SECONDS) unless File.directory?(mirror_dir) + step = (@fork_stat[git_repo][:clone_fail_cnt] + 1) * Math.cbrt(STEP_SECONDS) + return old_pri + step unless File.directory?(mirror_dir) - return cal_priority(mirror_dir, old_pri) + return cal_priority(mirror_dir, old_pri, git_repo) end - def cal_priority(mirror_dir, old_pri) + def cal_priority(mirror_dir, old_pri, git_repo) last_commit_time = %x(git -C #{mirror_dir} log --pretty=format:"%ct" -1 2>/dev/null).to_i - return old_pri + Math.cbrt(STEP_SECONDS) if last_commit_time.zero? + step = (@fork_stat[git_repo][:fetch_fail_cnt] + 1) * Math.cbrt(STEP_SECONDS) + return old_pri + step if last_commit_time.zero? t = Time.now.to_i interval = t - last_commit_time - return old_pri + Math.cbrt(STEP_SECONDS) if interval <= 0 + return old_pri + step if interval <= 0 return old_pri + Math.cbrt(interval) end -- 2.23.0

1 0

[PATCH v2 compass-ci] container/mail-robot: fix bugs
by Luan Shengde 07 Apr '21

07 Apr '21

fix no file errors: it may throw error if the specified file not exists: Errno::ENOENT: No such file or directory @ rb_sysopen Signed-off-by: Luan Shengde <shdluan(a)163.com> --- container/mail-robot/lib/apply-account.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/container/mail-robot/lib/apply-account.rb b/container/mail-robot/lib/apply-account.rb index 798546a..d8cb4da 100755 --- a/container/mail-robot/lib/apply-account.rb +++ b/container/mail-robot/lib/apply-account.rb @@ -56,7 +56,7 @@ class ApplyAccount @es_port = ES_PORT # email info file for account issuers. - @account_issuer = YAML.load_file ENV['ACCOUNT_ISSUER'] + @account_issuer = File.exists?(ENV['ACCOUNT_ISSUER']) ? YAML.load_file(ENV['ACCOUNT_ISSUER']) : {} @my_info = {} end -- 2.23.0

1 0

[PATCH compass-ci] container/mail-robot: fix bugs
by Luan Shengde 07 Apr '21

07 Apr '21

fix no file errors: it may throw error if the specified file not exists: Errno::ENOENT: No such file or directory @ rb_sysopen Signed-off-by: Luan Shengde <shdluan(a)163.com> --- container/mail-robot/lib/apply-account.rb | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/container/mail-robot/lib/apply-account.rb b/container/mail-robot/lib/apply-account.rb index 798546a..6b9bdfe 100755 --- a/container/mail-robot/lib/apply-account.rb +++ b/container/mail-robot/lib/apply-account.rb @@ -56,7 +56,11 @@ class ApplyAccount @es_port = ES_PORT # email info file for account issuers. - @account_issuer = YAML.load_file ENV['ACCOUNT_ISSUER'] + @account_issuer = if File.exists? ENV['ACCOUNT_ISSUER'] + YAML.load_file ENV['ACCOUNT_ISSUER'] + else + {} + end @my_info = {} end -- 2.23.0

2 4

[PATCH compass-ci] lib/git_mirror.rb: bigger step to change priority
by Li Yuanchao 07 Apr '21

07 Apr '21

Make the step to change priority of repo bigger, so bad repos would be put behind faster. Signed-off-by: Li Yuanchao <lyc163mail(a)163.com> --- lib/git_mirror.rb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/git_mirror.rb b/lib/git_mirror.rb index b543f02..60a4b76 100644 --- a/lib/git_mirror.rb +++ b/lib/git_mirror.rb @@ -481,7 +481,7 @@ end # main thread class MirrorMain - WEEK_SECONDS = 604800 + MONTH_SECONDS = 2592000 def handle_feedback_new_refs(git_repo, feedback_info) return reload_fork_info(git_repo) if upstream_repo?(git_repo) @@ -584,18 +584,18 @@ class MirrorMain mirror_dir = "/srv/git/#{@git_info[git_repo]['belong']}/#{git_repo}" mirror_dir = "#{mirror_dir}.git" unless @git_info[git_repo]['is_submodule'] - return old_pri + Math.cbrt(WEEK_SECONDS) unless File.directory?(mirror_dir) + return old_pri + Math.cbrt(MONTH_SECONDS) unless File.directory?(mirror_dir) return cal_priority(mirror_dir, old_pri) end def cal_priority(mirror_dir, old_pri) last_commit_time = %x(git -C #{mirror_dir} log --pretty=format:"%ct" -1 2>/dev/null).to_i - return old_pri + Math.cbrt(WEEK_SECONDS) if last_commit_time.zero? + return old_pri + Math.cbrt(MONTH_SECONDS) if last_commit_time.zero? t = Time.now.to_i interval = t - last_commit_time - return old_pri + Math.cbrt(WEEK_SECONDS) if interval <= 0 + return old_pri + Math.cbrt(MONTH_SECONDS) if interval <= 0 return old_pri + Math.cbrt(interval) end -- 2.23.0

2 2

[PATCH v2 compass-ci 2/2] lib/git_mirror.rb: add logs for kibana
by Li Yuanchao 07 Apr '21

07 Apr '21

Add logs when git clone fail, git fetch fail and clone a new repo. Signed-off-by: Li Yuanchao <lyc163mail(a)163.com> --- lib/git_mirror.rb | 47 +++++++++++++++++++++++++++++++++++++---------- 1 file changed, 37 insertions(+), 10 deletions(-) diff --git a/lib/git_mirror.rb b/lib/git_mirror.rb index 6340400..ad8847a 100644 --- a/lib/git_mirror.rb +++ b/lib/git_mirror.rb @@ -49,11 +49,18 @@ class GitMirror url = get_url(Array(url)[0]) 10.times do stderr = %x(git clone --mirror --depth 1 #{url} #{mirror_dir} 2>&1) - return true if File.directory?(mirror_dir) && File.exist?("#{mirror_dir}/config") + return 2 if File.directory?(mirror_dir) && File.exist?("#{mirror_dir}/config") url = "git://#{url.split('://')[1]}" if stderr_443?(stderr) end - return false + return -2 + end + + def fetch_443(mirror_dir, fetch_info) + return unless stderr_443?(fetch_info) + + url = %x(git -C #{mirror_dir} ls-remote --get-url origin).chomp + %x(git -C #{mirror_dir} remote set-url origin git://#{url.split('://')[1]}) end def git_fetch(mirror_dir) @@ -67,12 +74,10 @@ class GitMirror if fetch_info.include?(ERR_MESSAGE) && Dir.empty?(mirror_dir) FileUtils.rmdir(mirror_dir) end + fetch_443(mirror_dir, fetch_info) + return -1 if fetch_info.include?('fatal') - if stderr_443?(fetch_info) - url = %x(git -C #{mirror_dir} ls-remote --get-url origin).chomp - %x(git -C #{mirror_dir} remote set-url origin git://#{url.split('://')[1]}) - end - return fetch_info.include? '->' + return fetch_info.include?('->') ? 1 : 0 end def url_changed?(url, mirror_dir) @@ -196,8 +201,14 @@ class MirrorMain git_repo = feedback_info[:git_repo] return if check_submodule(git_repo) + # values of possible_new_refs: + # 2: git clone a new repo + # 1: git fetch and get new refs + # 0: git fetch and no new refs + # -1: git fetch fail + # -2: git clone fail update_fork_stat(git_repo, feedback_info[:possible_new_refs]) - return unless feedback_info[:possible_new_refs] + return if feedback_info[:possible_new_refs] < 1 handle_feedback_new_refs(git_repo, feedback_info) end @@ -335,7 +346,9 @@ class MirrorMain def update_fork_stat(git_repo, possible_new_refs) update_stat_fetch(git_repo) - update_stat_new_refs(git_repo) if possible_new_refs && last_commit_new?(git_repo) + git_fail_log(git_repo, possible_new_refs) if possible_new_refs.negative? + update_stat_new_refs(git_repo) if possible_new_refs.positive? && last_commit_new?(git_repo) + new_repo_log(git_repo) if possible_new_refs == 2 es_repo_update(git_repo) end end @@ -533,10 +546,24 @@ class MirrorMain end end + def new_repo_log(git_repo) + @log.info({ + msg: 'new repo', + repo: git_repo + }.to_json) + end + + def git_fail_log(git_repo, possible_new_refs) + msg = possible_new_refs == -1 ? 'git fetch fail' : 'git clone fail' + @log.info({ + msg: msg, + repo: git_repo + }.to_json) + end + def new_refs_log(git_repo, nr_new_branch) @log.info({ msg: 'new refs', - time: Time.now, repo: git_repo, nr_new_branch: nr_new_branch }.to_json) -- 2.23.0

1 0

[PATCH v2 compass-ci 1/2] lib/git_mirror.rb: bigger step to change priority
by Li Yuanchao 07 Apr '21

07 Apr '21

Make the step to change priority of repo bigger, so bad repos would be put behind faster. Signed-off-by: Li Yuanchao <lyc163mail(a)163.com> --- lib/git_mirror.rb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/git_mirror.rb b/lib/git_mirror.rb index 1f4e5b5..6340400 100644 --- a/lib/git_mirror.rb +++ b/lib/git_mirror.rb @@ -468,7 +468,7 @@ end # main thread class MirrorMain - WEEK_SECONDS = 604800 + STEP_SECONDS = 2592000 def handle_feedback_new_refs(git_repo, feedback_info) return reload_fork_info(git_repo) if upstream_repo?(git_repo) @@ -554,18 +554,18 @@ class MirrorMain mirror_dir = "/srv/git/#{@git_info[git_repo]['belong']}/#{git_repo}" mirror_dir = "#{mirror_dir}.git" unless @git_info[git_repo]['is_submodule'] - return old_pri + Math.cbrt(WEEK_SECONDS) unless File.directory?(mirror_dir) + return old_pri + Math.cbrt(STEP_SECONDS) unless File.directory?(mirror_dir) return cal_priority(mirror_dir, old_pri) end def cal_priority(mirror_dir, old_pri) last_commit_time = %x(git -C #{mirror_dir} log --pretty=format:"%ct" -1 2>/dev/null).to_i - return old_pri + Math.cbrt(WEEK_SECONDS) if last_commit_time.zero? + return old_pri + Math.cbrt(STEP_SECONDS) if last_commit_time.zero? t = Time.now.to_i interval = t - last_commit_time - return old_pri + Math.cbrt(WEEK_SECONDS) if interval <= 0 + return old_pri + Math.cbrt(STEP_SECONDS) if interval <= 0 return old_pri + Math.cbrt(interval) end -- 2.23.0

1 0

[PATCH compass-ci] sbin/es-*-mapping.sh: fix illegal_argument_exception
by Lu Weitao 07 Apr '21

07 Apr '21

[Why] { "error":{ "root_cause":[{ "type":"illegal_argument_exception", "reason":"The mapping definition cannot be nested under a type [_doc] unless include_type_name is set to true." }], "type":"illegal_argument_exception", "reason":"The mapping definition cannot be nested under a type [_doc] unless include_type_name is set to true." }, "status":400 } Signed-off-by: Lu Weitao <luweitaobe(a)163.com> --- sbin/es-accounts-mapping.sh | 34 ++++++++++----------- sbin/es-jobs-mapping.sh | 2 -- sbin/es-regression-mapping.sh | 16 +++++----- sbin/es-repo-mapping.sh | 56 +++++++++++++++++------------------ 4 files changed, 50 insertions(+), 58 deletions(-) diff --git a/sbin/es-accounts-mapping.sh b/sbin/es-accounts-mapping.sh index d04b0f3..c4ac2fc 100755 --- a/sbin/es-accounts-mapping.sh +++ b/sbin/es-accounts-mapping.sh @@ -12,24 +12,22 @@ else echo "begin create index." curl -sSH 'Content-Type: Application/json' -XPUT 'http://localhost:9200/accounts' -d '{ "mappings": { - "_doc": { - "dynamic": false, - "properties": { - "my_commit_url": { - "type": "keyword" - }, - "my_token": { - "type": "keyword" - }, - "my_email": { - "type": "keyword" - }, - "my_name": { - "type": "keyword" - }, - "my_login_name": { - "type": "keyword" - } + "dynamic": false, + "properties": { + "my_commit_url": { + "type": "keyword" + }, + "my_token": { + "type": "keyword" + }, + "my_email": { + "type": "keyword" + }, + "my_name": { + "type": "keyword" + }, + "my_login_name": { + "type": "keyword" } } } diff --git a/sbin/es-jobs-mapping.sh b/sbin/es-jobs-mapping.sh index edc6159..1c4aa43 100755 --- a/sbin/es-jobs-mapping.sh +++ b/sbin/es-jobs-mapping.sh @@ -37,7 +37,6 @@ else echo "jobs index not exists, begin create index." curl -sSH 'Content-Type: Application/json' -XPUT 'http://localhost:9200/jobs' -d '{ "mappings": { - "_doc": { "dynamic": false, "dynamic_templates": [ { @@ -166,7 +165,6 @@ else "format": "yyyy-MM-dd HH:mm:ss" } } - } } }' if [ $? -ne 0 ] diff --git a/sbin/es-regression-mapping.sh b/sbin/es-regression-mapping.sh index 8e04bdb..5ae0f71 100755 --- a/sbin/es-regression-mapping.sh +++ b/sbin/es-regression-mapping.sh @@ -10,15 +10,13 @@ else echo "begin create index." curl -sSH 'Content-Type: Application/json' -XPUT 'http://localhost:9200/regression' -d '{ "mappings": { - "_doc": { - "dynamic": false, - "properties": { - "error_id": { - "type": "keyword" - }, - "job_id": { - "type": "keyword" - } + "dynamic": false, + "properties": { + "error_id": { + "type": "keyword" + }, + "job_id": { + "type": "keyword" } } } diff --git a/sbin/es-repo-mapping.sh b/sbin/es-repo-mapping.sh index 17f0986..290efb3 100755 --- a/sbin/es-repo-mapping.sh +++ b/sbin/es-repo-mapping.sh @@ -11,35 +11,33 @@ echo 'Start to create "repo" index.' curl -sSH 'Content-Type: Application/json' -XPUT 'http://localhost:9200/repo' -d ' { "mappings": { - "_doc": { - "properties": { - "git_repo": { - "type": "keyword" - }, - "pkgbuild_repo": { - "type": "keyword" - }, - "url": { - "type": "keyword" - }, - "fetch_time": { - "type": "keyword" - }, - "new_refs_time": { - "type": "keyword" - }, - "offset_fetch": { - "type": "long" - }, - "offset_new_refs": { - "type": "long" - }, - "priority": { - "type": "long" - }, - "queued": { - "type": "boolean" - } + "properties": { + "git_repo": { + "type": "keyword" + }, + "pkgbuild_repo": { + "type": "keyword" + }, + "url": { + "type": "keyword" + }, + "fetch_time": { + "type": "keyword" + }, + "new_refs_time": { + "type": "keyword" + }, + "offset_fetch": { + "type": "long" + }, + "offset_new_refs": { + "type": "long" + }, + "priority": { + "type": "long" + }, + "queued": { + "type": "boolean" } } } -- 2.23.0

1 0

[PATCH compass-ci] lib/json_logger: unified time format
by Wu Zhende 07 Apr '21

07 Apr '21

The ES parses the time in this format to the date type. Signed-off-by: Wu Zhende <wuzhende666(a)163.com> --- lib/json_logger.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/json_logger.rb b/lib/json_logger.rb index 2c33c2f..7a05f79 100644 --- a/lib/json_logger.rb +++ b/lib/json_logger.rb @@ -21,7 +21,7 @@ class JSONLogger < Logger logger_hash = { 'level' => severity.to_s, 'level_num' => level_num, - 'time' => datetime + 'time' => Time.now.strftime("%Y-%m-%dT%H:%M:%S.%3N+0800") } logger_hash['progname'] = progname if progname -- 2.23.0

1 0

[PATCH compass-ci] lib/git_mirror.rb: add logs for kibana
by Li Yuanchao 07 Apr '21

07 Apr '21

Add logs when git clone fail, git fetch fail and clone a new repo. Signed-off-by: Li Yuanchao <lyc163mail(a)163.com> --- lib/git_mirror.rb | 48 ++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 39 insertions(+), 9 deletions(-) diff --git a/lib/git_mirror.rb b/lib/git_mirror.rb index 932a10e..60a4b76 100644 --- a/lib/git_mirror.rb +++ b/lib/git_mirror.rb @@ -49,11 +49,18 @@ class GitMirror url = get_url(Array(url)[0]) 10.times do stderr = %x(git clone --mirror --depth 1 #{url} #{mirror_dir} 2>&1) - return true if File.directory?(mirror_dir) && File.exist?("#{mirror_dir}/config") + return 2 if File.directory?(mirror_dir) && File.exist?("#{mirror_dir}/config") url = "git://#{url.split('://')[1]}" if stderr_443?(stderr) end - return false + return -2 + end + + def fetch_443(mirror_dir, fetch_info) + return unless stderr_443?(fetch_info) + + url = %x(git -C #{mirror_dir} ls-remote --get-url origin).chomp + %x(git -C #{mirror_dir} remote set-url origin git://#{url.split('://')[1]}) end def git_fetch(mirror_dir) @@ -67,12 +74,10 @@ class GitMirror if fetch_info.include?(ERR_MESSAGE) && Dir.empty?(mirror_dir) FileUtils.rmdir(mirror_dir) end + fetch_443(mirror_dir, fetch_info) + return -1 if fetch_info.include?('fatal') - if stderr_443?(fetch_info) - url = %x(git -C #{mirror_dir} ls-remote --get-url origin).chomp - %x(git -C #{mirror_dir} remote set-url origin git://#{url.split('://')[1]}) - end - return fetch_info.include? '->' + return fetch_info.include?('->') ? 1 : 0 end def url_changed?(url, mirror_dir) @@ -196,8 +201,14 @@ class MirrorMain git_repo = feedback_info[:git_repo] return if check_submodule(git_repo) + # values of possible_new_refs: + # 2: git clone a new repo + # 1: git fetch and get new refs + # 0: git fetch and no new refs + # -1: git fetch fail + # -2: git clone fail update_fork_stat(git_repo, feedback_info[:possible_new_refs]) - return unless feedback_info[:possible_new_refs] + return if feedback_info[:possible_new_refs] < 1 handle_feedback_new_refs(git_repo, feedback_info) end @@ -335,7 +346,9 @@ class MirrorMain def update_fork_stat(git_repo, possible_new_refs) update_stat_fetch(git_repo) - update_stat_new_refs(git_repo) if possible_new_refs && last_commit_new?(git_repo) + git_fail_log(git_repo, possible_new_refs) if possible_new_refs.negative? + update_stat_new_refs(git_repo) if possible_new_refs.positive? && last_commit_new?(git_repo) + new_repo_log(git_repo) if possible_new_refs == 2 es_repo_update(git_repo) end end @@ -533,6 +546,23 @@ class MirrorMain end end + def new_repo_log(git_repo) + @log.info({ + msg: 'new repo', + time: Time.now, + repo: git_repo + }.to_json) + end + + def git_fail_log(git_repo, possible_new_refs) + msg = possible_new_refs == -1 ? 'git fetch fail' : 'git clone fail' + @log.info({ + msg: msg, + time: Time.now, + repo: git_repo + }.to_json) + end + def new_refs_log(git_repo, nr_new_branch) @log.info({ msg: 'new refs', -- 2.23.0

1 0

[PATCH compass-ci] lib/lifecycle: add some logs
by Wu Zhende 07 Apr '21

07 Apr '21

Help locate problems. Collects statistics on the number and information of close jobs. Collects statistics on the number and information of reboot machines. Signed-off-by: Wu Zhende <wuzhende666(a)163.com> --- src/lib/lifecycle.cr | 43 +++++++++++++++++++++++++++++++++++++++---- 1 file changed, 39 insertions(+), 4 deletions(-) diff --git a/src/lib/lifecycle.cr b/src/lib/lifecycle.cr index 0e6cb82..e56a681 100644 --- a/src/lib/lifecycle.cr +++ b/src/lib/lifecycle.cr @@ -43,7 +43,10 @@ class Lifecycle def alive(version) "Lifecycle Alive! The time is #{Time.local}, version = #{version}" rescue e - @log.warn(e) + @log.warn({ + "resource" => "/alive", + "message" => e.to_s + }.to_json) end def init_from_es @@ -68,6 +71,11 @@ class Lifecycle deal_match_job(testbox, machine["job_id"].to_s) end + rescue e + @log.warn({ + "resource" => "init_from_es", + "message" => e.to_s + }.to_json) end def deal_match_job(testbox, job_id) @@ -129,6 +137,11 @@ class Lifecycle end @mq.ch.basic_ack(msg.delivery_tag) end + rescue e + @log.warn({ + "resource" => "mq_event_loop", + "message" => e.to_s + }.to_json) end def on_other_job(event) @@ -253,6 +266,11 @@ class Lifecycle next if dead_job_id && deadline <= Time.local sleep_until(deadline) + rescue e + @log.warn({ + "resource" => "timeout_job_loop", + "message" => e.to_s + }.to_json) end end @@ -264,6 +282,11 @@ class Lifecycle next if dead_machine_name && deadline <= Time.local sleep_until(deadline) + rescue e + @log.warn({ + "resource" => "timeout_machine_loop", + "message" => e.to_s + }.to_json) end end @@ -306,6 +329,12 @@ class Lifecycle def close_job(job_id, reason) @jobs.delete(job_id) spawn @scheduler_api.close_job(job_id, reason, "lifecycle") + @log.info({ + "job_id" => job_id, + "state" => "close", + "reason" => reason, + "type" => "job" + }.to_json) end def reboot_crash_machine(testbox, event) @@ -314,7 +343,7 @@ class Lifecycle return unless machine return unless event["time"].to_s.bigger_than?(machine["time"]?) - reboot_machine(testbox, machine) + reboot_machine(testbox, machine, "crash") end def reboot_timeout_machine(testbox) @@ -329,10 +358,10 @@ class Lifecycle deadline = Time.parse(deadline.to_s, "%Y-%m-%dT%H:%M:%S", Time.local.location) return if Time.local < deadline - reboot_machine(testbox, machine) + reboot_machine(testbox, machine, "timeout") end - def reboot_machine(testbox, machine) + def reboot_machine(testbox, machine, reason) mq_queue = get_machine_reboot_queue(testbox) machine.as_h.delete("history") machine.as_h["testbox"] = JSON::Any.new(testbox) @@ -341,6 +370,12 @@ class Lifecycle machine["state"] = "rebooting_queue" machine["time"] = Time.local.to_s("%Y-%m-%dT%H:%M:%S+0800") @es.update_tbox(testbox, machine.as_h) + @log.info({ + "type" => "testbox", + "reason" => reason, + "testbox" => testbox, + "state" => "reboot" + }.to_json) end def get_machine_reboot_queue(testbox) -- 2.23.0

1 0