Merge branch 'pks-objectpool-fetch-df-conflict' into 'master'

objectpool: Fix conflicting references when fetching into pools

Closes #4373

See merge request gitlab-org/gitaly!4745

2 files changed, 4 insertions, 2 deletions

diff --git a/ruby/proto/gitaly/objectpool_pb.rb b/ruby/proto/gitaly/objectpool_pb.rb
index ebbe7fa8f..f022a19d6 100644
--- a/ruby/proto/gitaly/objectpool_pb.rb
+++ b/ruby/proto/gitaly/objectpool_pb.rb
@@ -37,7 +37,6 @@ Google::Protobuf::DescriptorPool.generated_pool.build do
     add_message "gitaly.FetchIntoObjectPoolRequest" do
       optional :origin, :message, 1, "gitaly.Repository"
       optional :object_pool, :message, 2, "gitaly.ObjectPool"
-      optional :repack, :bool, 3
     end
     add_message "gitaly.FetchIntoObjectPoolResponse" do
     end
diff --git a/ruby/proto/gitaly/objectpool_services_pb.rb b/ruby/proto/gitaly/objectpool_services_pb.rb
index d0529fa3d..fe12b6ab2 100644
--- a/ruby/proto/gitaly/objectpool_services_pb.rb
+++ b/ruby/proto/gitaly/objectpool_services_pb.rb
@@ -28,7 +28,10 @@ module Gitaly
       rpc :ReduplicateRepository, ::Gitaly::ReduplicateRepositoryRequest, ::Gitaly::ReduplicateRepositoryResponse
       # This comment is left unintentionally blank.
       rpc :DisconnectGitAlternates, ::Gitaly::DisconnectGitAlternatesRequest, ::Gitaly::DisconnectGitAlternatesResponse
-      # This comment is left unintentionally blank.
+      # FetchIntoObjectPool fetches all references from a pool member into an object pool so that
+      # objects shared between this repository and other pool members can be deduplicated. This RPC
+      # will perform housekeeping tasks after the object pool has been updated to ensure that the pool
+      # is in an optimal state.
       rpc :FetchIntoObjectPool, ::Gitaly::FetchIntoObjectPoolRequest, ::Gitaly::FetchIntoObjectPoolResponse
       # This comment is left unintentionally blank.
       rpc :GetObjectPool, ::Gitaly::GetObjectPoolRequest, ::Gitaly::GetObjectPoolResponse