April 2021 - Compass-ci - mailweb.openeuler.org

[PATCH v3 lkp-tests] sbin/submit: support -n
by Li Yuanchao 20 Apr '21

20 Apr '21

If -n $number, and $number is a integer and $number > 1, submit $number times. And 'nr_run' would be added in the job.yaml. Else, submit once. [usage] submit xxx xxx -n 3 xxx.yaml Signed-off-by: Li Yuanchao <lyc163mail(a)163.com> --- sbin/submit | 27 ++++++++++++++++++--------- 1 file changed, 18 insertions(+), 9 deletions(-) diff --git a/sbin/submit b/sbin/submit index edb207cc0..a35ca0dac 100755 --- a/sbin/submit +++ b/sbin/submit @@ -19,6 +19,7 @@ opt_monitor_query = {} opt_my_queue = false actions = ['output', 'stop'] result_roots = [] +nr_run = 1 options = OptionParser.new do |opts| opts.banner = 'Usage: submit [options] job1.yaml job2.yaml ...' @@ -57,6 +58,11 @@ options = OptionParser.new do |opts| actions << 'mirror_result' end + opts.on('-n job_number', '--number job_number', 'number to submit job') do |number| + nr_run = number.to_i + nr_run = 1 if nr_run < 1 + end + opts.on('-m', '--monitor', "monitor job status: use -m 'KEY: VALUE' to add rule") do opt_monitor = true k, v = ARGV[0].sub(' ', '').split(':', 2) if ARGV[0] @@ -195,16 +201,19 @@ ARGV.each do |jobfile| scheduler_client = SchedulerClient.new(job['SCHED_HOST'], job['SCHED_PORT']) # submit job + job_hash['nr_run'] = nr_run job_json = job_hash.to_json - messages = scheduler_client.submit_job(job_json) - JSON.parse(messages).each do |msg| - if msg['message'].empty? - result_roots << msg['result_root'] - job_ids << msg['job_id'].to_s - puts("submit #{jobfile}, got job id=#{msg['job_id']}") - else - opt_monitor = false - puts("submit #{jobfile} failed, got job id=#{msg['job_id']}, error: #{msg['message']}") + nr_run.times do + messages = scheduler_client.submit_job(job_json) + JSON.parse(messages).each do |msg| + if msg['message'].empty? + result_roots << msg['result_root'] + job_ids << msg['job_id'].to_s + puts("submit #{jobfile}, got job id=#{msg['job_id']}") + else + opt_monitor = false + puts("submit #{jobfile} failed, got job id=#{msg['job_id']}, error: #{msg['message']}") + end end end end -- 2.23.0

1 0

[PATCH compass-ci] lib: use module as namespace in compare_error_messages.rb
by Cao Xueliang 20 Apr '21

20 Apr '21

