Skip to content
Snippets Groups Projects
Verified Commit ddf73208 authored by DJ Mountney's avatar DJ Mountney
Browse files

Add wait timeout to docker exec measurement job

Some commands in dev where timing out, perhaps due to runner contraints
(the docker runner in dev was meant for building docker images, not for running
the gitlab docker image)
parent e15bd362
No related branches found
No related tags found
No related merge requests found
Loading
Loading
@@ -157,11 +157,11 @@ module Gitlab
[pid_command_hash_array, smem_result_hash_array]
end
 
def container_exec_command(container, command, log_file)
def container_exec_command(container, command, log_file, timeout = 120)
# make sure the folder exists
FileUtils.mkdir_p debug_output_dir unless debug_output_dir.nil?
 
stdout, stderr, code = container.exec(command)
stdout, stderr, code = container.exec(command, wait: timeout)
stdout = stdout.join('')
stderr = stderr.join('')
 
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment