diff options
| author | Valery Sizov <valery@gitlab.com> | 2019-01-03 23:03:35 +0200 |
|---|---|---|
| committer | Valery Sizov <valery@gitlab.com> | 2019-01-04 20:49:01 +0200 |
| commit | 6670f838b5bd207bab35c0350e17ecb0a4dace96 (patch) | |
| tree | 8b89f09bd9d2cc6eb889de3efe202575714496b7 | |
| parent | 3a60173738c277b7ad7da31ebb577d1aaf694485 (diff) | |
| download | gitlab-ce-4553-geo-hashed-storage-migration-failure-does-not-log-to-sentry-or-geo-log-well-ee.tar.gz | |
Track Sentry error when namespace cannot be moved4553-geo-hashed-storage-migration-failure-does-not-log-to-sentry-or-geo-log-well-ee
Backport of https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/8926
| -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" |