diff --git a/app/workers/auto_merge_process_worker.rb b/app/workers/auto_merge_process_worker.rb index 976a12f5347109303fdd447db2fcef9eb6e8914f..fe54b088e87bcc5018d0147b4218c679307826ae 100644 --- a/app/workers/auto_merge_process_worker.rb +++ b/app/workers/auto_merge_process_worker.rb @@ -3,7 +3,7 @@ class AutoMergeProcessWorker # rubocop:disable Scalability/IdempotentWorker include ApplicationWorker - data_consistency :always + data_consistency :sticky, feature_flag: :auto_merge_process_worker_sticky sidekiq_options retry: 3 diff --git a/config/feature_flags/worker/auto_merge_process_worker_sticky.yml b/config/feature_flags/worker/auto_merge_process_worker_sticky.yml new file mode 100644 index 0000000000000000000000000000000000000000..cad9252b7a4279d235a691c0b4927e6dac48ef9f --- /dev/null +++ b/config/feature_flags/worker/auto_merge_process_worker_sticky.yml @@ -0,0 +1,9 @@ +--- +name: auto_merge_process_worker_sticky +feature_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/483008 +introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/167234 +rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/496567 +milestone: '17.5' +group: group::ci platform +type: worker +default_enabled: false