diff options
| author | Stan Hu <stanhu@gmail.com> | 2019-01-04 21:42:02 +0000 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2019-01-04 21:42:02 +0000 |
| commit | 7380364240a26d184d67edb1fe7ae0fc07217e0f (patch) | |
| tree | 27b42210d3722365a5f57d36c817c957cec60504 | |
| parent | 732313caff0b836686dd768564eb469f63765a66 (diff) | |
| parent | 6670f838b5bd207bab35c0350e17ecb0a4dace96 (diff) | |
| download | gitlab-ce-7380364240a26d184d67edb1fe7ae0fc07217e0f.tar.gz | |
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
| -rw-r--r-- | lib/gitlab/shell.rb | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/lib/gitlab/shell.rb b/lib/gitlab/shell.rb index c6a6fb9b5ce..bdf21cf3134 100644 --- a/lib/gitlab/shell.rb +++ b/lib/gitlab/shell.rb @@ -289,10 +289,12 @@ module Gitlab # def mv_namespace(storage, 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 end - alias_method :mv_directory, :mv_namespace + alias_method :mv_directory, :mv_namespace # Note: ShellWorker uses this alias def url_to_repo(path) Gitlab.config.gitlab_shell.ssh_path_prefix + "#{path}.git" |