1. use module CEM. 2. add get_error_messages function. Signed-off-by: Cao Xueliang <caoxl78320(a)163.com> --- .../assist-result/views/check_job_credible.rb | 2 +- lib/compare_error_messages.rb | 138 ++++++++++-------- 2 files changed, 75 insertions(+), 65 deletions(-) diff --git a/container/assist-result/views/check_job_credible.rb b/container/assist-result/views/check_job_credible.rb index a8d387f..c5fc453 100644 --- a/container/assist-result/views/check_job_credible.rb +++ b/container/assist-result/views/check_job_credible.rb @@ -5,5 +5,5 @@ require_relative "#{ENV['CCI_SRC']}/lib/compare_error_messages" def check_job_credible(pre_job_id, cur_job_id, error_id) - return credible?(pre_job_id, cur_job_id, error_id) + return CEM.credible?(pre_job_id, cur_job_id, error_id) end diff --git a/lib/compare_error_messages.rb b/lib/compare_error_messages.rb index 9c864a3..93b38ed 100644 --- a/lib/compare_error_messages.rb +++ b/lib/compare_error_messages.rb @@ -8,91 +8,101 @@ require_relative 'es_query' require_relative 'error_messages' require_relative "#{ENV['LKP_SRC']}/lib/common" -# previous_job_id's error_ids include error_id -# If later_job_id's output include error filename that extract from error_id, -# the later_job_id is credible. -def credible?(previous_job_id, later_job_id, error_id) - es = ESQuery.new - later_es_result = es.query_by_id(later_job_id) +module CEM + extend self - return true if later_es_result['job_state'] == 'finished' + # previous_job_id's error_ids include error_id + # If later_job_id's output include error filename that extract from error_id, + # the later_job_id is credible. + def credible?(previous_job_id, later_job_id, error_id) + es = ESQuery.new + later_es_result = es.query_by_id(later_job_id) - previous_result_file = File.join('/srv', es.query_by_id(previous_job_id)['result_root'], 'build-pkg') - later_result_file = File.join('/srv', later_es_result['result_root'], 'build-pkg') + return true if later_es_result['job_state'] == 'finished' - filenames_check = filenames_check(previous_result_file, later_result_file, error_id) + previous_result_file = File.join('/srv', es.query_by_id(previous_job_id)['result_root'], 'build-pkg') + later_result_file = File.join('/srv', later_es_result['result_root'], 'build-pkg') - return false if filenames_check.empty? || filenames_check.value?(false) + filenames_check = filenames_check(previous_result_file, later_result_file, error_id) - return true -end - -def filenames_check(previous_result_file, later_result_file, error_id) - filenames = Set.new - filenames_check = Hash.new { |h, k| h[k] = false } + return false if filenames_check.empty? || filenames_check.value?(false) - error_lines = ErrorMessages.new(previous_result_file).obtain_error_messages_by_error_id(error_id, true) - error_lines.each do |error_line| - # "src/ssl_sock.c:1454:104: warning: unused parameter 'al' [-Wunused-parameter]" => "src/ssl_sock" - filenames << $1.chomp(File.extname($1)) if error_line =~ /(.*)(:\d+){2}: (error|warning):/ + return true end - File.open(later_result_file).each_line do |line| - filenames.each do |filename| - filenames_check[filename] - filenames_check[filename] = true if line.include?(filename) + def filenames_check(previous_result_file, later_result_file, error_id) + filenames = Set.new + filenames_check = Hash.new { |h, k| h[k] = false } + + error_lines = ErrorMessages.new(previous_result_file).obtain_error_messages_by_error_id(error_id, true) + error_lines.each do |error_line| + # "src/ssl_sock.c:1454:104: warning: unused parameter 'al' [-Wunused-parameter]" => "src/ssl_sock" + filenames << $1.chomp(File.extname($1)) if error_line =~ /(.*)(:\d+){2}: (error|warning):/ + end + + File.open(later_result_file).each_line do |line| + filenames.each do |filename| + filenames_check[filename] + filenames_check[filename] = true if line.include?(filename) + end end + + return filenames_check end - return filenames_check -end + def get_compare_result(previous_job_id, later_job_id) + es = ESQuery.new -def get_compare_result(previous_job_id, later_job_id) - es = ESQuery.new + previous_error_ids = es.query_by_id(previous_job_id)['error_ids'] + later_es_result = es.query_by_id(later_job_id) + later_error_ids = later_es_result['error_ids'] + later_result_file = File.join('/srv', later_es_result['result_root'], 'build-pkg') - previous_error_ids = es.query_by_id(previous_job_id)['error_ids'] - later_es_result = es.query_by_id(later_job_id) - later_error_ids = later_es_result['error_ids'] - later_result_file = File.join('/srv', later_es_result['result_root'], 'build-pkg') + new_error_ids = get_new_error_ids(later_error_ids, previous_error_ids) + error_messages = ErrorMessages.new(later_result_file).obtain_error_messages + new_error_number, formatted_error_messages = format_error_messages(error_messages, new_error_ids) - new_error_ids = get_new_error_ids(later_error_ids, previous_error_ids) - error_messages = ErrorMessages.new(later_result_file).obtain_error_messages - new_error_number, formatted_error_messages = format_error_messages(error_messages, new_error_ids) + # new error use ">>" as an identifier in the error header + return new_error_number, formatted_error_messages + end - # new error use ">>" as an identifier in the error header - return new_error_number, formatted_error_messages -end + def get_error_messages(job_id, error_id) + es_result = ESQuery.new.query_by_id(job_id) + result_file = File.join('/srv', es_result['result_root'], 'build-pkg') + return ErrorMessages.new(result_file).obtain_error_messages_by_error_id(error_id) + end -def get_new_error_ids(later_error_ids, previous_error_ids) - return nil_to_empty_array(later_error_ids) - nil_to_empty_array(previous_error_ids) -end + def get_new_error_ids(later_error_ids, previous_error_ids) + return nil_to_empty_array(later_error_ids) - nil_to_empty_array(previous_error_ids) + end -def nil_to_empty_array(array) - array = [] if array.nil? - return array -end + def nil_to_empty_array(array) + array = [] if array.nil? + return array + end -def format_error_messages(error_messages, new_error_ids) - formatted_error_messages = Terminal::Table.new - formatted_error_messages.style = { border_x: '', border_y: '', border_i: '', padding_left: 0 } - new_error_number = 0 - - error_messages.each do |k, v| - if new_error_ids.include?("build-pkg.#{build_pkg_error_id(k)}") - new_error_number += 1 - formatted_error_messages = add_sign(formatted_error_messages, '>>', v) - else - formatted_error_messages = add_sign(formatted_error_messages, ' ', v) + def format_error_messages(error_messages, new_error_ids) + formatted_error_messages = Terminal::Table.new + formatted_error_messages.style = { border_x: '', border_y: '', border_i: '', padding_left: 0 } + new_error_number = 0 + + error_messages.each do |k, v| + if new_error_ids.include?("build-pkg.#{build_pkg_error_id(k)}") + new_error_number += 1 + formatted_error_messages = add_sign(formatted_error_messages, '>>', v) + else + formatted_error_messages = add_sign(formatted_error_messages, ' ', v) + end end + + return new_error_number, formatted_error_messages.to_s end - return new_error_number, formatted_error_messages.to_s -end + def add_sign(formatted_error_messages, sign, set) + set.each do |value| + formatted_error_messages.add_row([sign, value]) + end -def add_sign(formatted_error_messages, sign, set) - set.each do |value| - formatted_error_messages.add_row([sign, value]) + return formatted_error_messages end - - return formatted_error_messages end -- 2.23.0

