gitserver: SRC_ENABLE_GC_AUTO to enable & disable gc on fetch (source…

…graph#47852)

CHANGELOG.md

@@ -26,6 +26,7 @@ All notable changes to Sourcegraph are documented in this file.
 ### Fixed
 
 - Fixed issues with propagating tracing configuration throughout the application. [#47428](https://github.com/sourcegraph/sourcegraph/pull/47428)
+- Enable `auto gc` on fetch when `SRC_ENABLE_GC_AUTO` is set to `true`. [#47852](https://github.com/sourcegraph/sourcegraph/pull/47852)
 
 ### Removed
 

cmd/gitserver/server/cleanup.go

@@ -1401,10 +1401,10 @@ func tooManyPackfiles(dir GitDir, limit int) (bool, error) {
 // git-gc operations are running at the same time.
 func gitSetAutoGC(dir GitDir) error {
  switch gitGCMode {
- case gitGCModeGitAutoGC:
+ case gitGCModeGitAutoGC, gitGCModeJanitorAutoGC:
  return gitConfigUnset(dir, "gc.auto")
 
- case gitGCModeJanitorAutoGC, gitGCModeMaintenance:
+ case gitGCModeMaintenance:
  return gitConfigSet(dir, "gc.auto", "0")
 
  default:

cmd/gitserver/server/refspecoverrides.go

@@ -22,5 +22,5 @@ func useRefspecOverrides() bool {
 // HACK(keegancsmith) workaround to experiment with cloning less in a large
 // monorepo. https://github.com/sourcegraph/customer/issues/19
 func refspecOverridesFetchCmd(ctx context.Context, remoteURL *vcs.URL) *exec.Cmd {
- return exec.CommandContext(ctx, "git", append([]string{"fetch", "--no-auto-gc", "--progress", "--prune", remoteURL.String()}, refspecOverrides...)...)
+ return exec.CommandContext(ctx, "git", append([]string{"fetch", "--progress", "--prune", remoteURL.String()}, refspecOverrides...)...)
 }

cmd/gitserver/server/serverutil_test.go

@@ -9,9 +9,10 @@ import (
  "time"
 
  "github.com/google/go-cmp/cmp"
+ "github.com/stretchr/testify/assert"
+
  "github.com/sourcegraph/sourcegraph/internal/conf"
  "github.com/sourcegraph/sourcegraph/schema"
- "github.com/stretchr/testify/assert"
 )
 
 func TestGetTlsExternal(t *testing.T) {

cmd/gitserver/server/vcs_syncer_git.go

@@ -7,6 +7,7 @@ import (
  "os/exec"
 
  "github.com/sourcegraph/log"
+
  "github.com/sourcegraph/sourcegraph/internal/vcs"
  "github.com/sourcegraph/sourcegraph/internal/wrexec"
  "github.com/sourcegraph/sourcegraph/lib/errors"
@@ -103,9 +104,6 @@ func (s *GitRepoSyncer) fetchCommand(ctx context.Context, remoteURL *vcs.URL) (c
  cmd = refspecOverridesFetchCmd(ctx, remoteURL)
  } else {
  cmd = exec.CommandContext(ctx, "git", "fetch",
- // We already have janitor jobs that run git gc. We disable git gc here to avoid
- // a possible corruption of repositories by competing gc processes.
- "--no-auto-gc",
  "--progress", "--prune", remoteURL.String(),
  // Normal git refs
  "+refs/heads/*:refs/heads/*", "+refs/tags/*:refs/tags/*",