Add latest changes from gitlab-org/gitlab@14-0-stable-eev14.0.0-rc42

1 files changed, 6 insertions, 1 deletions

diff --git a/app/services/authorized_project_update/periodic_recalculate_service.rb b/app/services/authorized_project_update/periodic_recalculate_service.rb
index 662d10c648b..16dc76eb4cf 100644
--- a/app/services/authorized_project_update/periodic_recalculate_service.rb
+++ b/app/services/authorized_project_update/periodic_recalculate_service.rb
@@ -9,7 +9,12 @@ module AuthorizedProjectUpdate
       # Using this approach (instead of eg. User.each_batch) keeps the arguments
       # the same for AuthorizedProjectUpdate::UserRefreshOverUserRangeWorker
       # even if the user list changes, so we can deduplicate these jobs.
-      (1..User.maximum(:id)).each_slice(BATCH_SIZE).with_index do |batch, index|
+
+      # Since UserRefreshOverUserRangeWorker has set data_consistency to delayed,
+      # a job enqueued without a delay could fail because the replica could not catch up with the primary.
+      # To prevent this, we start the index from `1` instead of `0` so as to ensure that
+      # no UserRefreshOverUserRangeWorker job is enqueued without a delay.
+      (1..User.maximum(:id)).each_slice(BATCH_SIZE).with_index(1) do |batch, index|
         delay = DELAY_INTERVAL * index
         AuthorizedProjectUpdate::UserRefreshOverUserRangeWorker.perform_in(delay, *batch.minmax)
       end