diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-12-20 16:37:47 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-12-20 16:37:47 +0300 |
| commit | aee0a117a889461ce8ced6fcf73207fe017f1d99 (patch) | |
| tree | 891d9ef189227a8445d83f35c1b0fc99573f4380 /app/workers/concerns | |
| parent | 8d46af3258650d305f53b819eabf7ab18d22f59e (diff) | |
Add latest changes from gitlab-org/gitlab@14-6-stable-eev14.6.0-rc42
Diffstat (limited to 'app/workers/concerns')
| -rw-r--r-- | app/workers/concerns/application_worker.rb | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/app/workers/concerns/application_worker.rb b/app/workers/concerns/application_worker.rb index 03a0b5fae00..d0b09c15289 100644 --- a/app/workers/concerns/application_worker.rb +++ b/app/workers/concerns/application_worker.rb @@ -93,9 +93,11 @@ module ApplicationWorker end def perform_async(*args) + return super if Gitlab::Database::LoadBalancing.primary_only? + # Worker execution for workers with data_consistency set to :delayed or :sticky # will be delayed to give replication enough time to complete - if utilizes_load_balancing_capabilities? + if utilizes_load_balancing_capabilities? && Feature.disabled?(:skip_scheduling_workers_for_replicas, default_enabled: :yaml) perform_in(delay_interval, *args) else super |