diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-10-20 11:43:02 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-10-20 11:43:02 +0300 |
commit | d9ab72d6080f594d0b3cae15f14b3ef2c6c638cb (patch) | |
tree | 2341ef426af70ad1e289c38036737e04b0aa5007 /app/workers/packages/composer/cache_cleanup_worker.rb | |
parent | d6e514dd13db8947884cd58fe2a9c2a063400a9b (diff) |
Add latest changes from gitlab-org/gitlab@14-4-stable-eev14.4.0-rc42
Diffstat (limited to 'app/workers/packages/composer/cache_cleanup_worker.rb')
-rw-r--r-- | app/workers/packages/composer/cache_cleanup_worker.rb | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/app/workers/packages/composer/cache_cleanup_worker.rb b/app/workers/packages/composer/cache_cleanup_worker.rb index 19babf63967..c80d6ea45d8 100644 --- a/app/workers/packages/composer/cache_cleanup_worker.rb +++ b/app/workers/packages/composer/cache_cleanup_worker.rb @@ -14,19 +14,7 @@ module Packages idempotent! def perform - ::Packages::Composer::CacheFile.without_namespace.find_in_batches do |cache_files| - cache_files.each(&:destroy) - rescue ActiveRecord::RecordNotFound - # ignore. likely due to object already being deleted. - end - - ::Packages::Composer::CacheFile.expired.find_in_batches do |cache_files| - cache_files.each(&:destroy) - rescue ActiveRecord::RecordNotFound - # ignore. likely due to object already being deleted. - end - rescue StandardError => e - Gitlab::ErrorTracking.log_exception(e) + # no-op: to be removed after 14.5 https://gitlab.com/gitlab-org/gitlab/-/issues/333694 end end end |