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

Merge pull request #600 from tonistiigi/prune-fixes 

fixes for cache prune
docker-18.09
Tõnis Tiigi 2018-08-31 13:29:10 -07:00 committed by GitHub
parent 05a468d460 acab0f6873
commit 2f858a07c7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
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
} }
} }
@ -454,7 +454,6 @@ func (cm *cacheManager) prune(ctx context.Context, ch chan client.UsageInfo, opt
return err return err
} }
toDelete = toDelete[:1] toDelete = toDelete[:1]
opt.totalSize -= getSize(toDelete[0].md)
} }
cm.mu.Unlock() cm.mu.Unlock()
@ -483,7 +482,9 @@ func (cm *cacheManager) prune(ctx context.Context, ch chan client.UsageInfo, opt
if cr.parent != nil { if cr.parent != nil {
c.Parent = cr.parent.ID() c.Parent = cr.parent.ID()
} }
if c.Size == sizeUnknown && cr.equalImmutable != nil {
c.Size = getSize(cr.equalImmutable.md) // benefit from DiskUsage calc
}
if c.Size == sizeUnknown { if c.Size == sizeUnknown {
cr.mu.Unlock() // all the non-prune modifications already protected by cr.dead cr.mu.Unlock() // all the non-prune modifications already protected by cr.dead
s, err := cr.Size(ctx) s, err := cr.Size(ctx)
@ -494,6 +495,8 @@ func (cm *cacheManager) prune(ctx context.Context, ch chan client.UsageInfo, opt
cr.mu.Lock() cr.mu.Lock()
} }
opt.totalSize -= c.Size
if cr.equalImmutable != nil { if cr.equalImmutable != nil {
if err1 := cr.equalImmutable.remove(ctx, false); err == nil { if err1 := cr.equalImmutable.remove(ctx, false); err == nil {
err = err1 err = err1