diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-01-20 12:16:11 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-01-20 12:16:11 +0300 |
commit | edaa33dee2ff2f7ea3fac488d41558eb5f86d68c (patch) | |
tree | 11f143effbfeba52329fb7afbd05e6e2a3790241 /app/workers/concerns/application_worker.rb | |
parent | d8a5691316400a0f7ec4f83832698f1988eb27c1 (diff) |
Add latest changes from gitlab-org/gitlab@14-7-stable-eev14.7.0-rc42
Diffstat (limited to 'app/workers/concerns/application_worker.rb')
-rw-r--r-- | app/workers/concerns/application_worker.rb | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/app/workers/concerns/application_worker.rb b/app/workers/concerns/application_worker.rb index d0b09c15289..83261d9e42e 100644 --- a/app/workers/concerns/application_worker.rb +++ b/app/workers/concerns/application_worker.rb @@ -189,12 +189,8 @@ module ApplicationWorker schedule_at = bulk_schedule_at end - if Feature.enabled?(:sidekiq_push_bulk_in_batches) - in_safe_limit_batches(args_list, schedule_at) do |args_batch, schedule_at_for_batch| - Sidekiq::Client.push_bulk('class' => self, 'args' => args_batch, 'at' => schedule_at_for_batch) - end - else - Sidekiq::Client.push_bulk('class' => self, 'args' => args_list, 'at' => schedule_at) + in_safe_limit_batches(args_list, schedule_at) do |args_batch, schedule_at_for_batch| + Sidekiq::Client.push_bulk('class' => self, 'args' => args_batch, 'at' => schedule_at_for_batch) end end @@ -207,12 +203,8 @@ module ApplicationWorker private def do_push_bulk(args_list) - if Feature.enabled?(:sidekiq_push_bulk_in_batches) - in_safe_limit_batches(args_list) do |args_batch, _| - Sidekiq::Client.push_bulk('class' => self, 'args' => args_batch) - end - else - Sidekiq::Client.push_bulk('class' => self, 'args' => args_list) + in_safe_limit_batches(args_list) do |args_batch, _| + Sidekiq::Client.push_bulk('class' => self, 'args' => args_batch) end end |