diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-02-12 06:08:53 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-02-12 06:08:53 +0300 |
| commit | 6011d000727a1fe72472f98a8f20a91dbb637733 (patch) | |
| tree | 49f1eacf07be3ee42d659c15a2db4c7cff094c33 /app/services/container_expiration_policies | |
| parent | 542e13aadce92d496ee5577d179bee7ed4e1f18e (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/services/container_expiration_policies')
| -rw-r--r-- | app/services/container_expiration_policies/cleanup_service.rb | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/app/services/container_expiration_policies/cleanup_service.rb b/app/services/container_expiration_policies/cleanup_service.rb index b9e623e2e07..83a4d422a4f 100644 --- a/app/services/container_expiration_policies/cleanup_service.rb +++ b/app/services/container_expiration_policies/cleanup_service.rb @@ -15,9 +15,15 @@ module ContainerExpirationPolicies repository.start_expiration_policy! - service_result = Projects::ContainerRepository::CleanupTagsService - .new(project, nil, policy_params.merge('container_expiration_policy' => true)) - .execute(repository) + begin + service_result = Projects::ContainerRepository::CleanupTagsService + .new(project, nil, policy_params.merge('container_expiration_policy' => true)) + .execute(repository) + rescue + repository.cleanup_unfinished! + + raise + end if service_result[:status] == :success repository.update!( @@ -25,6 +31,7 @@ module ContainerExpirationPolicies expiration_policy_started_at: nil, expiration_policy_completed_at: Time.zone.now ) + success(:finished, service_result) else repository.cleanup_unfinished! |