From b76ae638462ab0f673e5915986070518dd3f9ad3 Mon Sep 17 00:00:00 2001
From: GitLab Bot <gitlab-bot@gitlab.com>
Date: Thu, 19 Aug 2021 09:08:42 +0000
Subject: Add latest changes from gitlab-org/gitlab@14-2-stable-ee

---
 app/workers/packages/composer/cache_cleanup_worker.rb       | 3 ++-
 app/workers/packages/composer/cache_update_worker.rb        | 2 ++
 app/workers/packages/debian/generate_distribution_worker.rb | 2 ++
 app/workers/packages/debian/process_changes_worker.rb       | 2 ++
 app/workers/packages/go/sync_packages_worker.rb             | 2 ++
 app/workers/packages/helm/extraction_worker.rb              | 2 ++
 app/workers/packages/maven/metadata/sync_worker.rb          | 2 ++
 app/workers/packages/nuget/extraction_worker.rb             | 2 ++
 app/workers/packages/rubygems/extraction_worker.rb          | 2 ++
 9 files changed, 18 insertions(+), 1 deletion(-)

(limited to 'app/workers/packages')

diff --git a/app/workers/packages/composer/cache_cleanup_worker.rb b/app/workers/packages/composer/cache_cleanup_worker.rb
index 1d47ef87962..fee886bc750 100644
--- a/app/workers/packages/composer/cache_cleanup_worker.rb
+++ b/app/workers/packages/composer/cache_cleanup_worker.rb
@@ -5,7 +5,8 @@ module Packages
     class CacheCleanupWorker
       include ApplicationWorker
 
-      sidekiq_options retry: 3
+      data_consistency :always
+
       include CronjobQueue # rubocop:disable Scalability/CronWorkerContext
 
       feature_category :package_registry
diff --git a/app/workers/packages/composer/cache_update_worker.rb b/app/workers/packages/composer/cache_update_worker.rb
index d87abf2e256..f146a0a83cc 100644
--- a/app/workers/packages/composer/cache_update_worker.rb
+++ b/app/workers/packages/composer/cache_update_worker.rb
@@ -5,6 +5,8 @@ module Packages
     class CacheUpdateWorker
       include ApplicationWorker
 
+      data_consistency :always
+
       sidekiq_options retry: 3
 
       feature_category :package_registry
diff --git a/app/workers/packages/debian/generate_distribution_worker.rb b/app/workers/packages/debian/generate_distribution_worker.rb
index 68fdd80ffb1..b9b157d25d2 100644
--- a/app/workers/packages/debian/generate_distribution_worker.rb
+++ b/app/workers/packages/debian/generate_distribution_worker.rb
@@ -4,6 +4,8 @@ module Packages
   module Debian
     class GenerateDistributionWorker # rubocop:disable Scalability/IdempotentWorker
       include ApplicationWorker
+
+      data_consistency :always
       include Gitlab::Utils::StrongMemoize
 
       # The worker is idempotent, by reusing component files with the same file_sha256.
diff --git a/app/workers/packages/debian/process_changes_worker.rb b/app/workers/packages/debian/process_changes_worker.rb
index edc366a7597..3ddeb858429 100644
--- a/app/workers/packages/debian/process_changes_worker.rb
+++ b/app/workers/packages/debian/process_changes_worker.rb
@@ -4,6 +4,8 @@ module Packages
   module Debian
     class ProcessChangesWorker
       include ApplicationWorker
+
+      data_consistency :always
       include Gitlab::Utils::StrongMemoize
 
       deduplicate :until_executed
diff --git a/app/workers/packages/go/sync_packages_worker.rb b/app/workers/packages/go/sync_packages_worker.rb
index c5f631c47db..182c9bfec5d 100644
--- a/app/workers/packages/go/sync_packages_worker.rb
+++ b/app/workers/packages/go/sync_packages_worker.rb
@@ -5,6 +5,8 @@ module Packages
     class SyncPackagesWorker
       include ApplicationWorker
 
+      data_consistency :always
+
       sidekiq_options retry: 3
       include Gitlab::Golang
 
diff --git a/app/workers/packages/helm/extraction_worker.rb b/app/workers/packages/helm/extraction_worker.rb
index fd4e720da94..1010a0833b1 100644
--- a/app/workers/packages/helm/extraction_worker.rb
+++ b/app/workers/packages/helm/extraction_worker.rb
@@ -5,6 +5,8 @@ module Packages
     class ExtractionWorker
       include ApplicationWorker
 
+      data_consistency :always
+
       queue_namespace :package_repositories
       feature_category :package_registry
       deduplicate :until_executing
diff --git a/app/workers/packages/maven/metadata/sync_worker.rb b/app/workers/packages/maven/metadata/sync_worker.rb
index c53117a08c5..ab18c70e95e 100644
--- a/app/workers/packages/maven/metadata/sync_worker.rb
+++ b/app/workers/packages/maven/metadata/sync_worker.rb
@@ -6,6 +6,8 @@ module Packages
       class SyncWorker
         include ApplicationWorker
 
+        data_consistency :always
+
         sidekiq_options retry: 3
         include Gitlab::Utils::StrongMemoize
 
diff --git a/app/workers/packages/nuget/extraction_worker.rb b/app/workers/packages/nuget/extraction_worker.rb
index 4128b229ebe..b8e00621aa1 100644
--- a/app/workers/packages/nuget/extraction_worker.rb
+++ b/app/workers/packages/nuget/extraction_worker.rb
@@ -5,6 +5,8 @@ module Packages
     class ExtractionWorker # rubocop:disable Scalability/IdempotentWorker
       include ApplicationWorker
 
+      data_consistency :always
+
       sidekiq_options retry: 3
 
       queue_namespace :package_repositories
diff --git a/app/workers/packages/rubygems/extraction_worker.rb b/app/workers/packages/rubygems/extraction_worker.rb
index fc32654a2c1..520305981cf 100644
--- a/app/workers/packages/rubygems/extraction_worker.rb
+++ b/app/workers/packages/rubygems/extraction_worker.rb
@@ -5,6 +5,8 @@ module Packages
     class ExtractionWorker # rubocop:disable Scalability/IdempotentWorker
       include ApplicationWorker
 
+      data_consistency :always
+
       sidekiq_options retry: 3
 
       queue_namespace :package_repositories
-- 
cgit v1.2.1