Merge pull request moby#1797 from tiborvass/fix-cache-moby-integration

tonistiigi · web-flow · commit 6861f17f1536 · 2020-11-13T15:38:15.000-08:00
Allow worker to override GetRemote(), needed in moby integration
diff --git a/cache/remote.go b/cache/remote.go
@@ -24,6 +24,8 @@ type Unlazier interface {
 	Unlazy(ctx context.Context) error
 }
 
+// GetRemote gets a *solver.Remote from content store for this ref (potentially pulling lazily).
+// Note: Use WorkerRef.GetRemote instead as moby integration requires custom GetRemote implementation.
 func (sr *immutableRef) GetRemote(ctx context.Context, createIfNeeded bool, compressionType compression.Type, s session.Group) (*solver.Remote, error) {
 	ctx, done, err := leaseutil.WithLease(ctx, sr.cm.LeaseManager, leaseutil.MakeTemporary)
 	if err != nil {
diff --git a/solver/llbsolver/result.go b/solver/llbsolver/result.go
@@ -82,6 +82,6 @@ func workerRefConverter(g session.Group) func(ctx context.Context, res solver.Re
 			return nil, errors.Errorf("invalid result: %T", res.Sys())
 		}
 
-		return ref.ImmutableRef.GetRemote(ctx, true, compression.Default, g)
+		return ref.GetRemote(ctx, true, compression.Default, g)
 	}
 }
diff --git a/solver/llbsolver/solver.go b/solver/llbsolver/solver.go
@@ -270,7 +270,7 @@ func inlineCache(ctx context.Context, e remotecache.Exporter, res solver.CachedR
 			return nil, errors.Errorf("invalid reference: %T", res.Sys())
 		}
 
-		remote, err := workerRef.ImmutableRef.GetRemote(ctx, true, compression.Default, g)
+		remote, err := workerRef.GetRemote(ctx, true, compression.Default, g)
 		if err != nil || remote == nil {
 			return nil, nil
 		}
diff --git a/worker/cacheresult.go b/worker/cacheresult.go
@@ -78,7 +78,8 @@ func (s *cacheResultStorage) LoadRemote(ctx context.Context, res solver.CacheRes
 		return nil, err
 	}
 	defer ref.Release(context.TODO())
-	remote, err := ref.GetRemote(ctx, false, compression.Default, g)
+	wref := WorkerRef{ref, w}
+	remote, err := wref.GetRemote(ctx, false, compression.Default, g)
 	if err != nil {
 		return nil, nil // ignore error. loadRemote is best effort
 	}
diff --git a/worker/result.go b/worker/result.go
@@ -4,7 +4,9 @@ import (
 	"context"
 
 	"github.com/moby/buildkit/cache"
+	"github.com/moby/buildkit/session"
 	"github.com/moby/buildkit/solver"
+	"github.com/moby/buildkit/util/compression"
 )
 
 func NewWorkerRefResult(ref cache.ImmutableRef, worker Worker) solver.Result {
@@ -24,6 +26,18 @@ func (wr *WorkerRef) ID() string {
 	return wr.Worker.ID() + "::" + refID
 }
 
+// GetRemote method abstracts ImmutableRef's GetRemote to allow a Worker to override.
+// This is needed for moby integration.
+// Use this method instead of calling ImmutableRef.GetRemote() directly.
+func (wr *WorkerRef) GetRemote(ctx context.Context, createIfNeeded bool, compressionType compression.Type, g session.Group) (*solver.Remote, error) {
+	if w, ok := wr.Worker.(interface {
+		GetRemote(context.Context, cache.ImmutableRef, bool, compression.Type, session.Group) (*solver.Remote, error)
+	}); ok {
+		return w.GetRemote(ctx, wr.ImmutableRef, createIfNeeded, compressionType, g)
+	}
+	return wr.ImmutableRef.GetRemote(ctx, createIfNeeded, compressionType, g)
+}
+
 type workerRefResult struct {
 	*WorkerRef
 }

Original file line number	Diff line number	Diff line change
`@@ -24,6 +24,8 @@ type Unlazier interface {`
`24`	`24`	`Unlazy(ctx context.Context) error`
`25`	`25`	`}`
`26`	`26`
	`27`	`+// GetRemote gets a *solver.Remote from content store for this ref (potentially pulling lazily).`
	`28`	`+// Note: Use WorkerRef.GetRemote instead as moby integration requires custom GetRemote implementation.`
`27`	`29`	`func (sr immutableRef) GetRemote(ctx context.Context, createIfNeeded bool, compressionType compression.Type, s session.Group) (solver.Remote, error) {`
`28`	`30`	`ctx, done, err := leaseutil.WithLease(ctx, sr.cm.LeaseManager, leaseutil.MakeTemporary)`
`29`	`31`	`if err != nil {`
Original file line number	Diff line number	Diff line change
`@@ -82,6 +82,6 @@ func workerRefConverter(g session.Group) func(ctx context.Context, res solver.Re`
`82`	`82`	`return nil, errors.Errorf("invalid result: %T", res.Sys())`
`83`	`83`	`}`
`84`	`84`
`85`		`- return ref.ImmutableRef.GetRemote(ctx, true, compression.Default, g)`
	`85`	`+ return ref.GetRemote(ctx, true, compression.Default, g)`
`86`	`86`	`}`
`87`	`87`	`}`
Original file line number	Diff line number	Diff line change
`@@ -270,7 +270,7 @@ func inlineCache(ctx context.Context, e remotecache.Exporter, res solver.CachedR`
`270`	`270`	`return nil, errors.Errorf("invalid reference: %T", res.Sys())`
`271`	`271`	`}`
`272`	`272`
`273`		`- remote, err := workerRef.ImmutableRef.GetRemote(ctx, true, compression.Default, g)`
	`273`	`+ remote, err := workerRef.GetRemote(ctx, true, compression.Default, g)`
`274`	`274`	`if err != nil \|\| remote == nil {`
`275`	`275`	`return nil, nil`
`276`	`276`	`}`
Original file line number	Diff line number	Diff line change
`@@ -78,7 +78,8 @@ func (s *cacheResultStorage) LoadRemote(ctx context.Context, res solver.CacheRes`
`78`	`78`	`return nil, err`
`79`	`79`	`}`
`80`	`80`	`defer ref.Release(context.TODO())`
`81`		`- remote, err := ref.GetRemote(ctx, false, compression.Default, g)`
	`81`	`+ wref := WorkerRef{ref, w}`
	`82`	`+ remote, err := wref.GetRemote(ctx, false, compression.Default, g)`
`82`	`83`	`if err != nil {`
`83`	`84`	`return nil, nil // ignore error. loadRemote is best effort`
`84`	`85`	`}`