Revert "Merge branch 'pks-objectpool-drop-ondisk-remotes' into 'master'"

This reverts commit 369fbdb16 (Merge branch
'pks-objectpool-drop-ondisk-remotes' into 'master', 2021-10-25), which
introduced a regression in Rails' test suite.

2 files changed, 19 insertions, 0 deletions

diff --git a/ruby/proto/gitaly/objectpool_pb.rb b/ruby/proto/gitaly/objectpool_pb.rb
index f841b88b6..cf12ea6a5 100644
--- a/ruby/proto/gitaly/objectpool_pb.rb
+++ b/ruby/proto/gitaly/objectpool_pb.rb
@@ -24,6 +24,12 @@ Google::Protobuf::DescriptorPool.generated_pool.build do
     end
     add_message "gitaly.LinkRepositoryToObjectPoolResponse" do
     end
+    add_message "gitaly.UnlinkRepositoryFromObjectPoolRequest" do
+      optional :repository, :message, 1, "gitaly.Repository"
+      optional :object_pool, :message, 2, "gitaly.ObjectPool"
+    end
+    add_message "gitaly.UnlinkRepositoryFromObjectPoolResponse" do
+    end
     add_message "gitaly.ReduplicateRepositoryRequest" do
       optional :repository, :message, 1, "gitaly.Repository"
     end
@@ -57,6 +63,8 @@ module Gitaly
   DeleteObjectPoolResponse = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("gitaly.DeleteObjectPoolResponse").msgclass
   LinkRepositoryToObjectPoolRequest = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("gitaly.LinkRepositoryToObjectPoolRequest").msgclass
   LinkRepositoryToObjectPoolResponse = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("gitaly.LinkRepositoryToObjectPoolResponse").msgclass
+  UnlinkRepositoryFromObjectPoolRequest = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("gitaly.UnlinkRepositoryFromObjectPoolRequest").msgclass
+  UnlinkRepositoryFromObjectPoolResponse = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("gitaly.UnlinkRepositoryFromObjectPoolResponse").msgclass
   ReduplicateRepositoryRequest = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("gitaly.ReduplicateRepositoryRequest").msgclass
   ReduplicateRepositoryResponse = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("gitaly.ReduplicateRepositoryResponse").msgclass
   DisconnectGitAlternatesRequest = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("gitaly.DisconnectGitAlternatesRequest").msgclass
diff --git a/ruby/proto/gitaly/objectpool_services_pb.rb b/ruby/proto/gitaly/objectpool_services_pb.rb
index 1abbb56d0..e8c932bfd 100644
--- a/ruby/proto/gitaly/objectpool_services_pb.rb
+++ b/ruby/proto/gitaly/objectpool_services_pb.rb
@@ -18,6 +18,17 @@ module Gitaly
       rpc :DeleteObjectPool, Gitaly::DeleteObjectPoolRequest, Gitaly::DeleteObjectPoolResponse
       # Repositories are assumed to be stored on the same disk
       rpc :LinkRepositoryToObjectPool, Gitaly::LinkRepositoryToObjectPoolRequest, Gitaly::LinkRepositoryToObjectPoolResponse
+      # UnlinkRepositoryFromObjectPool does not unlink the repository from the
+      # object pool as you'd think, but all it really does is to remove the object
+      # pool's remote pointing to the repository. And even this is a no-op given
+      # that we'd try to remove the remote by the repository's `GlRepository()`
+      # name, which we never create in the first place. To unlink repositories
+      # from an object pool, you'd really want to execute DisconnectGitAlternates
+      # to remove the repository's link to the pool's object database.
+      #
+      # This function is never called by anyone and highly misleading. It's thus
+      # deprecated and will be removed in v14.4.
+      rpc :UnlinkRepositoryFromObjectPool, Gitaly::UnlinkRepositoryFromObjectPoolRequest, Gitaly::UnlinkRepositoryFromObjectPoolResponse
       rpc :ReduplicateRepository, Gitaly::ReduplicateRepositoryRequest, Gitaly::ReduplicateRepositoryResponse
       rpc :DisconnectGitAlternates, Gitaly::DisconnectGitAlternatesRequest, Gitaly::DisconnectGitAlternatesResponse
       rpc :FetchIntoObjectPool, Gitaly::FetchIntoObjectPoolRequest, Gitaly::FetchIntoObjectPoolResponse