- Compass-ci - mailweb.openeuler.org

[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