Skip to content

Commit 996cc12

Browse files
GiteaBotlunny
andauthored
Add migration http transport for push/sync mirror lfs (#36665) (#36691)
Backport #36665 by @lunny Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
1 parent 99bc281 commit 996cc12

2 files changed

Lines changed: 4 additions & 2 deletions

File tree

services/mirror/mirror_pull.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ import (
2525
"code.gitea.io/gitea/modules/setting"
2626
"code.gitea.io/gitea/modules/timeutil"
2727
"code.gitea.io/gitea/modules/util"
28+
"code.gitea.io/gitea/services/migrations"
2829
notify_service "code.gitea.io/gitea/services/notify"
2930
repo_service "code.gitea.io/gitea/services/repository"
3031
)
@@ -339,7 +340,7 @@ func runSync(ctx context.Context, m *repo_model.Mirror) ([]*mirrorSyncResult, bo
339340
if m.LFS && setting.LFS.StartServer {
340341
log.Trace("SyncMirrors [repo: %-v]: syncing LFS objects...", m.Repo)
341342
endpoint := lfs.DetermineEndpoint(remoteURL.String(), m.LFSEndpoint)
342-
lfsClient := lfs.NewClient(endpoint, nil)
343+
lfsClient := lfs.NewClient(endpoint, migrations.NewMigrationHTTPTransport())
343344
if err = repo_module.StoreMissingLfsObjectsInRepository(ctx, m.Repo, gitRepo, lfsClient); err != nil {
344345
log.Error("SyncMirrors [repo: %-v]: failed to synchronize LFS objects for repository: %v", m.Repo.FullName(), err)
345346
}

services/mirror/mirror_push.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ import (
2323
"code.gitea.io/gitea/modules/setting"
2424
"code.gitea.io/gitea/modules/timeutil"
2525
"code.gitea.io/gitea/modules/util"
26+
"code.gitea.io/gitea/services/migrations"
2627
repo_service "code.gitea.io/gitea/services/repository"
2728
)
2829

@@ -146,7 +147,7 @@ func runPushSync(ctx context.Context, m *repo_model.PushMirror) error {
146147
defer gitRepo.Close()
147148

148149
endpoint := lfs.DetermineEndpoint(remoteURL.String(), "")
149-
lfsClient := lfs.NewClient(endpoint, nil)
150+
lfsClient := lfs.NewClient(endpoint, migrations.NewMigrationHTTPTransport())
150151
if err := pushAllLFSObjects(ctx, gitRepo, lfsClient); err != nil {
151152
return util.SanitizeErrorCredentialURLs(err)
152153
}

0 commit comments

Comments
 (0)