Add latest changes from gitlab-org/gitlab@master

3 files changed, 60 insertions, 0 deletions

diff --git a/app/workers/all_queues.yml b/app/workers/all_queues.yml
index 5c6567becea..ed8a03ce998 100644
--- a/app/workers/all_queues.yml
+++ b/app/workers/all_queues.yml
@@ -1749,6 +1749,15 @@
   :weight: 1
   :idempotent: true
   :tags: []
+- :name: package_cleanup:packages_nuget_cleanup_stale_symbols
+  :worker_name: Packages::Nuget::CleanupStaleSymbolsWorker
+  :feature_category: :package_registry
+  :has_external_dependencies: false
+  :urgency: :low
+  :resource_boundary: :unknown
+  :weight: 1
+  :idempotent: true
+  :tags: []
 - :name: package_repositories:packages_debian_generate_distribution
   :worker_name: Packages::Debian::GenerateDistributionWorker
   :feature_category: :package_registry
diff --git a/app/workers/packages/cleanup_package_registry_worker.rb b/app/workers/packages/cleanup_package_registry_worker.rb
index 5b2d8bacd62..50036923e94 100644
--- a/app/workers/packages/cleanup_package_registry_worker.rb
+++ b/app/workers/packages/cleanup_package_registry_worker.rb
@@ -14,6 +14,7 @@ module Packages
       enqueue_package_file_cleanup_job if Packages::PackageFile.pending_destruction.exists?
       enqueue_cleanup_policy_jobs if Packages::Cleanup::Policy.runnable.exists?
       enqueue_cleanup_stale_npm_metadata_cache_job if Packages::Npm::MetadataCache.pending_destruction.exists?
+      enqueue_cleanup_stale_nuget_symbols_job if Packages::Nuget::Symbol.pending_destruction.exists?
 
       log_counts
     end
@@ -32,6 +33,10 @@ module Packages
       Packages::Npm::CleanupStaleMetadataCacheWorker.perform_with_capacity
     end
 
+    def enqueue_cleanup_stale_nuget_symbols_job
+      Packages::Nuget::CleanupStaleSymbolsWorker.perform_with_capacity
+    end
+
     def log_counts
       use_replica_if_available do
         pending_destruction_package_files_count = Packages::PackageFile.pending_destruction.count
diff --git a/app/workers/packages/nuget/cleanup_stale_symbols_worker.rb b/app/workers/packages/nuget/cleanup_stale_symbols_worker.rb
new file mode 100644
index 00000000000..be90b86604c
--- /dev/null
+++ b/app/workers/packages/nuget/cleanup_stale_symbols_worker.rb
@@ -0,0 +1,46 @@
+# frozen_string_literal: true
+
+module Packages
+  module Nuget
+    class CleanupStaleSymbolsWorker
+      include ApplicationWorker
+      include ::Packages::CleanupArtifactWorker
+
+      MAX_CAPACITY = 2
+
+      data_consistency :sticky
+
+      queue_namespace :package_cleanup
+      feature_category :package_registry
+
+      deduplicate :until_executed
+      idempotent!
+
+      def max_running_jobs
+        MAX_CAPACITY
+      end
+
+      private
+
+      def model
+        Packages::Nuget::Symbol
+      end
+
+      def next_item
+        model.next_pending_destruction(order_by: nil)
+      end
+
+      def log_metadata(nuget_symbol)
+        log_extra_metadata_on_done(:nuget_symbol_id, nuget_symbol.id)
+      end
+
+      def log_cleanup_item(nuget_symbol)
+        logger.info(
+          structured_payload(
+            nuget_symbol_id: nuget_symbol.id
+          )
+        )
+      end
+    end
+  end
+end