Merge pull request #2662 from ktock/overlayfs-differ-cancel
overlay differ: cancel diff calculation cleanlymaster
commit
d1a8f137c1
|
@ -11,6 +11,7 @@ import (
|
||||||
"github.com/containerd/containerd/content"
|
"github.com/containerd/containerd/content"
|
||||||
"github.com/containerd/containerd/errdefs"
|
"github.com/containerd/containerd/errdefs"
|
||||||
"github.com/containerd/containerd/mount"
|
"github.com/containerd/containerd/mount"
|
||||||
|
"github.com/moby/buildkit/util/bklog"
|
||||||
"github.com/moby/buildkit/util/overlay"
|
"github.com/moby/buildkit/util/overlay"
|
||||||
digest "github.com/opencontainers/go-digest"
|
digest "github.com/opencontainers/go-digest"
|
||||||
ocispecs "github.com/opencontainers/image-spec/specs-go/v1"
|
ocispecs "github.com/opencontainers/image-spec/specs-go/v1"
|
||||||
|
@ -41,8 +42,10 @@ func (sr *immutableRef) tryComputeOverlayBlob(ctx context.Context, lower, upper
|
||||||
return emptyDesc, false, errors.Wrap(err, "failed to open writer")
|
return emptyDesc, false, errors.Wrap(err, "failed to open writer")
|
||||||
}
|
}
|
||||||
defer func() {
|
defer func() {
|
||||||
if err != nil {
|
if cw != nil {
|
||||||
cw.Close()
|
if cerr := cw.Close(); cerr != nil {
|
||||||
|
bklog.G(ctx).WithError(cerr).Warnf("failed to close writer %q", ref)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}()
|
}()
|
||||||
|
|
||||||
|
@ -82,6 +85,10 @@ func (sr *immutableRef) tryComputeOverlayBlob(ctx context.Context, lower, upper
|
||||||
return emptyDesc, false, errors.Wrap(err, "failed to commit")
|
return emptyDesc, false, errors.Wrap(err, "failed to commit")
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
if err := cw.Close(); err != nil {
|
||||||
|
return emptyDesc, false, err
|
||||||
|
}
|
||||||
|
cw = nil
|
||||||
cinfo, err := sr.cm.ContentStore.Info(ctx, dgst)
|
cinfo, err := sr.cm.ContentStore.Info(ctx, dgst)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return emptyDesc, false, errors.Wrap(err, "failed to get info from content store")
|
return emptyDesc, false, errors.Wrap(err, "failed to get info from content store")
|
||||||
|
|
|
@ -128,18 +128,30 @@ func WriteUpperdir(ctx context.Context, w io.Writer, upperdir string, lower []mo
|
||||||
}
|
}
|
||||||
return mount.WithTempMount(ctx, lower, func(lowerRoot string) error {
|
return mount.WithTempMount(ctx, lower, func(lowerRoot string) error {
|
||||||
return mount.WithTempMount(ctx, upperView, func(upperViewRoot string) error {
|
return mount.WithTempMount(ctx, upperView, func(upperViewRoot string) error {
|
||||||
cw := archive.NewChangeWriter(w, upperViewRoot)
|
cw := archive.NewChangeWriter(&cancellableWriter{ctx, w}, upperViewRoot)
|
||||||
if err := Changes(ctx, cw.HandleChange, upperdir, upperViewRoot, lowerRoot); err != nil {
|
if err := Changes(ctx, cw.HandleChange, upperdir, upperViewRoot, lowerRoot); err != nil {
|
||||||
if err2 := cw.Close(); err2 != nil {
|
if err2 := cw.Close(); err2 != nil {
|
||||||
return errors.Wrapf(err, "failed torecord upperdir changes (close error: %v)", err2)
|
return errors.Wrapf(err, "failed to record upperdir changes (close error: %v)", err2)
|
||||||
}
|
}
|
||||||
return errors.Wrapf(err, "failed torecord upperdir changes")
|
return errors.Wrapf(err, "failed to record upperdir changes")
|
||||||
}
|
}
|
||||||
return cw.Close()
|
return cw.Close()
|
||||||
})
|
})
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
|
type cancellableWriter struct {
|
||||||
|
ctx context.Context
|
||||||
|
w io.Writer
|
||||||
|
}
|
||||||
|
|
||||||
|
func (w *cancellableWriter) Write(p []byte) (int, error) {
|
||||||
|
if err := w.ctx.Err(); err != nil {
|
||||||
|
return 0, err
|
||||||
|
}
|
||||||
|
return w.w.Write(p)
|
||||||
|
}
|
||||||
|
|
||||||
// Changes is continuty's `fs.Change`-like method but leverages overlayfs's
|
// Changes is continuty's `fs.Change`-like method but leverages overlayfs's
|
||||||
// "upperdir" for computing the diff. "upperdirView" is overlayfs mounted view of
|
// "upperdir" for computing the diff. "upperdirView" is overlayfs mounted view of
|
||||||
// the upperdir that doesn't contain whiteouts. This is used for computing
|
// the upperdir that doesn't contain whiteouts. This is used for computing
|
||||||
|
@ -149,6 +161,9 @@ func Changes(ctx context.Context, changeFn fs.ChangeFunc, upperdir, upperdirView
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
if ctx.Err() != nil {
|
||||||
|
return ctx.Err()
|
||||||
|
}
|
||||||
|
|
||||||
// Rebase path
|
// Rebase path
|
||||||
path, err = filepath.Rel(upperdir, path)
|
path, err = filepath.Rel(upperdir, path)
|
||||||
|
|
Loading…
Reference in New Issue