JohnHammond
/
buildkit
mirror of https://github.com/JohnHammond/buildkit.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

cache: fix possible prune deadlock 

Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
docker-18.09
Tonis Tiigi 2018-08-31 11:59:53 -07:00
parent 2759005f6a
commit 28fec2b9cb
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cache/manager.go vendored
View File

@ -360,10 +360,10 @@ func (cm *cacheManager) prune(ctx context.Context, ch chan client.UsageInfo, opt
gcMode := opt.keepBytes != 0 gcMode := opt.keepBytes != 0
cutOff := time.Now().Add(-opt.keepDuration) cutOff := time.Now().Add(-opt.keepDuration)
locked := map[*cacheRecord]struct{}{} locked := map[*sync.Mutex]struct{}{}
for _, cr := range cm.records { for _, cr := range cm.records {
if _, ok := locked[cr]; ok { if _, ok := locked[cr.mu]; ok {
continue continue
} }
cr.mu.Lock() cr.mu.Lock()
@ -431,7 +431,7 @@ func (cm *cacheManager) prune(ctx context.Context, ch chan client.UsageInfo, opt
return err return err
} }
} else { } else {
locked[cr] = struct{}{} locked[cr.mu] = struct{}{}
continue // leave the record locked continue // leave the record locked
} }
} }