Commit 73803642 authored by Stan Hu's avatar Stan Hu

Merge branch...

Merge branch '4553-geo-hashed-storage-migration-failure-does-not-log-to-sentry-or-geo-log-well-ee' into 'master'

Backport of https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/8926

See merge request gitlab-org/gitlab-ce!24129
parents 732313ca 6670f838
...@@ -289,10 +289,12 @@ module Gitlab ...@@ -289,10 +289,12 @@ module Gitlab
# #
def mv_namespace(storage, old_name, new_name) def mv_namespace(storage, old_name, new_name)
Gitlab::GitalyClient::NamespaceService.new(storage).rename(old_name, new_name) Gitlab::GitalyClient::NamespaceService.new(storage).rename(old_name, new_name)
rescue GRPC::InvalidArgument rescue GRPC::InvalidArgument => e
Gitlab::Sentry.track_acceptable_exception(e, extra: { old_name: old_name, new_name: new_name, storage: storage })
false false
end end
alias_method :mv_directory, :mv_namespace alias_method :mv_directory, :mv_namespace # Note: ShellWorker uses this alias
def url_to_repo(path) def url_to_repo(path)
Gitlab.config.gitlab_shell.ssh_path_prefix + "#{path}.git" Gitlab.config.gitlab_shell.ssh_path_prefix + "#{path}.git"
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment