github/zot
1
0
Fork 0
mirror of https://github.com/project-zot/zot.git synced 2026-06-17 21:17:58 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: close the syncResult channel by any goroutine that receives the data (#3348)

Browse Source 
fix: race condition in on-demand syncing

Signed-off-by: Łukasz Jakimczuk <ljakimczuk@gmail.com>
This commit is contained in:
Lukasz Jakimczuk
2025-09-01 20:55:48 +02:00
committed by GitHub
parent f0404e7e72
commit b740a6f037
1 changed files with 8 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/extensions/sync/on_demand.go
+8 -20
View File
@@ -55,11 +55,7 @@ func (onDemand *BaseOnDemand) SyncImage(ctx context.Context, repo, reference str
syncResult, _ := val.(chan error)
err, ok := <-syncResult
// if channel closed exit
if !ok {
return nil
}
err := <-syncResult
return err
}
@@ -68,14 +64,10 @@ func (onDemand *BaseOnDemand) SyncImage(ctx context.Context, repo, reference str
onDemand.requestStore.Store(req, syncResult)
defer onDemand.requestStore.Delete(req)
defer close(syncResult)
go onDemand.syncImage(ctx, repo, reference, syncResult)
err, ok := <-syncResult
if !ok {
return nil
}
err := <-syncResult
return err
}
@@ -95,11 +87,7 @@ func (onDemand *BaseOnDemand) SyncReferrers(ctx context.Context, repo string,
syncResult, _ := val.(chan error)
err, ok := <-syncResult
// if channel closed exit
if !ok {
return nil
}
err := <-syncResult
return err
}
@@ -108,14 +96,10 @@ func (onDemand *BaseOnDemand) SyncReferrers(ctx context.Context, repo string,
onDemand.requestStore.Store(req, syncResult)
defer onDemand.requestStore.Delete(req)
defer close(syncResult)
go onDemand.syncReferrers(ctx, repo, subjectDigestStr, referenceTypes, syncResult)
err, ok := <-syncResult
if !ok {
return nil
}
err := <-syncResult
return err
}
@@ -123,6 +107,8 @@ func (onDemand *BaseOnDemand) SyncReferrers(ctx context.Context, repo string,
func (onDemand *BaseOnDemand) syncReferrers(ctx context.Context, repo, subjectDigestStr string,
referenceTypes []string, syncResult chan error,
) {
defer close(syncResult)
var err error
for serviceID, service := range onDemand.services {
err = service.SyncReferrers(ctx, repo, subjectDigestStr, referenceTypes)
@@ -176,6 +162,8 @@ func (onDemand *BaseOnDemand) syncReferrers(ctx context.Context, repo, subjectDi
}
func (onDemand *BaseOnDemand) syncImage(ctx context.Context, repo, reference string, syncResult chan error) {
defer close(syncResult)
var err error
for serviceID, service := range onDemand.services {