Add FetchInternalRemoteErrorOnFailure as an RPC that throws an error when the result is falsejc-fetch_remote_error_on_failure

6 files changed, 139 insertions, 49 deletions

diff --git a/changelogs/unreleased/jc-fetch_remote_error_on_failure.yml b/changelogs/unreleased/jc-fetch_remote_error_on_failure.yml
new file mode 100644
index 000000000..bbda44646
--- /dev/null
+++ b/changelogs/unreleased/jc-fetch_remote_error_on_failure.yml
@@ -0,0 +1,6 @@
+---
+title: Add FetchInternalRemoteErrorOnFailure as an RPC that throws an error when the
+  result is false
+merge_request: 1848
+author:
+type: changed
diff --git a/internal/service/remote/fetch_internal_remote.go b/internal/service/remote/fetch_internal_remote.go
index c8eaed507..fc61d7b82 100644
--- a/internal/service/remote/fetch_internal_remote.go
+++ b/internal/service/remote/fetch_internal_remote.go
@@ -2,8 +2,10 @@ package remote
 
 import (
 	"context"
+	"errors"
 	"fmt"
 
+	"gitlab.com/gitlab-org/gitaly/internal/helper"
 	"gitlab.com/gitlab-org/gitaly/internal/rubyserver"
 	"gitlab.com/gitlab-org/gitaly/proto/go/gitalypb"
 	"google.golang.org/grpc/codes"
@@ -40,3 +42,14 @@ func validateFetchInternalRemoteRequest(req *gitalypb.FetchInternalRemoteRequest
 
 	return nil
 }
+
+// FetchInternalRemoteErrorOnFailure fetches another Gitaly repository set as a remote
+func (s *server) FetchInternalRemoteErrorOnFailure(ctx context.Context, req *gitalypb.FetchInternalRemoteRequest) (*gitalypb.FetchInternalRemoteResponse, error) {
+	resp, err := s.FetchInternalRemote(ctx, req)
+
+	if !resp.Result {
+		return nil, helper.ErrInternal(errors.New("fetch failed"))
+	}
+
+	return resp, err
+}
diff --git a/internal/service/remote/fetch_internal_remote_test.go b/internal/service/remote/fetch_internal_remote_test.go
index e752bffb3..e5236b253 100644
--- a/internal/service/remote/fetch_internal_remote_test.go
+++ b/internal/service/remote/fetch_internal_remote_test.go
@@ -77,6 +77,34 @@ func TestFailedFetchInternalRemote(t *testing.T) {
 	require.False(t, c.GetResult())
 }
 
+func TestFailedFetchInternalRemoteOnError(t *testing.T) {
+	server, serverSocketPath := runFullServer(t)
+	defer server.Stop()
+
+	client, conn := remote.NewRemoteClient(t, serverSocketPath)
+	defer conn.Close()
+
+	repo, _, cleanupFn := testhelper.InitBareRepo(t)
+	defer cleanupFn()
+
+	ctxOuter, cancel := testhelper.Context()
+	defer cancel()
+
+	md := testhelper.GitalyServersMetadata(t, serverSocketPath)
+	ctx := metadata.NewOutgoingContext(ctxOuter, md)
+
+	// Non-existing remote repo
+	remoteRepo := &gitalypb.Repository{StorageName: "default", RelativePath: "fake.git"}
+
+	request := &gitalypb.FetchInternalRemoteRequest{
+		Repository:       repo,
+		RemoteRepository: remoteRepo,
+	}
+
+	_, err := client.FetchInternalRemoteErrorOnFailure(ctx, request)
+	require.Error(t, err)
+}
+
 func TestFailedFetchInternalRemoteDueToValidations(t *testing.T) {
 	server, serverSocketPath := runFullServer(t)
 	defer server.Stop()
diff --git a/proto/go/gitalypb/remote.pb.go b/proto/go/gitalypb/remote.pb.go
index 35119836a..96bef27fa 100644
--- a/proto/go/gitalypb/remote.pb.go
+++ b/proto/go/gitalypb/remote.pb.go
@@ -721,55 +721,56 @@ func init() {
 func init() { proto.RegisterFile("remote.proto", fileDescriptor_eefc82927d57d89b) }
 
 var fileDescriptor_eefc82927d57d89b = []byte{
-	// 753 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x56, 0xc9, 0x6e, 0xd3, 0x40,
-	0x18, 0x96, 0x93, 0x34, 0xcb, 0x9f, 0x14, 0x25, 0x93, 0xaa, 0x38, 0x4e, 0x25, 0x52, 0x03, 0x92,
-	0x0f, 0x34, 0xa9, 0xca, 0x22, 0x0e, 0x48, 0x88, 0x0a, 0xa1, 0xb2, 0xb4, 0x02, 0x43, 0x2f, 0x5c,
-	0x8c, 0x93, 0x8c, 0x63, 0x2b, 0x8e, 0xc7, 0xcc, 0x38, 0x85, 0xbc, 0x05, 0xb7, 0x72, 0xe0, 0x05,
-	0xb8, 0xf0, 0x18, 0x3c, 0x54, 0x4f, 0x68, 0x3c, 0xe3, 0xc4, 0x69, 0x9d, 0x70, 0x28, 0xdc, 0x3c,
-	0xdf, 0xbf, 0x7d, 0xff, 0x2a, 0x43, 0x8d, 0xe2, 0x09, 0x89, 0x70, 0x37, 0xa4, 0x24, 0x22, 0xa8,
-	0x38, 0xf2, 0x22, 0xdb, 0x9f, 0x69, 0x35, 0xe6, 0xda, 0x14, 0x0f, 0x05, 0xaa, 0xff, 0x52, 0xa0,
-	0xfe, 0x6c, 0x38, 0x34, 0x63, 0x4d, 0x13, 0x7f, 0x9e, 0x62, 0x16, 0xa1, 0xc7, 0x00, 0x14, 0x87,
-	0x84, 0x79, 0x11, 0xa1, 0x33, 0x55, 0xe9, 0x28, 0x46, 0xf5, 0x00, 0x75, 0x85, 0x7d, 0xd7, 0x9c,
-	0x4b, 0x0e, 0x0b, 0xdf, 0x7f, 0xdf, 0x53, 0xcc, 0x94, 0x2e, 0x42, 0x50, 0x08, 0xec, 0x09, 0x56,
-	0x73, 0x1d, 0xc5, 0xa8, 0x98, 0xf1, 0x37, 0xaa, 0x43, 0x7e, 0x4a, 0x7d, 0x35, 0x1f, 0x43, 0xfc,
-	0x13, 0xdd, 0x85, 0x1b, 0x13, 0x8f, 0x52, 0x42, 0x2d, 0x8a, 0x9d, 0x89, 0x1d, 0x32, 0x75, 0xa3,
-	0x93, 0x37, 0x2a, 0xe6, 0xa6, 0x40, 0x4d, 0x01, 0xbe, 0x2a, 0x94, 0x0b, 0xf5, 0x8d, 0x04, 0x94,
-	0xaa, 0x7a, 0x13, 0x1a, 0x29, 0xbe, 0x2c, 0x24, 0x01, 0xc3, 0xfa, 0x00, 0x9a, 0x1c, 0x39, 0xc3,
-	0xff, 0x31, 0x0f, 0xbd, 0x0b, 0x5b, 0xcb, 0x41, 0x44, 0x70, 0xb4, 0x0d, 0x45, 0x8a, 0xd9, 0xd4,
-	0x8f, 0xe2, 0x08, 0x65, 0x53, 0xbe, 0xf4, 0x73, 0x05, 0xb4, 0x17, 0x38, 0x1a, 0xb8, 0x2f, 0x83,
-	0x08, 0xd3, 0xc0, 0xf6, 0xff, 0x15, 0xb9, 0xa7, 0xd0, 0x10, 0x9d, 0xb5, 0x52, 0x0e, 0x72, 0xab,
-	0x1c, 0x98, 0x75, 0x2a, 0xe3, 0x26, 0x88, 0xfe, 0x10, 0xda, 0x99, 0xc4, 0xfe, 0x92, 0xd0, 0xb7,
-	0x1c, 0xb4, 0x4e, 0xc3, 0xa1, 0x1d, 0xc9, 0x0a, 0x1c, 0xcb, 0x6e, 0x5d, 0x37, 0x9f, 0x16, 0x94,
-	0x29, 0x76, 0xac, 0x54, 0xc1, 0x4b, 0x14, 0x3b, 0x27, 0x7c, 0x76, 0x1e, 0xc0, 0x36, 0x09, 0xfc,
-	0x99, 0xd5, 0xa7, 0x76, 0x30, 0x70, 0x31, 0xb3, 0x26, 0x76, 0x34, 0x70, 0xbd, 0x60, 0xa4, 0xe6,
-	0x3b, 0x79, 0xa3, 0x66, 0x6e, 0x71, 0xe9, 0xa1, 0x14, 0x1e, 0x4b, 0x19, 0xba, 0x09, 0x25, 0xc6,
-	0x5c, 0x6b, 0x8c, 0x67, 0x6a, 0x21, 0xf6, 0x57, 0x64, 0xcc, 0x7d, 0x8d, 0x67, 0xe8, 0x16, 0x54,
-	0xc7, 0x01, 0xf9, 0x12, 0x58, 0x2e, 0x61, 0x11, 0x9f, 0x3a, 0x2e, 0x84, 0x18, 0x3a, 0xe2, 0x08,
-	0xea, 0x42, 0x73, 0x8c, 0x71, 0x68, 0x0d, 0xbd, 0x33, 0x4c, 0x47, 0x38, 0x88, 0xf8, 0xd8, 0x31,
-	0xb5, 0x18, 0xd7, 0xa1, 0xc1, 0x45, 0xcf, 0x13, 0x89, 0x89, 0x1d, 0xa6, 0xef, 0x80, 0x96, 0x55,
-	0x11, 0x39, 0x96, 0xbc, 0xce, 0x5e, 0x30, 0x1f, 0xd6, 0x79, 0x47, 0x64, 0xc5, 0xe2, 0x3a, 0x73,
-	0x51, 0x5c, 0xad, 0x8a, 0x29, 0x5f, 0xfa, 0x23, 0xd8, 0xc9, 0x36, 0x5b, 0xf4, 0x07, 0x7f, 0xf5,
-	0x78, 0x02, 0xb2, 0x3f, 0xe2, 0xa5, 0xfb, 0xa0, 0xa6, 0xec, 0x08, 0xe1, 0x14, 0xaf, 0xdf, 0x9d,
-	0x05, 0xcb, 0xdc, 0x12, 0xcb, 0x3d, 0x68, 0x65, 0x44, 0x93, 0x14, 0xeb, 0x90, 0xa7, 0xd8, 0x91,
-	0x79, 0xf1, 0x4f, 0xfd, 0x04, 0xd0, 0x1b, 0x8f, 0x45, 0x42, 0x9d, 0x5d, 0x9b, 0x96, 0xfe, 0x53,
-	0x81, 0xe6, 0x92, 0x43, 0x19, 0xf9, 0x09, 0x94, 0x04, 0x41, 0x5e, 0x9d, 0xbc, 0x51, 0x3d, 0xd0,
-	0x13, 0x77, 0x19, 0xda, 0x5d, 0xc9, 0x3e, 0x31, 0xd1, 0x3e, 0x40, 0x51, 0x40, 0xf3, 0x0b, 0xa0,
-	0xa4, 0x2e, 0x59, 0x1b, 0x2a, 0x0e, 0xdf, 0x1b, 0x8b, 0xdf, 0x33, 0x51, 0x8d, 0x72, 0x0c, 0x9c,
-	0x52, 0x9f, 0x4f, 0x71, 0x38, 0x65, 0x42, 0x26, 0x6e, 0x5d, 0x89, 0xbf, 0x4f, 0xa9, 0x7f, 0xf0,
-	0x63, 0x03, 0x36, 0x85, 0xdb, 0xf7, 0x98, 0x9e, 0x79, 0x03, 0x8c, 0x8e, 0xa0, 0x32, 0xbf, 0x62,
-	0x48, 0x4d, 0x18, 0x5e, 0x3e, 0xc4, 0x5a, 0x2b, 0x43, 0x22, 0x67, 0xab, 0x78, 0x71, 0x6e, 0xe4,
-	0xca, 0x0a, 0x72, 0xa0, 0x99, 0xb1, 0xcb, 0x68, 0x9e, 0xf5, 0xea, 0x0b, 0xa4, 0xdd, 0x5e, 0xab,
-	0x73, 0x29, 0xce, 0x3b, 0xa8, 0xa5, 0xaf, 0x1f, 0x6a, 0x2f, 0xba, 0x74, 0xe5, 0xf0, 0x6a, 0x3b,
-	0xd9, 0xc2, 0x4b, 0x2e, 0x31, 0xa0, 0xab, 0xcb, 0x83, 0x76, 0x13, 0xdb, 0x95, 0xa7, 0x46, 0xd3,
-	0xd7, 0xa9, 0x2c, 0x07, 0x31, 0x14, 0x34, 0x86, 0xad, 0xac, 0x75, 0x42, 0x8b, 0xf4, 0x57, 0xef,
-	0xa8, 0x76, 0x67, 0xbd, 0x92, 0x0c, 0x56, 0xbe, 0x38, 0x37, 0x0a, 0xe5, 0x5c, 0x5d, 0x41, 0x9f,
-	0xa0, 0x71, 0x65, 0x2b, 0x50, 0x27, 0xc3, 0xc9, 0xd2, 0x7a, 0x6a, 0xbb, 0x6b, 0x34, 0x96, 0x12,
-	0xca, 0xa1, 0xb7, 0x50, 0x4d, 0x4d, 0x32, 0xd2, 0x32, 0xc7, 0x5b, 0x78, 0x6d, 0xaf, 0x19, 0xfd,
-	0xc4, 0xdf, 0xbe, 0x72, 0xb8, 0xff, 0x91, 0xeb, 0xf9, 0x76, 0xbf, 0x3b, 0x20, 0x93, 0x9e, 0xf8,
-	0xdc, 0x23, 0x74, 0xd4, 0x13, 0xd6, 0xbd, 0xf8, 0x4f, 0xa1, 0x37, 0x22, 0xf2, 0x1d, 0xf6, 0xfb,
-	0xc5, 0x18, 0xba, 0xff, 0x27, 0x00, 0x00, 0xff, 0xff, 0x84, 0x8d, 0xa5, 0xca, 0x62, 0x08, 0x00,
-	0x00,
+	// 770 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x56, 0xdd, 0x6e, 0xd2, 0x50,
+	0x1c, 0x4f, 0x81, 0x15, 0xf8, 0xc3, 0x0c, 0x1c, 0x96, 0x59, 0xca, 0x12, 0x59, 0xd5, 0xa4, 0x17,
+	0x0e, 0x96, 0xf9, 0x11, 0x2f, 0x4c, 0x8c, 0x8b, 0x2e, 0xf3, 0x63, 0x53, 0xab, 0xbb, 0xf1, 0xa6,
+	0x16, 0x38, 0x40, 0x43, 0xe9, 0xa9, 0xe7, 0x94, 0x29, 0x6f, 0x61, 0xbc, 0x99, 0xaf, 0xe0, 0x8d,
+	0x8f, 0xe1, 0x43, 0xed, 0xca, 0x9c, 0x9e, 0x53, 0x28, 0x5b, 0xc1, 0x8b, 0xb9, 0xbb, 0x9e, 0xdf,
+	0xff, 0xfb, 0xeb, 0x97, 0x42, 0x99, 0xe2, 0x31, 0x09, 0x71, 0x2b, 0xa0, 0x24, 0x24, 0x48, 0x1d,
+	0xb8, 0xa1, 0xe3, 0x4d, 0xf5, 0x32, 0x1b, 0x3a, 0x14, 0xf7, 0x04, 0x6a, 0xfc, 0x56, 0xa0, 0xf2,
+	0xac, 0xd7, 0xb3, 0x22, 0x4d, 0x0b, 0x7f, 0x99, 0x60, 0x16, 0xa2, 0xc7, 0x00, 0x14, 0x07, 0x84,
+	0xb9, 0x21, 0xa1, 0x53, 0x4d, 0x69, 0x2a, 0x66, 0x69, 0x0f, 0xb5, 0x84, 0x7d, 0xcb, 0x9a, 0x49,
+	0xf6, 0x73, 0x3f, 0xff, 0xdc, 0x53, 0xac, 0x84, 0x2e, 0x42, 0x90, 0xf3, 0x9d, 0x31, 0xd6, 0x32,
+	0x4d, 0xc5, 0x2c, 0x5a, 0xd1, 0x37, 0xaa, 0x40, 0x76, 0x42, 0x3d, 0x2d, 0x1b, 0x41, 0xfc, 0x13,
+	0xdd, 0x85, 0x1b, 0x63, 0x97, 0x52, 0x42, 0x6d, 0x8a, 0xfb, 0x63, 0x27, 0x60, 0xda, 0x5a, 0x33,
+	0x6b, 0x16, 0xad, 0x75, 0x81, 0x5a, 0x02, 0x7c, 0x95, 0x2b, 0xe4, 0x2a, 0x6b, 0x31, 0x28, 0x55,
+	0x8d, 0x1a, 0x54, 0x13, 0xf9, 0xb2, 0x80, 0xf8, 0x0c, 0x1b, 0x5d, 0xa8, 0x71, 0xe4, 0x14, 0x5f,
+	0x63, 0x1d, 0x46, 0x0b, 0x36, 0x16, 0x83, 0x88, 0xe0, 0x68, 0x13, 0x54, 0x8a, 0xd9, 0xc4, 0x0b,
+	0xa3, 0x08, 0x05, 0x4b, 0xbe, 0x8c, 0x33, 0x05, 0xf4, 0x03, 0x1c, 0x76, 0x87, 0x2f, 0xfd, 0x10,
+	0x53, 0xdf, 0xf1, 0xfe, 0x57, 0x72, 0x4f, 0xa1, 0x2a, 0x26, 0x6b, 0x27, 0x1c, 0x64, 0x96, 0x39,
+	0xb0, 0x2a, 0x54, 0xc6, 0x8d, 0x11, 0xe3, 0x21, 0x34, 0x52, 0x13, 0xfb, 0x47, 0x41, 0xdf, 0x33,
+	0x50, 0x3f, 0x09, 0x7a, 0x4e, 0x28, 0x3b, 0x70, 0x24, 0xa7, 0x75, 0xd5, 0x7a, 0xea, 0x50, 0xa0,
+	0xb8, 0x6f, 0x27, 0x1a, 0x9e, 0xa7, 0xb8, 0x7f, 0xcc, 0x77, 0xe7, 0x01, 0x6c, 0x12, 0xdf, 0x9b,
+	0xda, 0x1d, 0xea, 0xf8, 0xdd, 0x21, 0x66, 0xf6, 0xd8, 0x09, 0xbb, 0x43, 0xd7, 0x1f, 0x68, 0xd9,
+	0x66, 0xd6, 0x2c, 0x5b, 0x1b, 0x5c, 0xba, 0x2f, 0x85, 0x47, 0x52, 0x86, 0x6e, 0x42, 0x9e, 0xb1,
+	0xa1, 0x3d, 0xc2, 0x53, 0x2d, 0x17, 0xf9, 0x53, 0x19, 0x1b, 0xbe, 0xc6, 0x53, 0x74, 0x0b, 0x4a,
+	0x23, 0x9f, 0x7c, 0xf5, 0xed, 0x21, 0x61, 0x21, 0xdf, 0x3a, 0x2e, 0x84, 0x08, 0x3a, 0xe4, 0x08,
+	0x6a, 0x41, 0x6d, 0x84, 0x71, 0x60, 0xf7, 0xdc, 0x53, 0x4c, 0x07, 0xd8, 0x0f, 0xf9, 0xda, 0x31,
+	0x4d, 0x8d, 0xfa, 0x50, 0xe5, 0xa2, 0xe7, 0xb1, 0xc4, 0xc2, 0x7d, 0x66, 0x6c, 0x81, 0x9e, 0xd6,
+	0x11, 0xb9, 0x96, 0xbc, 0xcf, 0xae, 0x3f, 0x5b, 0xd6, 0xd9, 0x44, 0x64, 0xc7, 0xa2, 0x3e, 0x73,
+	0x51, 0xd4, 0xad, 0xa2, 0x25, 0x5f, 0xc6, 0x23, 0xd8, 0x4a, 0x37, 0x9b, 0xcf, 0x07, 0x7f, 0x73,
+	0x79, 0x01, 0x72, 0x3e, 0xe2, 0x65, 0x78, 0xa0, 0x25, 0xec, 0x08, 0xe1, 0x29, 0x5e, 0x7d, 0x3a,
+	0xf3, 0x2c, 0x33, 0x0b, 0x59, 0xee, 0x40, 0x3d, 0x25, 0x9a, 0x4c, 0xb1, 0x02, 0x59, 0x8a, 0xfb,
+	0xb2, 0x2e, 0xfe, 0x69, 0x1c, 0x03, 0x7a, 0xe3, 0xb2, 0x50, 0xa8, 0xb3, 0x2b, 0xa7, 0x65, 0xfc,
+	0x52, 0xa0, 0xb6, 0xe0, 0x50, 0x46, 0x7e, 0x02, 0x79, 0x91, 0x20, 0xef, 0x4e, 0xd6, 0x2c, 0xed,
+	0x19, 0xb1, 0xbb, 0x14, 0xed, 0x96, 0xcc, 0x3e, 0x36, 0xd1, 0x3f, 0x82, 0x2a, 0xa0, 0x19, 0x03,
+	0x28, 0x09, 0x26, 0x6b, 0x40, 0xb1, 0xcf, 0xef, 0xc6, 0xe6, 0x7c, 0x26, 0xba, 0x51, 0x88, 0x80,
+	0x13, 0xea, 0xf1, 0x2d, 0x0e, 0x26, 0x4c, 0xc8, 0x04, 0xd7, 0xe5, 0xf9, 0xfb, 0x84, 0x7a, 0x7b,
+	0x3f, 0x54, 0x58, 0x17, 0x6e, 0x3f, 0x60, 0x7a, 0xea, 0x76, 0x31, 0x3a, 0x84, 0xe2, 0x8c, 0xc5,
+	0x90, 0x16, 0x67, 0x78, 0x91, 0x88, 0xf5, 0x7a, 0x8a, 0x44, 0xee, 0x96, 0x7a, 0x7e, 0x66, 0x66,
+	0x0a, 0x0a, 0xea, 0x43, 0x2d, 0xe5, 0x96, 0xd1, 0xac, 0xea, 0xe5, 0x0c, 0xa4, 0xdf, 0x5e, 0xa9,
+	0x73, 0x21, 0x4e, 0x08, 0xdb, 0x29, 0x6a, 0x2f, 0xf8, 0xbe, 0xbf, 0xf5, 0x0f, 0x1c, 0xd7, 0x9b,
+	0xd0, 0x6b, 0x88, 0xfa, 0x1e, 0xca, 0x49, 0xce, 0x45, 0x8d, 0xf9, 0x6e, 0x5c, 0xa2, 0x7b, 0x7d,
+	0x2b, 0x5d, 0x78, 0xc1, 0x25, 0x06, 0x74, 0xf9, 0x64, 0xd1, 0x76, 0x6c, 0xbb, 0x94, 0xe0, 0x74,
+	0x63, 0x95, 0xca, 0x62, 0x10, 0x53, 0x41, 0x23, 0xd8, 0x48, 0x3b, 0x62, 0x34, 0x2f, 0x7f, 0x39,
+	0x33, 0xe8, 0x77, 0x56, 0x2b, 0xc9, 0x60, 0x85, 0xf3, 0x33, 0x33, 0x57, 0xc8, 0x54, 0x14, 0xf4,
+	0x19, 0xaa, 0x97, 0x6e, 0x11, 0x35, 0x53, 0x9c, 0x2c, 0x90, 0x82, 0xbe, 0xbd, 0x42, 0x63, 0xa1,
+	0xa0, 0x0c, 0x7a, 0x07, 0xa5, 0xc4, 0xfd, 0x20, 0x3d, 0xf5, 0xa8, 0x84, 0xd7, 0xc6, 0x8a, 0x83,
+	0x8b, 0xfd, 0xed, 0x2a, 0xfb, 0xbb, 0x9f, 0xb8, 0x9e, 0xe7, 0x74, 0x5a, 0x5d, 0x32, 0x6e, 0x8b,
+	0xcf, 0x1d, 0x42, 0x07, 0x6d, 0x61, 0xdd, 0x8e, 0xfe, 0x4f, 0xda, 0x03, 0x22, 0xdf, 0x41, 0xa7,
+	0xa3, 0x46, 0xd0, 0xfd, 0xbf, 0x01, 0x00, 0x00, 0xff, 0xff, 0x9d, 0x09, 0x48, 0x95, 0xd8, 0x08,
+	0x00, 0x00,
 }
 
 // Reference imports to suppress errors if they are not otherwise used.
@@ -786,6 +787,7 @@ const _ = grpc.SupportPackageIsVersion4
 type RemoteServiceClient interface {
 	AddRemote(ctx context.Context, in *AddRemoteRequest, opts ...grpc.CallOption) (*AddRemoteResponse, error)
 	FetchInternalRemote(ctx context.Context, in *FetchInternalRemoteRequest, opts ...grpc.CallOption) (*FetchInternalRemoteResponse, error)
+	FetchInternalRemoteErrorOnFailure(ctx context.Context, in *FetchInternalRemoteRequest, opts ...grpc.CallOption) (*FetchInternalRemoteResponse, error)
 	RemoveRemote(ctx context.Context, in *RemoveRemoteRequest, opts ...grpc.CallOption) (*RemoveRemoteResponse, error)
 	UpdateRemoteMirror(ctx context.Context, opts ...grpc.CallOption) (RemoteService_UpdateRemoteMirrorClient, error)
 	FindRemoteRepository(ctx context.Context, in *FindRemoteRepositoryRequest, opts ...grpc.CallOption) (*FindRemoteRepositoryResponse, error)
@@ -819,6 +821,15 @@ func (c *remoteServiceClient) FetchInternalRemote(ctx context.Context, in *Fetch
 	return out, nil
 }
 
+func (c *remoteServiceClient) FetchInternalRemoteErrorOnFailure(ctx context.Context, in *FetchInternalRemoteRequest, opts ...grpc.CallOption) (*FetchInternalRemoteResponse, error) {
+	out := new(FetchInternalRemoteResponse)
+	err := c.cc.Invoke(ctx, "/gitaly.RemoteService/FetchInternalRemoteErrorOnFailure", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
 func (c *remoteServiceClient) RemoveRemote(ctx context.Context, in *RemoveRemoteRequest, opts ...grpc.CallOption) (*RemoveRemoteResponse, error) {
 	out := new(RemoveRemoteResponse)
 	err := c.cc.Invoke(ctx, "/gitaly.RemoteService/RemoveRemote", in, out, opts...)
@@ -916,6 +927,7 @@ func (x *remoteServiceListRemotesClient) Recv() (*ListRemotesResponse, error) {
 type RemoteServiceServer interface {
 	AddRemote(context.Context, *AddRemoteRequest) (*AddRemoteResponse, error)
 	FetchInternalRemote(context.Context, *FetchInternalRemoteRequest) (*FetchInternalRemoteResponse, error)
+	FetchInternalRemoteErrorOnFailure(context.Context, *FetchInternalRemoteRequest) (*FetchInternalRemoteResponse, error)
 	RemoveRemote(context.Context, *RemoveRemoteRequest) (*RemoveRemoteResponse, error)
 	UpdateRemoteMirror(RemoteService_UpdateRemoteMirrorServer) error
 	FindRemoteRepository(context.Context, *FindRemoteRepositoryRequest) (*FindRemoteRepositoryResponse, error)
@@ -933,6 +945,9 @@ func (*UnimplementedRemoteServiceServer) AddRemote(ctx context.Context, req *Add
 func (*UnimplementedRemoteServiceServer) FetchInternalRemote(ctx context.Context, req *FetchInternalRemoteRequest) (*FetchInternalRemoteResponse, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method FetchInternalRemote not implemented")
 }
+func (*UnimplementedRemoteServiceServer) FetchInternalRemoteErrorOnFailure(ctx context.Context, req *FetchInternalRemoteRequest) (*FetchInternalRemoteResponse, error) {
+	return nil, status.Errorf(codes.Unimplemented, "method FetchInternalRemoteErrorOnFailure not implemented")
+}
 func (*UnimplementedRemoteServiceServer) RemoveRemote(ctx context.Context, req *RemoveRemoteRequest) (*RemoveRemoteResponse, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method RemoveRemote not implemented")
 }
@@ -989,6 +1004,24 @@ func _RemoteService_FetchInternalRemote_Handler(srv interface{}, ctx context.Con
 	return interceptor(ctx, in, info, handler)
 }
 
+func _RemoteService_FetchInternalRemoteErrorOnFailure_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(FetchInternalRemoteRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(RemoteServiceServer).FetchInternalRemoteErrorOnFailure(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/gitaly.RemoteService/FetchInternalRemoteErrorOnFailure",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(RemoteServiceServer).FetchInternalRemoteErrorOnFailure(ctx, req.(*FetchInternalRemoteRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
 func _RemoteService_RemoveRemote_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
 	in := new(RemoveRemoteRequest)
 	if err := dec(in); err != nil {
@@ -1103,6 +1136,10 @@ var _RemoteService_serviceDesc = grpc.ServiceDesc{
 			Handler:    _RemoteService_FetchInternalRemote_Handler,
 		},
 		{
+			MethodName: "FetchInternalRemoteErrorOnFailure",
+			Handler:    _RemoteService_FetchInternalRemoteErrorOnFailure_Handler,
+		},
+		{
 			MethodName: "RemoveRemote",
 			Handler:    _RemoteService_RemoveRemote_Handler,
 		},
diff --git a/proto/remote.proto b/proto/remote.proto
index 2f7970c89..32e59c5f1 100644
--- a/proto/remote.proto
+++ b/proto/remote.proto
@@ -17,6 +17,11 @@ service RemoteService {
         op: MUTATOR
       };
     }
+    rpc FetchInternalRemoteErrorOnFailure(FetchInternalRemoteRequest) returns (FetchInternalRemoteResponse) {
+        option (op_type) = {
+        op: MUTATOR
+      };
+    }
     rpc RemoveRemote(RemoveRemoteRequest) returns (RemoveRemoteResponse) {
       option (op_type) = {
         op: MUTATOR
diff --git a/ruby/proto/gitaly/remote_services_pb.rb b/ruby/proto/gitaly/remote_services_pb.rb
index b97cc6a02..26da651d7 100644
--- a/ruby/proto/gitaly/remote_services_pb.rb
+++ b/ruby/proto/gitaly/remote_services_pb.rb
@@ -16,6 +16,7 @@ module Gitaly
 
       rpc :AddRemote, AddRemoteRequest, AddRemoteResponse
       rpc :FetchInternalRemote, FetchInternalRemoteRequest, FetchInternalRemoteResponse
+      rpc :FetchInternalRemoteErrorOnFailure, FetchInternalRemoteRequest, FetchInternalRemoteResponse
       rpc :RemoveRemote, RemoveRemoteRequest, RemoveRemoteResponse
       rpc :UpdateRemoteMirror, stream(UpdateRemoteMirrorRequest), UpdateRemoteMirrorResponse
       rpc :FindRemoteRepository, FindRemoteRepositoryRequest, FindRemoteRepositoryResponse