diff options
author | Douwe Maan <douwe@selenight.nl> | 2018-02-26 13:34:19 +0100 |
---|---|---|
committer | Douwe Maan <douwe@selenight.nl> | 2018-02-26 13:34:41 +0100 |
commit | 56af2dbe7369575a5b7a1fb5202b728d6015846b (patch) | |
tree | 0b9a4c1970d1cd1887db96282a75d958e9493cae | |
parent | 1751cab41fb48fb4c231bfea9f3ab334ba98fea5 (diff) | |
download | gitlab-ce-56af2dbe7369575a5b7a1fb5202b728d6015846b.tar.gz |
Allow bulk_perform_and_wait wait timeout to be overridden
-rw-r--r-- | app/workers/concerns/waitable_worker.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/workers/concerns/waitable_worker.rb b/app/workers/concerns/waitable_worker.rb index 7d2266aea3c..48ebe862248 100644 --- a/app/workers/concerns/waitable_worker.rb +++ b/app/workers/concerns/waitable_worker.rb @@ -3,7 +3,7 @@ module WaitableWorker module ClassMethods # Schedules multiple jobs and waits for them to be completed. - def bulk_perform_and_wait(args_list) + def bulk_perform_and_wait(args_list, timeout: 10) # Short-circuit: it's more efficient to do small numbers of jobs inline return bulk_perform_inline(args_list) if args_list.size <= 3 @@ -14,7 +14,7 @@ module WaitableWorker waiting_args_list = args_list.map { |args| [*args, waiter.key] } bulk_perform_async(waiting_args_list) - waiter.wait + waiter.wait(timeout) end # Performs multiple jobs directly. Failed jobs will be put into sidekiq so |