Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

cache: convert prune loop from recursive invocation to iterative #5636

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

cache: convert prune loop from recursive invocation to iterative #5636

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
52 changes: 37 additions & 15 deletions cache/manager.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1012,7 +1012,7 @@ func (cm *cacheManager) Prune(ctx context.Context, ch chan client.UsageInfo, opt
cm.muPrune.Lock()

for _, opt := range opts {
if err := cm.pruneOnce(ctx, ch, opt); err != nil {
if err := cm.prune(ctx, ch, opt); err != nil {
cm.muPrune.Unlock()
return err
}
Expand All @@ -1029,7 +1029,7 @@ func (cm *cacheManager) Prune(ctx context.Context, ch chan client.UsageInfo, opt
return nil
}

func (cm *cacheManager) pruneOnce(ctx context.Context, ch chan client.UsageInfo, opt client.PruneInfo) error {
func (cm *cacheManager) prune(ctx context.Context, ch chan client.UsageInfo, opt client.PruneInfo) error {
filter, err := filters.ParseAll(opt.Filter...)
if err != nil {
return errors.Wrapf(err, "failed to parse prune filters %v", opt.Filter)
Expand Down Expand Up @@ -1066,14 +1066,32 @@ func (cm *cacheManager) pruneOnce(ctx context.Context, ch chan client.UsageInfo,
}
}

return cm.prune(ctx, ch, pruneOpt{
var (
totalReleasedSize int64
totalReleasedCount int64
)

popt := pruneOpt{
filter: filter,
all: opt.All,
checkShared: check,
keepDuration: opt.KeepDuration,
keepBytes: calculateKeepBytes(totalSize, dstat, opt),
totalSize: totalSize,
})
}
for {
releasedSize, releasedCount, err := cm.pruneOnce(ctx, ch, popt)
if err != nil {
return err
}
totalReleasedSize += releasedSize
totalReleasedCount += releasedCount

if releasedCount == 0 {
return nil
}
popt.totalSize -= releasedSize
}
}

func calculateKeepBytes(totalSize int64, dstat disk.DiskStat, opt client.PruneInfo) int64 {
Expand All @@ -1100,9 +1118,9 @@ func calculateKeepBytes(totalSize int64, dstat disk.DiskStat, opt client.PruneIn
return keepBytes
}

func (cm *cacheManager) prune(ctx context.Context, ch chan client.UsageInfo, opt pruneOpt) (err error) {
func (cm *cacheManager) pruneOnce(ctx context.Context, ch chan client.UsageInfo, opt pruneOpt) (releasedSize, releasedCount int64, err error) {
if opt.keepBytes != 0 && opt.totalSize < opt.keepBytes {
return nil
return 0, 0, nil
}

var toDelete []*deleteRecord
Expand Down Expand Up @@ -1206,11 +1224,11 @@ func (cm *cacheManager) prune(ctx context.Context, ch chan client.UsageInfo, opt
// mark metadata as deleted in case we crash before cleanup finished
if err := cr.queueDeleted(); err != nil {
releaseLocks()
return err
return 0, 0, err
}
if err := cr.commitMetadata(); err != nil {
releaseLocks()
return err
return 0, 0, err
}
}
cr.mu.Unlock()
Expand All @@ -1221,7 +1239,7 @@ func (cm *cacheManager) prune(ctx context.Context, ch chan client.UsageInfo, opt
cm.mu.Unlock()

if len(toDelete) == 0 {
return nil
return 0, 0, nil
}

// calculate sizes here so that lock does not need to be held for slow process
Expand All @@ -1234,7 +1252,7 @@ func (cm *cacheManager) prune(ctx context.Context, ch chan client.UsageInfo, opt
if size == sizeUnknown {
// calling size will warm cache for next call
if _, err := cr.size(ctx); err != nil {
return err
return 0, 0, err
}
}
}
Expand Down Expand Up @@ -1277,15 +1295,18 @@ func (cm *cacheManager) prune(ctx context.Context, ch chan client.UsageInfo, opt
c.Size = cr.equalImmutable.getSize() // benefit from DiskUsage calc
}

opt.totalSize -= c.Size
releasedSize += c.Size

if cr.equalImmutable != nil {
if err1 := cr.equalImmutable.remove(ctx, false); err == nil {
err = err1
}
}
if err1 := cr.remove(ctx, true); err == nil {

if err1 := cr.remove(ctx, true); err1 != nil && err == nil {
err = err1
} else if err1 == nil {
releasedCount++
}

if err == nil && ch != nil {
Expand All @@ -1294,16 +1315,17 @@ func (cm *cacheManager) prune(ctx context.Context, ch chan client.UsageInfo, opt
cr.mu.Unlock()
}
cm.mu.Unlock()

if err != nil {
return err
return releasedSize, releasedCount, err
}

select {
case <-ctx.Done():
return context.Cause(ctx)
err = context.Cause(ctx)
default:
return cm.prune(ctx, ch, opt)
}
return releasedSize, releasedCount, err
}

func (cm *cacheManager) markShared(m map[string]*cacheUsageInfo) error {
Expand Down
14 changes: 6 additions & 8 deletions control/control.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -623,14 +623,12 @@ func (c *Controller) gc() {
}()

for _, w := range workers {
func(w worker.Worker) {
eg.Go(func() error {
if policy := w.GCPolicy(); len(policy) > 0 {
return w.Prune(ctx, ch, policy...)
}
return nil
})
}(w)
eg.Go(func() error {
if policy := w.GCPolicy(); len(policy) > 0 {
return w.Prune(ctx, ch, policy...)
}
return nil
})
}

err = eg.Wait()
Expand Down
3 changes: 0 additions & 3 deletions hack/composefiles/compose.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,16 +4,13 @@ services:
container_name: buildkit-dev
build:
context: ../..
args:
BUILDKIT_DEBUG: 1
image: moby/buildkit:local
ports:
- 127.0.0.1:5000:5000
- 127.0.0.1:6060:6060
restart: always
privileged: true
environment:
DELVE_PORT: 5000
OTEL_SERVICE_NAME: buildkitd
OTEL_EXPORTER_OTLP_ENDPOINT: http://otel-collector:4317
configs:
Expand Down
Loading