Automatic merge of gitlab-org/gitlab-ce master

app/models/pool_repository.rb

@@ -81,10 +81,7 @@ class PoolRepository < ApplicationRecord
     object_pool.link(repository.raw)
   end
 
-  # This RPC can cause data loss, as not all objects are present the local repository
-  def unlink_repository(repository)
-    object_pool.unlink_repository(repository.raw)
-
+  def mark_obsolete_if_last(repository)
     if member_projects.where.not(id: repository.project.id).exists?
       true
     else

app/models/project.rb

@@ -2128,7 +2128,7 @@ class Project < ApplicationRecord
   end
 
   def leave_pool_repository
-    pool_repository&.unlink_repository(repository) && update_column(:pool_repository_id, nil)
+    pool_repository&.mark_obsolete_if_last(repository) && update_column(:pool_repository_id, nil)
   end
 
   def link_pool_repository

lib/gitlab/git/object_pool.rb

@@ -8,7 +8,7 @@ module Gitlab
       GL_REPOSITORY = ""
 
       delegate :exists?, :size, to: :repository
-      delegate :unlink_repository, :delete, to: :object_pool_service
+      delegate :delete, to: :object_pool_service
 
       attr_reader :storage, :relative_path, :source_repository, :gl_project_path
 

lib/gitlab/gitaly_client/object_pool_service.rb

@@ -33,16 +33,6 @@ module Gitlab
         GitalyClient.call(storage, :object_pool_service, :link_repository_to_object_pool,
                           request, timeout: GitalyClient.fast_timeout)
       end
-
-      def unlink_repository(repository)
-        request = Gitaly::UnlinkRepositoryFromObjectPoolRequest.new(
-          object_pool: object_pool,
-          repository: repository.gitaly_repository
-        )
-
-        GitalyClient.call(storage, :object_pool_service, :unlink_repository_from_object_pool,
-                          request, timeout: GitalyClient.fast_timeout)
-      end
     end
   end
 end

spec/models/pool_repository_spec.rb

@@ -24,14 +24,14 @@ describe PoolRepository do
     end
   end
 
-  describe '#unlink_repository' do
+  describe '#mark_obsolete_if_last' do
     let(:pool) { create(:pool_repository, :ready) }
 
     context 'when the last member leaves' do
       it 'schedules pool removal' do
         expect(::ObjectPool::DestroyWorker).to receive(:perform_async).with(pool.id).and_call_original
 
-        pool.unlink_repository(pool.source_project.repository)
+        pool.mark_obsolete_if_last(pool.source_project.repository)
       end
     end
 
@@ -40,7 +40,7 @@ describe PoolRepository do
         create(:project, :repository, pool_repository: pool)
         expect(::ObjectPool::DestroyWorker).not_to receive(:perform_async).with(pool.id)
 
-        pool.unlink_repository(pool.source_project.repository)
+        pool.mark_obsolete_if_last(pool.source_project.repository)
       end
     end
   end