diff options
| author | Patrick Steinhardt <psteinhardt@gitlab.com> | 2020-11-19 13:28:39 +0300 |
|---|---|---|
| committer | Patrick Steinhardt <psteinhardt@gitlab.com> | 2020-11-19 13:28:39 +0300 |
| commit | d5024702496569b6de051046e5e295c44de94be5 (patch) | |
| tree | cb325e0aa4f7bc861df7beb23fc2a1676cfe4e01 | |
| parent | 9162238ae9f5f1b4ca452965fbdbe1dc4f80fef8 (diff) | |
| parent | ab6bc21a1140d0cab98855a7cd7fe81d166a6950 (diff) | |
Merge branch 'git-prune-harder' into 'master'
Make git gc --prune more aggressive
See merge request gitlab-org/gitaly!2758
| -rw-r--r-- | changelogs/unreleased/git-prune-harder.yml | 5 | ||||
| -rw-r--r-- | internal/gitaly/service/repository/gc.go | 2 | ||||
| -rw-r--r-- | internal/gitaly/service/repository/gc_test.go | 4 |
3 files changed, 8 insertions, 3 deletions
diff --git a/changelogs/unreleased/git-prune-harder.yml b/changelogs/unreleased/git-prune-harder.yml new file mode 100644 index 000000000..64afb2d07 --- /dev/null +++ b/changelogs/unreleased/git-prune-harder.yml @@ -0,0 +1,5 @@ +--- +title: Make git gc --prune more aggressive +merge_request: 2758 +author: +type: changed diff --git a/internal/gitaly/service/repository/gc.go b/internal/gitaly/service/repository/gc.go index d95b0952c..f4c2c53b6 100644 --- a/internal/gitaly/service/repository/gc.go +++ b/internal/gitaly/service/repository/gc.go @@ -67,7 +67,7 @@ func (s *server) gc(ctx context.Context, in *gitalypb.GarbageCollectRequest) err var flags []git.Option if in.Prune { - flags = append(flags, git.Flag{Name: "--prune=24.hours.ago"}) + flags = append(flags, git.Flag{Name: "--prune=30.minutes.ago"}) } cmd, err := git.SafeCmd(ctx, in.GetRepository(), args, diff --git a/internal/gitaly/service/repository/gc_test.go b/internal/gitaly/service/repository/gc_test.go index 32df05e7c..21ffc8199 100644 --- a/internal/gitaly/service/repository/gc_test.go +++ b/internal/gitaly/service/repository/gc_test.go @@ -147,9 +147,9 @@ func TestGarbageCollectWithPrune(t *testing.T) { testhelper.CommitBlobWithName(t, repoPath, blobHashes[2], t.Name(), t.Name()) // change modification time of the blobs to make them attractive for the gc - aBitMoreThan24HoursAgo := time.Now().Add(-24*time.Hour - time.Second) + aBitMoreThan30MinutesAgo := time.Now().Add(-30*time.Minute - time.Second) farAgo := time.Date(2015, 1, 1, 1, 1, 1, 1, time.UTC) - require.NoError(t, os.Chtimes(oldDanglingObjFile, aBitMoreThan24HoursAgo, aBitMoreThan24HoursAgo)) + require.NoError(t, os.Chtimes(oldDanglingObjFile, aBitMoreThan30MinutesAgo, aBitMoreThan30MinutesAgo)) require.NoError(t, os.Chtimes(newDanglingObjFile, time.Now(), time.Now())) require.NoError(t, os.Chtimes(oldReferencedObjFile, farAgo, farAgo)) |