[PATCH compass-ci 1/2] delimiter: set a timeout for monitor

[why] If the job is suspended for some reason, the delimiter thread will monitor it all the time, so, it should set a timeout for monitor. Now set the timeout to 3600s. Signed-off-by: Cao Xueliang <caoxl78320@163.com> --- src/delimiter/constants.rb | 1 + src/delimiter/utils.rb | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/delimiter/constants.rb b/src/delimiter/constants.rb index 93b633d..5257427 100644 --- a/src/delimiter/constants.rb +++ b/src/delimiter/constants.rb @@ -6,6 +6,7 @@ START_PROCESS_COUNT = 10 GIT_MIRROR_HOST = ENV['GIT_MIRROR_HOST'] || '172.17.0.1' MONITOR_HOST = ENV['MONITOR_HOST'] || '172.17.0.1' MONITOR_PORT = ENV['MONITOR_PORT'] || '11310' +MONITOR_TIMEOUT = 3600 TMEP_GIT_BASE = '/c/public_git' DELIMITER_TASK_QUEUE = 'delimiter' BISECT_RUN_SCRIPT = "#{ENV['CCI_SRC']}/src/delimiter/find-commit/bisect_run_script.rb" diff --git a/src/delimiter/utils.rb b/src/delimiter/utils.rb index 679c8d9..36954a1 100644 --- a/src/delimiter/utils.rb +++ b/src/delimiter/utils.rb @@ -55,7 +55,7 @@ module Utils monitor = Monitor.new("ws://#{MONITOR_HOST}:#{MONITOR_PORT}/filter") monitor.query = query monitor.action = { 'stop' => true } - return monitor.run + return monitor.run(MONITOR_TIMEOUT) end def submit_job(job) -- 2.23.0

Pls ignore this patch. Thanks, Xueliang On Thu, Nov 12, 2020 at 03:40:07PM +0800, Cao Xueliang wrote:
[why] If the job is suspended for some reason, the delimiter thread will monitor it all the time, so, it should set a timeout for monitor.
Now set the timeout to 3600s.
Signed-off-by: Cao Xueliang <caoxl78320@163.com> --- src/delimiter/constants.rb | 1 + src/delimiter/utils.rb | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/delimiter/constants.rb b/src/delimiter/constants.rb index 93b633d..5257427 100644 --- a/src/delimiter/constants.rb +++ b/src/delimiter/constants.rb @@ -6,6 +6,7 @@ START_PROCESS_COUNT = 10 GIT_MIRROR_HOST = ENV['GIT_MIRROR_HOST'] || '172.17.0.1' MONITOR_HOST = ENV['MONITOR_HOST'] || '172.17.0.1' MONITOR_PORT = ENV['MONITOR_PORT'] || '11310' +MONITOR_TIMEOUT = 3600 TMEP_GIT_BASE = '/c/public_git' DELIMITER_TASK_QUEUE = 'delimiter' BISECT_RUN_SCRIPT = "#{ENV['CCI_SRC']}/src/delimiter/find-commit/bisect_run_script.rb" diff --git a/src/delimiter/utils.rb b/src/delimiter/utils.rb index 679c8d9..36954a1 100644 --- a/src/delimiter/utils.rb +++ b/src/delimiter/utils.rb @@ -55,7 +55,7 @@ module Utils monitor = Monitor.new("ws://#{MONITOR_HOST}:#{MONITOR_PORT}/filter") monitor.query = query monitor.action = { 'stop' => true } - return monitor.run + return monitor.run(MONITOR_TIMEOUT) end
def submit_job(job) -- 2.23.0
participants (2)
-
Cao Xueliang
-
Li Yuanchao