1 0

[PATCH compass-ci] sbin/auto_submit: support argvs for competition
by Li Yuanchao 20 Apr '21

20 Apr '21

Get true author_email and committer_email for PR. And get base_commit for branch, which is the commit when branch is created. Signed-off-by: Li Yuanchao <lyc163mail(a)163.com> --- sbin/auto_submit | 26 ++++++++++++++++++++++---- 1 file changed, 22 insertions(+), 4 deletions(-) diff --git a/sbin/auto_submit b/sbin/auto_submit index 4adce89..28e3715 100755 --- a/sbin/auto_submit +++ b/sbin/auto_submit @@ -51,17 +51,35 @@ class AutoSubmit real_argvs = Array.new(submit_argv) real_argvs.push("upstream_branch=#{branch}") - real_argvs.push("upstream_commit=#{commit_id}") real_argvs.push("upstream_dir=#{belong}") tag = %x(git -C #{mirror_dir} tag --points-at #{commit_id}) real_argvs.push("upstream_tag=#{tag}") unless tag.empty? - author_email = %x(git -C #{mirror_dir} log --format=%ae -1) - committer_email = %x(git -C #{mirror_dir} log --format=%ce -1) - real_argvs.push("author_email=#{author_email} committer_email=#{committer_email}") + if git_repo.include?('my-sql_with_boostkit_patch') + competi_argvs = get_argvs_for_competition(mirror_dir, branch, commit_id) + real_argvs.push(competi_argvs) + end + real_argvs.push("upstream_commit=#{commit_id}") system(real_argvs.join(' ')) end + def get_argvs_for_competition(real_argvs, mirror_dir, branch, commit_id) + argvs_for_base = Array.new(real_argvs) + author_email = %x(git -C #{mirror_dir} log --format=%ae -1 #{commit_id}).chomp + committer_email = %x(git -C #{mirror_dir} log --format=%ce -1 #{commit_id}).chomp + + if committer_email.include?('noreply') + emails = %x(git -C #{mirror_dir} log --format=%ae -2 #{commit_id}) + committer_email = emails.lines[0].chomp + author_email = emails.lines[1].chomp + end + + base_commit = %x(git -C #{mirror_dir} merge-base master #{branch}).chomp + argvs_for_base.push("upstream_commit=#{base_commit}") + system(argvs_for_base.join(' ')) + return "author_email=#{author_email} committer_email=#{committer_email} base_commit=#{base_commit}" + end + def submit_specific_branch(submit_argv, newrefs_info, branches) branches.each do |branch_name| branch = "refs/heads/#{branch_name}" -- 2.23.0

1 0

[PATCH compass-ci] extract-stats: fix expect ":" but got "="
by Cao Xueliang 20 Apr '21

20 Apr '21

Signed-off-by: Cao Xueliang <caoxl78320(a)163.com> --- src/extract-stats/stats_worker.cr | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/extract-stats/stats_worker.cr b/src/extract-stats/stats_worker.cr index 47c3a59..f385fee 100644 --- a/src/extract-stats/stats_worker.cr +++ b/src/extract-stats/stats_worker.cr @@ -99,7 +99,7 @@ class StatsWorker sample_error_id = new_error_ids.sample @log.info("send a delimiter task: job_id is #{job_id}") queue = "#{DELIMITER_TASK_QUEUE}/#{job_id}" - value = {"job_id" => job_id, "error_id" => sample_error_id} + value = %({"job_id": "#{job_id}", "error_id": "#{sample_error_id}"}) @etcd.put(queue, value) msg = %({"job_id": "#{job_id}", "new_error_id": "#{sample_error_id}"}) -- 2.23.0

1 0

[PATCH compass-ci] container/scheduler-http: fix unfriendly error
by Liu Yinsi 20 Apr '21

20 Apr '21

before: /c/compass-ci/container/scheduler-https# ./start Traceback (most recent call last): ./start:14:in `<main>': CA certificate is missing. Ignore if the HTTPS scheduler is not required (RuntimeError) after: /c/compass-ci/container/scheduler-https# ./start CA certificate is missing. Ignore if the HTTPS scheduler is not required Signed-off-by: Liu Yinsi <liuyinsi(a)163.com> --- container/scheduler-https/start | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/container/scheduler-https/start b/container/scheduler-https/start index 4ec84a28..374300c0 100755 --- a/container/scheduler-https/start +++ b/container/scheduler-https/start @@ -11,7 +11,10 @@ crt_path = "#{ca_path}/server.crt" key_path = "#{ca_path}/server.key" warn_msg = 'CA certificate is missing. Ignore if the HTTPS scheduler is not required' -raise warn_msg unless File.exist?(crt_path) && File.exist?(key_path) +unless File.exist?(crt_path) && File.exist?(key_path) + puts warn_msg + exit +end names = Set.new %w[ SCHED_HOST -- 2.23.0

1 0

[PATCH v2 compass-ci] lib/rpm-repo.rb: do not move to pub directory until test completed
by Li Ping 20 Apr '21

20 Apr '21

Signed-off-by: Li Ping <1477412247(a)qq.com> --- lib/rpm-repo.rb | 43 ++++++++++++++++++++++++++++++------------- 1 file changed, 30 insertions(+), 13 deletions(-) diff --git a/lib/rpm-repo.rb b/lib/rpm-repo.rb index 658a5270..c8d6b087 100755 --- a/lib/rpm-repo.rb +++ b/lib/rpm-repo.rb @@ -6,6 +6,7 @@ require 'fileutils' require 'json' require './mq_client' +require_relative 'json_logger.rb' MQ_HOST = ENV['MQ_HOST'] || ENV['LKP_SERVER'] || '172.17.0.1' MQ_PORT = ENV['MQ_PORT'] || 5672 @@ -29,31 +30,47 @@ MQ_PORT = ENV['MQ_PORT'] || 5672 # change /srv/rpm/pub/**/repodate # @mq.ack(info) class HandleRepo + @@upload_dir_prefix = "/srv/rpm/upload/" def initialize @mq = MQClient.new(MQ_HOST, MQ_PORT) - @update = [] + @log = JSONLogger.new end def handle_new_rpm queue = @mq.queue("update_repo") queue.subscribe({:block => true, :manual_ack => true}) do |info, _pro, msg| - rpm_info = JSON.parse(msg) - rpm_info["upload_rpms"].each do |rpm| - rpm_path = File.dirname(rpm).sub("upload", "testing") - FileUtils.mkdir_p(rpm_path) unless File.directory?(rpm_path) + begin + rpm_info = JSON.parse(msg) + check_upload_rpms(rpm_info) + rpm_info["upload_rpms"].each do |rpm| + rpm_path = File.dirname(rpm).sub("upload", "testing") + FileUtils.mkdir_p(rpm_path) unless File.directory?(rpm_path) - dest = File.join(rpm_path.to_s, File.basename(rpm)) - @update << dest - FileUtils.mv(rpm, dest) - system("createrepo --update $(dirname #{rpm_path})") + dest = File.join(rpm_path.to_s, File.basename(rpm)) + FileUtils.mv(rpm, dest) + system("createrepo --update $(dirname #{rpm_path})") + end + @mq.ack(info) + rescue StandardError => e + @log.warn({ + "error message": e.message + }.to_json) + @mq.ack(info) end - update_pub_dir - @mq.ack(info) end end - def update_pub_dir - @update.each do |rpm| + def check_upload_rpms(data) + raise JSON.dump({ "errcode" => "200", "errmsg" => "no upload_rpms params" }) unless data.key?("upload_rpms") + raise JSON.dump({ "errcode" => "200", "errmsg" => "upload_rpms params type error" }) if data["upload_rpms"].class != Array + data["upload_rpms"].each do |rpm| + raise JSON.dump({ "errcode" => "200", "errmsg" => "#{rpm} not exist" }) unless File.exist?(rpm) + raise JSON.dump({ "errcode" => "200", "errmsg" => "the upload directory is incorrect" }) unless File.dirname(rpm).start_with?(@@upload_dir_prefix) + end + end + + def update_pub_dir(update) + update.each do |rpm| pub_path = File.dirname(rpm).sub("testing", "pub") FileUtils.mkdir_p(pub_path) unless File.directory?(pub_path) -- 2.23.0

1 0

[PATCH compass-ci 3/3] service/kibana-logging: configuring ES authentication information
by Wu Zhende 20 Apr '21

20 Apr '21

logging-es set up the certification. kibana-logging needs to configure the connection information to connect to the logging-es. When logging to the kibana web page, need to enter the account and password to enhance security. Signed-off-by: Wu Zhende <wuzhende666(a)163.com> --- container/kibana-logging/Dockerfile | 7 +++++-- container/kibana-logging/build | 10 +++++++++- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/container/kibana-logging/Dockerfile b/container/kibana-logging/Dockerfile index 970eb5a..7085618 100644 --- a/container/kibana-logging/Dockerfile +++ b/container/kibana-logging/Dockerfile @@ -5,8 +5,11 @@ ARG BASE_IMAGE FROM ${BASE_IMAGE} -# docker image borrowed from hub.docker.com/r/gagara/kibana-oss-arm64 +ARG USER +ARG PASSWORD MAINTAINER Wu Zhende <wuzhende666(a)163.com> -RUN sed -i 's/server.host: "0"/server.host: "0.0.0.0"/' config/kibana.yml +RUN sed -i 's/server.host: "0"/server.host: "0.0.0.0"/' config/kibana.yml && \ + sed -i "6i\elasticsearch.username: ${USER}" config/kibana.yml && \ + sed -i "6i\elasticsearch.password: ${PASSWORD}" config/kibana.yml diff --git a/container/kibana-logging/build b/container/kibana-logging/build index 9c75aeb..238a88d 100755 --- a/container/kibana-logging/build +++ b/container/kibana-logging/build @@ -3,8 +3,16 @@ # Copyright (c) 2020 Huawei Technologies Co., Ltd. All rights reserved. # frozen_string_literal: true +require 'set' require_relative '../defconfig' +names = Set.new %w[ + LOGGING_ES_USER + LOGGING_ES_PASSWORD +] + +defaults = relevant_service_account(names) + docker_skip_rebuild "kibana:7.11.1" BASE_IMAGE_DICT = { @@ -13,4 +21,4 @@ BASE_IMAGE_DICT = { BASE_IMAGE = BASE_IMAGE_DICT[%x(arch).chomp] -system "docker build -t kibana:7.11.1 --build-arg BASE_IMAGE=#{BASE_IMAGE} ." +system "docker build -t kibana:7.11.1 --build-arg BASE_IMAGE=#{BASE_IMAGE} --build-arg USER=#{defaults['LOGGING_ES_USER']} --build-arg PASSWORD=#{defaults['LOGGING_ES_PASSWORD']} ." -- 2.23.0

1 0

[PATCH compass-ci 2/3] service/master-fluentd: configuring ES authentication information
by Wu Zhende 20 Apr '21

20 Apr '21

logging-es set up the certification. fluentd needs to configure the connection information to connect to the logging-es. Signed-off-by: Wu Zhende <wuzhende666(a)163.com> --- container/master-fluentd/docker-fluentd.conf | 2 ++ container/master-fluentd/start | 6 ++++++ 2 files changed, 8 insertions(+) diff --git a/container/master-fluentd/docker-fluentd.conf b/container/master-fluentd/docker-fluentd.conf index 410f2eb..73d7103 100644 --- a/container/master-fluentd/docker-fluentd.conf +++ b/container/master-fluentd/docker-fluentd.conf @@ -42,6 +42,8 @@ @type elasticsearch host "#{ENV['LOGGING_ES_HOST']}" port "#{ENV['LOGGING_ES_PORT']}" + user "#{ENV['LOGGING_ES_USER']}" + password "#{ENV['LOGGING_ES_PASSWORD']}" suppress_type_name true flush_interval 1s num_threads 10 diff --git a/container/master-fluentd/start b/container/master-fluentd/start index a05881c..27aece9 100755 --- a/container/master-fluentd/start +++ b/container/master-fluentd/start @@ -9,11 +9,17 @@ require_relative '../defconfig.rb' names = Set.new %w[ LOGGING_ES_HOST LOGGING_ES_PORT + LOGGING_ES_USER + LOGGING_ES_PASSWORD ] +account_info = relevant_service_account(names) + defaults = relevant_defaults(names) defaults['LOGGING_ES_HOST'] ||= '172.17.0.1' defaults['LOGGING_ES_PORT'] ||= '9202' +defaults.merge!(account_info) + env = docker_env(defaults) docker_rm 'master-fluentd' -- 2.23.0

1 0

[PATCH lab-z9] add new info for a125
by Bai Jing 20 Apr '21

20 Apr '21

Signed-off-by: Bai Jing <799286817(a)qq.com> --- hosts/taishan200-2280-2s64p-256g--a125 | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/hosts/taishan200-2280-2s64p-256g--a125 b/hosts/taishan200-2280-2s64p-256g--a125 index 5c5862e..f2cb708 100644 --- a/hosts/taishan200-2280-2s64p-256g--a125 +++ b/hosts/taishan200-2280-2s64p-256g--a125 @@ -2,11 +2,7 @@ memory: 256G nr_hdd_partitions: 2 hdd_partitions: - /dev/disk/by-id/scsi-35000039988707ca1 - - scsi-35000039988707ca10 - - scsi-35000039988707ca1-part* - - /dev/disk/by-id/scsi-35000039988707d25-part1 - - /dev/disk/by-id/scsi-35000039988707d25-part2 - - /dev/disk/by-id/scsi-35000039988707d25-part3 + - /dev/disk/by-id/scsi-35000039988707d25 mac_addr: - 44:67:47:85:f4:65 - 44:67:47:85:f4:66 -- 2.23.0

1 0

[PATCH v2 lkp-tests] sbin/submit: support nr_run
by Li Yuanchao 20 Apr '21

20 Apr '21

If nr_run is a integer and nr_run > 1, submit nr_run times. Else, submit once. [usage] submit xxx xxx nr_run=3 xxx.yaml Signed-off-by: Li Yuanchao <lyc163mail(a)163.com> --- sbin/submit | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/sbin/submit b/sbin/submit index edb207cc0..bcc155f3e 100755 --- a/sbin/submit +++ b/sbin/submit @@ -195,16 +195,21 @@ ARGV.each do |jobfile| scheduler_client = SchedulerClient.new(job['SCHED_HOST'], job['SCHED_PORT']) # submit job + nr_run = job_hash['nr_run'] || 1 + nr_run = nr_run.to_i + nr_run = 1 if nr_run < 1 job_json = job_hash.to_json - messages = scheduler_client.submit_job(job_json) - JSON.parse(messages).each do |msg| - if msg['message'].empty? - result_roots << msg['result_root'] - job_ids << msg['job_id'].to_s - puts("submit #{jobfile}, got job id=#{msg['job_id']}") - else - opt_monitor = false - puts("submit #{jobfile} failed, got job id=#{msg['job_id']}, error: #{msg['message']}") + nr_run.times do + messages = scheduler_client.submit_job(job_json) + JSON.parse(messages).each do |msg| + if msg['message'].empty? + result_roots << msg['result_root'] + job_ids << msg['job_id'].to_s + puts("submit #{jobfile}, got job id=#{msg['job_id']}") + else + opt_monitor = false + puts("submit #{jobfile} failed, got job id=#{msg['job_id']}, error: #{msg['message']}") + end end end end -- 2.23.0

1 0