Skip to content

fix: Optimize git clone performance #114

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
nssherpa wants to merge 1 commit into from
Closed

fix: Optimize git clone performance #114

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 23 additions & 0 deletions internal/gitclone/manager.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -352,6 +352,21 @@ func (r *Repository) executeClone(ctx context.Context) error {
return errors.Wrapf(err, "configure fetch refspec: %s", string(output))
}

// Set git configs for optimal performance
configs := map[string]string{
"pack.threads": "4",
"pack.windowMemory": "256m",
"repack.useDeltaBaseOffset": "true",
}
for key, value := range configs {
// #nosec G204 - r.path, key, and value are controlled by us
cmd = exec.CommandContext(ctx, "git", "-C", r.path, "config", key, value)
output, err = cmd.CombinedOutput()
if err != nil {
return errors.Wrapf(err, "configure %s: %s", key, string(output))
}
}

cmd, err = r.gitCommand(ctx, "-C", r.path,
"-c", "http.postBuffer="+strconv.Itoa(config.PostBuffer),
"-c", "http.lowSpeedLimit="+strconv.Itoa(config.LowSpeedLimit),
Expand All @@ -365,6 +380,14 @@ func (r *Repository) executeClone(ctx context.Context) error {
return errors.Wrapf(err, "fetch all branches: %s", string(output))
}

// Generate pack with bitmaps for fast object counting during clone operations
// #nosec G204 - r.path is controlled by us
cmd = exec.CommandContext(ctx, "git", "-C", r.path, "repack", "-adb")
output, err = cmd.CombinedOutput()
if err != nil {
return errors.Wrapf(err, "git repack with bitmaps: %s", string(output))
}

return nil
}

Expand Down
10 changes: 10 additions & 0 deletions internal/strategy/git/backend.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,16 @@ func (s *Strategy) serveFromBackend(w http.ResponseWriter, r *http.Request, repo
"GIT_PROJECT_ROOT=" + absRoot,
"GIT_HTTP_EXPORT_ALL=1",
"PATH=" + os.Getenv("PATH"),
// Optimize upload-pack performance
"GIT_CONFIG_COUNT=4",
"GIT_CONFIG_KEY_0=pack.threads",
"GIT_CONFIG_VALUE_0=4",
"GIT_CONFIG_KEY_1=pack.windowMemory",
"GIT_CONFIG_VALUE_1=256m",
"GIT_CONFIG_KEY_2=core.compression",
"GIT_CONFIG_VALUE_2=1",
"GIT_CONFIG_KEY_3=pack.compression",
"GIT_CONFIG_VALUE_3=1",
},
}

Expand Down
20 changes: 20 additions & 0 deletions internal/strategy/git/bundle.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,26 @@ func (s *Strategy) generateAndUploadBundle(ctx context.Context, repo *gitclone.R

logger.InfoContext(ctx, "Bundle generation started", slog.String("upstream", upstream))

// Run git maintenance to optimize repository before creating bundle
err := repo.WithReadLock(func() error {
// #nosec G204 - repo.Path() is controlled by us
cmd := exec.CommandContext(ctx, "git", "-C", repo.Path(), "repack", "-Adbl")
output, err := cmd.CombinedOutput()
if err != nil {
logger.WarnContext(ctx, "Git repack failed, continuing with bundle generation",
slog.String("upstream", upstream),
slog.String("error", err.Error()),
slog.String("output", string(output)))
} else {
logger.DebugContext(ctx, "Git repack completed",
slog.String("upstream", upstream))
}
return nil
})
if err != nil {
return errors.Wrap(err, "repack repository")
}

cacheKey := cache.NewKey(upstream + ".bundle")

headers := http.Header{
Expand Down