Merge branch 'pks-update-remote-mirror-accessor' into 'master'

remote: Fix UpdateRemoteMirror having transactional semantics

See merge request gitlab-org/gitaly!3345

5 files changed, 12 insertions, 8 deletions

diff --git a/changelogs/unreleased/pks-update-remote-mirror-accessor.yml b/changelogs/unreleased/pks-update-remote-mirror-accessor.yml
new file mode 100644
index 000000000..91e56bee5
--- /dev/null
+++ b/changelogs/unreleased/pks-update-remote-mirror-accessor.yml
@@ -0,0 +1,5 @@
+---
+title: 'remote: Fix UpdateRemoteMirror having transactional semantics'
+merge_request: 3345
+author:
+type: fixed
diff --git a/internal/praefect/coordinator.go b/internal/praefect/coordinator.go
index 3281a3700..dc1b41529 100644
--- a/internal/praefect/coordinator.go
+++ b/internal/praefect/coordinator.go
@@ -64,7 +64,6 @@ var transactionRPCs = map[string]transactionsCondition{
 	"/gitaly.RemoteService/AddRemote":                        transactionsEnabled,
 	"/gitaly.RemoteService/FetchInternalRemote":              transactionsEnabled,
 	"/gitaly.RemoteService/RemoveRemote":                     transactionsEnabled,
-	"/gitaly.RemoteService/UpdateRemoteMirror":               transactionsEnabled,
 	"/gitaly.RepositoryService/ApplyGitattributes":           transactionsEnabled,
 	"/gitaly.RepositoryService/CloneFromPool":                transactionsEnabled,
 	"/gitaly.RepositoryService/CloneFromPoolInternal":        transactionsEnabled,
diff --git a/internal/praefect/protoregistry/protoregistry_test.go b/internal/praefect/protoregistry/protoregistry_test.go
index 795443e87..1d3d12e15 100644
--- a/internal/praefect/protoregistry/protoregistry_test.go
+++ b/internal/praefect/protoregistry/protoregistry_test.go
@@ -109,7 +109,7 @@ func TestNewProtoRegistry(t *testing.T) {
 			"AddRemote":            protoregistry.OpMutator,
 			"FetchInternalRemote":  protoregistry.OpMutator,
 			"RemoveRemote":         protoregistry.OpMutator,
-			"UpdateRemoteMirror":   protoregistry.OpMutator,
+			"UpdateRemoteMirror":   protoregistry.OpAccessor,
 			"FindRemoteRepository": protoregistry.OpAccessor,
 			"FindRemoteRootRef":    protoregistry.OpAccessor,
 		},
diff --git a/proto/go/gitalypb/remote.pb.go b/proto/go/gitalypb/remote.pb.go
index 73e669b90..fc5e43ff9 100644
--- a/proto/go/gitalypb/remote.pb.go
+++ b/proto/go/gitalypb/remote.pb.go
@@ -797,13 +797,13 @@ var fileDescriptor_eefc82927d57d89b = []byte{
 	0x2e, 0x0b, 0xbb, 0x51, 0x49, 0xf0, 0x48, 0x09, 0x4d, 0x5f, 0x5e, 0xd4, 0xd5, 0xac, 0x82, 0x7a,
 	0x50, 0x4e, 0xd0, 0x06, 0x34, 0xeb, 0x7a, 0xb5, 0xa2, 0x19, 0x37, 0xd6, 0xc6, 0x2c, 0xe5, 0x79,
 	0x0d, 0x85, 0xb8, 0x9a, 0xa2, 0xea, 0x7c, 0x4a, 0x57, 0x84, 0xdc, 0xd8, 0x4d, 0x76, 0x2e, 0x41,
-	0x62, 0x40, 0x57, 0x97, 0x11, 0xed, 0x4d, 0xef, 0xae, 0x94, 0x2e, 0xc3, 0x5c, 0x17, 0xb2, 0x98,
-	0xa4, 0xae, 0xa0, 0x21, 0x6c, 0x27, 0xad, 0x13, 0x9a, 0xb7, 0xbf, 0x7a, 0x99, 0x8d, 0x9b, 0xeb,
-	0x83, 0x64, 0xb2, 0xec, 0xe5, 0x45, 0x5d, 0xcb, 0xaa, 0x45, 0x15, 0x7d, 0x80, 0xd2, 0x95, 0xad,
-	0x40, 0xb5, 0x04, 0x90, 0x85, 0xf5, 0x34, 0xf6, 0xd6, 0x44, 0x2c, 0x34, 0xa4, 0xb6, 0xee, 0xbc,
+	0x62, 0x40, 0x57, 0x97, 0x11, 0xed, 0x4d, 0xef, 0xae, 0x94, 0x2e, 0xc3, 0x5c, 0x17, 0xb2, 0x90,
+	0x44, 0xad, 0x2b, 0x68, 0x08, 0xdb, 0x49, 0xeb, 0x84, 0xe6, 0xed, 0xaf, 0x5e, 0x66, 0xe3, 0xe6,
+	0xfa, 0x20, 0x99, 0x2c, 0x7b, 0x79, 0x51, 0xd7, 0xb2, 0x6a, 0x51, 0x45, 0x1f, 0xa0, 0x74, 0x65,
+	0x2b, 0x50, 0x2d, 0x01, 0x64, 0x61, 0x3d, 0x8d, 0xbd, 0x35, 0x11, 0x8b, 0x0d, 0xb5, 0xee, 0xbc,
 	0xe3, 0xb1, 0x9e, 0xd3, 0x6e, 0x74, 0xc8, 0xa8, 0x29, 0x3e, 0x0f, 0x08, 0xed, 0x37, 0x05, 0x42,
 	0x33, 0xfa, 0x4f, 0x68, 0xf6, 0x89, 0x3c, 0x07, 0xed, 0x76, 0x3a, 0x32, 0xdd, 0xfd, 0x1d, 0x00,
-	0x00, 0xff, 0xff, 0x16, 0xd3, 0x6e, 0xfb, 0x6c, 0x08, 0x00, 0x00,
+	0x00, 0xff, 0xff, 0x03, 0xe4, 0xf2, 0x17, 0x6c, 0x08, 0x00, 0x00,
 }
 
 // Reference imports to suppress errors if they are not otherwise used.
diff --git a/proto/remote.proto b/proto/remote.proto
index e1608d234..c228e3880 100644
--- a/proto/remote.proto
+++ b/proto/remote.proto
@@ -31,7 +31,7 @@ service RemoteService {
     // the patterns specified in the requests.
     rpc UpdateRemoteMirror(stream UpdateRemoteMirrorRequest) returns (UpdateRemoteMirrorResponse) {
       option (op_type) = {
-        op: MUTATOR
+        op: ACCESSOR
       };
     }
     rpc FindRemoteRepository(FindRemoteRepositoryRequest) returns (FindRemoteRepositoryResponse) {