Bridged gitaly exceptionsbridged_gitaly_exceptions

2 files changed, 33 insertions, 1 deletions

diff --git a/lib/gitlab/gitaly_client.rb b/lib/gitlab/gitaly_client.rb
index a3dc2cd0b60..d381bcbfe7f 100644
--- a/lib/gitlab/gitaly_client.rb
+++ b/lib/gitlab/gitaly_client.rb
@@ -55,7 +55,13 @@ module Gitlab
     def self.call(storage, service, rpc, request)
       metadata = request_metadata(storage)
       metadata = yield(metadata) if block_given?
-      stub(service, storage).__send__(rpc, request, metadata) # rubocop:disable GitlabSecurity/PublicSend
+      result = stub(service, storage).__send__(rpc, request, metadata) # rubocop:disable GitlabSecurity/PublicSend
+
+      return Gitlab::GitalyClient::Util.wrap_enumerator(result) if result.is_a?(Enumerator)
+
+      result
+    rescue GRPC::BadStatus => e
+      raise Gitlab::GitalyClient::Util.unwrap_exception(e)
     end
 
     def self.request_metadata(storage)
diff --git a/lib/gitlab/gitaly_client/util.rb b/lib/gitlab/gitaly_client/util.rb
index 8fc937496af..18663af541e 100644
--- a/lib/gitlab/gitaly_client/util.rb
+++ b/lib/gitlab/gitaly_client/util.rb
@@ -1,6 +1,8 @@
 module Gitlab
   module GitalyClient
     module Util
+      BRIDGED_EXCEPTION_WHITELIST = Set.new ['RuntimeError'].freeze
+
       class << self
         def repository(repository_storage, relative_path)
           Gitaly::Repository.new(
@@ -10,6 +12,30 @@ module Gitlab
             git_alternate_object_directories: Array.wrap(Gitlab::Git::Env['GIT_ALTERNATE_OBJECT_DIRECTORIES'])
           )
         end
+
+        def unwrap_exception(exception)
+          return exception unless exception.is_a?(GRPC::BadStatus) && exception.metadata
+
+          original_exception_class = exception.metadata["gitaly-ruby.exception.class"]
+
+          return exception unless BRIDGED_EXCEPTION_WHITELIST.include?(original_exception_class)
+
+          original_exception = Object.const_get(original_exception_class).new exception.message
+          raise original_exception
+        end
+
+        def wrap_enumerator(enumerator)
+          return Enumerator.new do |y|
+            loop do
+              begin
+                y << enumerator.next
+              rescue GRPC::BadStatus => e
+                raise unwrap_exception(e)
+              end
+            end
+          end
+        end
+
       end
     end
   end