diff options
| author | Zeger-Jan van de Weg <git@zjvandeweg.nl> | 2018-12-17 11:49:38 +0300 |
|---|---|---|
| committer | Zeger-Jan van de Weg <git@zjvandeweg.nl> | 2018-12-19 15:21:56 +0300 |
| commit | 752e9c18a1c2521636ddeec65b7bda2035ce1893 (patch) | |
| tree | 157a76334e9c54264dde1dda62eb85f1b17e5914 /lib/gitlab/gitaly_client/object_pool_service.rb | |
| parent | 73d4b1f625af4cb9e10c4e862ed63a54904f746f (diff) | |
Leave object pools when destroying projects
This action doesn't lean on reduplication, so a short call can me made
to the Gitaly server to have the object pool remove its remote to the
project pending deletion.
https://gitlab.com/gitlab-org/gitaly/blob/f6cd55357/internal/git/objectpool/link.go#L58
When an object pool doesn't have members, this would invalidate the need
for a pool. So when a project leaves the pool, the pool will be
destroyed on the background.
Fixes: https://gitlab.com/gitlab-org/gitaly/issues/1415
Diffstat (limited to 'lib/gitlab/gitaly_client/object_pool_service.rb')
| -rw-r--r-- | lib/gitlab/gitaly_client/object_pool_service.rb | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/lib/gitlab/gitaly_client/object_pool_service.rb b/lib/gitlab/gitaly_client/object_pool_service.rb index 272ce73ad64..6e7ede5fd18 100644 --- a/lib/gitlab/gitaly_client/object_pool_service.rb +++ b/lib/gitlab/gitaly_client/object_pool_service.rb @@ -35,7 +35,10 @@ module Gitlab end def unlink_repository(repository) - request = Gitaly::UnlinkRepositoryFromObjectPoolRequest.new(repository: repository.gitaly_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) |