diff options
| author | Patrick Steinhardt <psteinhardt@gitlab.com> | 2023-03-03 14:55:24 +0300 |
|---|---|---|
| committer | Patrick Steinhardt <psteinhardt@gitlab.com> | 2023-03-06 09:30:50 +0300 |
| commit | 1c8fda9ed2155a452d15fac31bb5f9d5ba5585a0 (patch) | |
| tree | 67f42d0e0387f8492cfd310c938cd6ae7b32107f | |
| parent | 19aec67faa91621e598ecc6bfab6dcf2f9f04a41 (diff) | |
repository: Refactor PruneUnreachableObjects to use PruneObjects
Refactor the `PruneUnreachableObjects()` RPC to use the newly introduced
`housekeeping.PruneObjects()` function.
| -rw-r--r-- | internal/gitaly/service/repository/prune_unreachable_objects.go | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/internal/gitaly/service/repository/prune_unreachable_objects.go b/internal/gitaly/service/repository/prune_unreachable_objects.go index 6c0d68e80..8706713b1 100644 --- a/internal/gitaly/service/repository/prune_unreachable_objects.go +++ b/internal/gitaly/service/repository/prune_unreachable_objects.go @@ -2,8 +2,8 @@ package repository import ( "context" + "time" - "gitlab.com/gitlab-org/gitaly/v15/internal/git" "gitlab.com/gitlab-org/gitaly/v15/internal/git/housekeeping" "gitlab.com/gitlab-org/gitaly/v15/internal/git/stats" "gitlab.com/gitlab-org/gitaly/v15/internal/gitaly/service" @@ -32,11 +32,8 @@ func (s *server) PruneUnreachableObjects( return nil, err } - if err := repo.ExecAndWait(ctx, git.Command{ - Name: "prune", - Flags: []git.Option{ - git.ValueFlag{Name: "--expire", Value: "30.minutes.ago"}, - }, + if err := housekeeping.PruneObjects(ctx, repo, housekeeping.PruneObjectsConfig{ + ExpireBefore: time.Now().Add(-30 * time.Minute), }); err != nil { return nil, structerr.NewInternal("pruning objects: %w", err) } |