Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2022-05-23 03:08:37 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2022-05-23 03:08:37 +0300
commit05c5ce9bce117e4ad5d82375a7d0be756285e286 (patch)
treec7152c8d7f2a40da3207d2a02cf3b7db1cb8740f /app
parent480fdbd6396d03fcd8a496fbb642436223dda72e (diff)
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app')
-rw-r--r--app/workers/container_registry/migration/guard_worker.rb9
1 files changed, 5 insertions, 4 deletions
diff --git a/app/workers/container_registry/migration/guard_worker.rb b/app/workers/container_registry/migration/guard_worker.rb
index 1111061a89b..fe2c68c66e6 100644
--- a/app/workers/container_registry/migration/guard_worker.rb
+++ b/app/workers/container_registry/migration/guard_worker.rb
@@ -22,7 +22,7 @@ module ContainerRegistry
repositories = ::ContainerRepository.with_stale_migration(step_before_timestamp)
.limit(max_capacity)
aborts_count = 0
- long_running_migration_ids = []
+ long_running_migrations = []
# the #to_a is safe as the amount of entries is limited.
# In addition, we're calling #each in the next line and we don't want two different SQL queries for these two lines
@@ -32,7 +32,7 @@ module ContainerRegistry
if actively_importing?(repository)
# if a repository is actively importing but not yet long_running, do nothing
if long_running_migration?(repository)
- long_running_migration_ids << repository.id
+ long_running_migrations << repository
cancel_long_running_migration(repository)
aborts_count += 1
end
@@ -44,8 +44,9 @@ module ContainerRegistry
log_extra_metadata_on_done(:aborted_stale_migrations_count, aborts_count)
- if long_running_migration_ids.any?
- log_extra_metadata_on_done(:aborted_long_running_migration_ids, long_running_migration_ids)
+ if long_running_migrations.any?
+ log_extra_metadata_on_done(:aborted_long_running_migration_ids, long_running_migrations.map(&:id))
+ log_extra_metadata_on_done(:aborted_long_running_migration_paths, long_running_migrations.map(&:path))
end
end