Add latest changes from gitlab-org/gitlab@14-2-stable-eev14.2.0-rc42

1 files changed, 12 insertions, 3 deletions

diff --git a/app/workers/container_expiration_policies/cleanup_container_repository_worker.rb b/app/workers/container_expiration_policies/cleanup_container_repository_worker.rb
index 33dda6a8f0c..de9bb4d5a93 100644
--- a/app/workers/container_expiration_policies/cleanup_container_repository_worker.rb
+++ b/app/workers/container_expiration_policies/cleanup_container_repository_worker.rb
@@ -4,6 +4,8 @@ module ContainerExpirationPolicies
   class CleanupContainerRepositoryWorker
     include ApplicationWorker
 
+    data_consistency :always
+
     sidekiq_options retry: 3
     include LimitedCapacity::Worker
     include Gitlab::Utils::StrongMemoize
@@ -61,16 +63,23 @@ module ContainerExpirationPolicies
     def container_repository
       strong_memoize(:container_repository) do
         ContainerRepository.transaction do
-          # We need a lock to prevent two workers from picking up the same row
-          container_repository = next_container_repository
+          repository = next_container_repository
+
+          repository&.tap do |repo|
+            log_info(
+              project_id: repo.project_id,
+              container_repository_id: repo.id
+            )
 
-          container_repository&.tap(&:cleanup_ongoing!)
+            repo.cleanup_ongoing!
+          end
         end
       end
     end
 
     def next_container_repository
       # rubocop: disable CodeReuse/ActiveRecord
+      # We need a lock to prevent two workers from picking up the same row
       next_one_requiring = ContainerRepository.requiring_cleanup
                                               .order(:expiration_policy_cleanup_status, :expiration_policy_started_at)
                                               .limit(1)