diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-31 03:07:51 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-31 03:07:51 +0000 |
| commit | 83a3209c3f8e5bc055acf80f3440335d2b97133b (patch) | |
| tree | 0bb8d48ee018534d319311358f7dab6549b752e1 /app | |
| parent | f6e2f302412fcb32b644b379778964791789cb62 (diff) | |
| download | gitlab-ce-83a3209c3f8e5bc055acf80f3440335d2b97133b.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app')
| -rw-r--r-- | app/workers/concerns/waitable_worker.rb | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/app/workers/concerns/waitable_worker.rb b/app/workers/concerns/waitable_worker.rb index b9ea585d49b..c3abcdafcf2 100644 --- a/app/workers/concerns/waitable_worker.rb +++ b/app/workers/concerns/waitable_worker.rb @@ -14,9 +14,7 @@ module WaitableWorker # are not likely to finish within the timeout. This assumes we can process # 10 jobs per second: # https://gitlab.com/gitlab-com/gl-infra/scalability/-/issues/205 - if ::Feature.enabled?(:skip_job_waiter_for_large_batches) - return bulk_perform_async(args_list) if args_list.length >= 10 * timeout - end + return bulk_perform_async(args_list) if args_list.length >= 10 * timeout waiter = Gitlab::JobWaiter.new(args_list.size, worker_label: self.to_s) |