summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZeger-Jan van de Weg <git@zjvandeweg.nl>2018-07-24 13:25:27 +0200
committerZeger-Jan van de Weg <git@zjvandeweg.nl>2018-07-24 13:25:27 +0200
commitad739537728b773851da3f8ffe6303fa1d9d6c7d (patch)
tree772f03643eef9bf3a9e0a06791aec99e0334df07
parent1c24eafb4106dc7890ef74093a59009e94baa705 (diff)
downloadgitlab-ce-ad739537728b773851da3f8ffe6303fa1d9d6c7d.tar.gz
Make repository cleanup mandatory
-rw-r--r--lib/gitlab/git/repository.rb6
1 files changed, 2 insertions, 4 deletions
diff --git a/lib/gitlab/git/repository.rb b/lib/gitlab/git/repository.rb
index 7bd5927d15e..0356e8efc5c 100644
--- a/lib/gitlab/git/repository.rb
+++ b/lib/gitlab/git/repository.rb
@@ -353,8 +353,6 @@ module Gitlab
# offset: 5,
# after: Time.new(2016, 4, 21, 14, 32, 10)
# )
- #
- # Gitaly migration: https://gitlab.com/gitlab-org/gitaly/issues/446
def log(options)
default_options = {
limit: 10,
@@ -1029,8 +1027,8 @@ module Gitlab
end
def clean_stale_repository_files
- gitaly_migrate(:repository_cleanup, status: Gitlab::GitalyClient::MigrationStatus::OPT_OUT) do |is_enabled|
- gitaly_repository_client.cleanup if is_enabled && exists?
+ wrapped_gitaly_errors do
+ gitaly_repository_client.cleanup if exists?
end
rescue Gitlab::Git::CommandError => e # Don't fail if we can't cleanup
Rails.logger.error("Unable to clean repository on storage #{storage} with relative path #{relative_path}: #{e.message}")