Add latest changes from gitlab-org/gitlab@13-9-stable-eev13.9.0-rc42

1 files changed, 4 insertions, 1 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 7c86b194574..53220a7afed 100644
--- a/app/workers/container_expiration_policies/cleanup_container_repository_worker.rb
+++ b/app/workers/container_expiration_policies/cleanup_container_repository_worker.rb
@@ -18,6 +18,7 @@ module ContainerExpirationPolicies
       cleanup_tags_service_before_truncate_size
       cleanup_tags_service_after_truncate_size
       cleanup_tags_service_before_delete_size
+      cleanup_tags_service_deleted_size
     ].freeze
 
     def perform_work
@@ -25,6 +26,7 @@ module ContainerExpirationPolicies
       return unless container_repository
 
       log_extra_metadata_on_done(:container_repository_id, container_repository.id)
+      log_extra_metadata_on_done(:project_id, project.id)
 
       unless allowed_to_run?(container_repository)
         container_repository.cleanup_unscheduled!
@@ -78,7 +80,7 @@ module ContainerExpirationPolicies
     end
 
     def project
-      container_repository&.project
+      container_repository.project
     end
 
     def container_repository
@@ -116,6 +118,7 @@ module ContainerExpirationPolicies
                     after_truncate_size &&
                     before_truncate_size != after_truncate_size
       log_extra_metadata_on_done(:cleanup_tags_service_truncated, !!truncated)
+      log_extra_metadata_on_done(:running_jobs_count, running_jobs_count)
     end
   end
 end