thepaperpilot/forgejo
1
0
Fork 0
Code Issues Pull requests Releases Activity Actions

Refactor mirror code & fix StartToMirror (#18904) (#19075)

Browse source 
- Backport #18904.
This commit is contained in:
Gusted 2022-03-14 12:04:41 +00:00 committed by GitHub
parent d285905826
commit 66b8a43e5f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 17 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
services/mirror/mirror.go
View file

@ -29,19 +29,23 @@ const (
// SyncRequest for the mirror queue // SyncRequest for the mirror queue
type SyncRequest struct { type SyncRequest struct {
Type SyncType Type SyncType
RepoID int64 ReferenceID int64 // RepoID for pull mirror, MirrorID fro push mirror
} }
// doMirrorSync causes this request to mirror itself // doMirrorSync causes this request to mirror itself
func doMirrorSync(ctx context.Context, req *SyncRequest) { func doMirrorSync(ctx context.Context, req *SyncRequest) {
if req.ReferenceID == 0 {
log.Warn("Skipping mirror sync request, no reference ID was specified")
return
}
switch req.Type { switch req.Type {
case PushMirrorType: case PushMirrorType:
_ = SyncPushMirror(ctx, req.RepoID) _ = SyncPushMirror(ctx, req.ReferenceID)
case PullMirrorType: case PullMirrorType:
_ = SyncPullMirror(ctx, req.RepoID) _ = SyncPullMirror(ctx, req.ReferenceID)
default: default:
log.Error("Unknown Request type in queue: %v for RepoID[%d]", req.Type, req.RepoID) log.Error("Unknown Request type in queue: %v for ReferenceID[%d]", req.Type, req.ReferenceID)
} }
} }
@ -67,8 +71,8 @@ func Update(ctx context.Context, pullLimit, pushLimit int) error {
} }
repo = m.Repo repo = m.Repo
item = SyncRequest{ item = SyncRequest{
Type: PullMirrorType, Type: PullMirrorType,
RepoID: m.RepoID, ReferenceID: m.RepoID,
} }
} else if m, ok := bean.(*repo_model.PushMirror); ok { } else if m, ok := bean.(*repo_model.PushMirror); ok {
if m.Repo == nil { if m.Repo == nil {
@ -77,8 +81,8 @@ func Update(ctx context.Context, pullLimit, pushLimit int) error {
} }
repo = m.Repo repo = m.Repo
item = SyncRequest{ item = SyncRequest{
Type: PushMirrorType, Type: PushMirrorType,
RepoID: m.RepoID, ReferenceID: m.ID,
} }
} else { } else {
log.Error("Unknown bean: %v", bean) log.Error("Unknown bean: %v", bean)
@ -162,8 +166,8 @@ func StartToMirror(repoID int64) {
} }
go func() { go func() {
err := mirrorQueue.Push(&SyncRequest{ err := mirrorQueue.Push(&SyncRequest{
Type: PullMirrorType, Type: PullMirrorType,
RepoID: repoID, ReferenceID: repoID,
}) })
if err != nil { if err != nil {
log.Error("Unable to push sync request for to the queue for push mirror repo[%d]: Error: %v", repoID, err) log.Error("Unable to push sync request for to the queue for push mirror repo[%d]: Error: %v", repoID, err)
@ -178,8 +182,8 @@ func AddPushMirrorToQueue(mirrorID int64) {
} }
go func() { go func() {
err := mirrorQueue.Push(&SyncRequest{ err := mirrorQueue.Push(&SyncRequest{
Type: PushMirrorType, Type: PushMirrorType,
RepoID: mirrorID, ReferenceID: mirrorID,
}) })
if err != nil { if err != nil {
log.Error("Unable to push sync request to the queue for pull mirror repo[%d]: Error: %v", mirrorID, err) log.Error("Unable to push sync request to the queue for pull mirror repo[%d]: Error: %v", mirrorID, err)