Add latest changes from gitlab-org/gitlab@13-12-stable-eev13.12.0-rc42

1 files changed, 4 insertions, 3 deletions

diff --git a/app/workers/packages/nuget/extraction_worker.rb b/app/workers/packages/nuget/extraction_worker.rb
index 820304a9f3b..4128b229ebe 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
 
+      sidekiq_options retry: 3
+
       queue_namespace :package_repositories
       feature_category :package_registry
 
@@ -15,10 +17,9 @@ module Packages
 
         ::Packages::Nuget::UpdatePackageFromMetadataService.new(package_file).execute
 
-      rescue ::Packages::Nuget::MetadataExtractionService::ExtractionError,
-             ::Packages::Nuget::UpdatePackageFromMetadataService::InvalidMetadataError => e
+      rescue StandardError => e
         Gitlab::ErrorTracking.log_exception(e, project_id: package_file.project_id)
-        package_file.package.destroy!
+        package_file.package.update_column(:status, :error)
       end
     end
   end