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

Merge pull request #2670 from ktock/fixrestartpanic 

stargz: fix panic on restart
master
Tõnis Tiigi 2022-02-23 08:04:12 -08:00 committed by GitHub
parent f5a831c550 09923fc8fe
commit d24cfa0871
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 21 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/buildkitd/main_oci_worker.go
View File

@ -402,7 +402,7 @@ func snapshotterFactory(commonRoot string, cfg config.OCIConfig, sm *session.Man
}
return remotesn.NewSnapshotter(context.Background(),
filepath.Join(root, "snapshotter"),
fs, remotesn.AsynchronousRemove)
fs, remotesn.AsynchronousRemove, remotesn.NoRestore)
}
default:
return snFactory, errors.Errorf("unknown snapshotter name: %q", name)

4
go.mod
View File

@ -13,8 +13,8 @@ require (
github.com/containerd/fuse-overlayfs-snapshotter v1.0.2
github.com/containerd/go-cni v1.1.3
github.com/containerd/go-runc v1.0.0
github.com/containerd/stargz-snapshotter v0.11.1
github.com/containerd/stargz-snapshotter/estargz v0.11.1
github.com/containerd/stargz-snapshotter v0.11.2-0.20220223051521-b1ce4c8d8294
github.com/containerd/stargz-snapshotter/estargz v0.11.2-0.20220223051521-b1ce4c8d8294
github.com/containerd/typeurl v1.0.2
github.com/coreos/go-systemd/v22 v22.3.2
github.com/docker/cli v20.10.12+incompatible

7
go.sum
View File

@ -345,11 +345,12 @@ github.com/containerd/nri v0.0.0-20201007170849-eb1350a75164/go.mod h1:+2wGSDGFY
github.com/containerd/nri v0.0.0-20210316161719-dbaa18c31c14/go.mod h1:lmxnXF6oMkbqs39FiCt1s0R2HSMhcLel9vNL3m4AaeY=
github.com/containerd/nri v0.1.0/go.mod h1:lmxnXF6oMkbqs39FiCt1s0R2HSMhcLel9vNL3m4AaeY=
github.com/containerd/stargz-snapshotter v0.0.0-20201027054423-3a04e4c2c116/go.mod h1:o59b3PCKVAf9jjiKtCc/9hLAd+5p/rfhBfm6aBcTEr4=
github.com/containerd/stargz-snapshotter v0.11.1 h1:U0kHsxJlSBosOH7Ib/EgsWyTK0iA8sCeAG4mHtJoBL8=
github.com/containerd/stargz-snapshotter v0.11.1/go.mod h1:3PJpOcsh0wqu+p/U/HBbUnG6wzIuw5hP6oRn1hXzQhc=
github.com/containerd/stargz-snapshotter v0.11.2-0.20220223051521-b1ce4c8d8294 h1:ra5BUvrReW8pvtKnMq2u95WXaKeWnNaDyV7Btxqq/ag=
github.com/containerd/stargz-snapshotter v0.11.2-0.20220223051521-b1ce4c8d8294/go.mod h1:3PJpOcsh0wqu+p/U/HBbUnG6wzIuw5hP6oRn1hXzQhc=
github.com/containerd/stargz-snapshotter/estargz v0.4.1/go.mod h1:x7Q9dg9QYb4+ELgxmo4gBUeJB0tl5dqH1Sdz0nJU1QM=
github.com/containerd/stargz-snapshotter/estargz v0.11.1 h1:mNQqxcAWmDrV6d6yUvzFhfY8puNzoQz9v4diW+Pmei4=
github.com/containerd/stargz-snapshotter/estargz v0.11.1/go.mod h1:6VoPcf4M1wvnogWxqc4TqBWWErCS+R+ucnPZId2VbpQ=
github.com/containerd/stargz-snapshotter/estargz v0.11.2-0.20220223051521-b1ce4c8d8294 h1:wcJH/EdebQmIqwrbApmEG2tOOw9nHL+kewKbgN8FUfU=
github.com/containerd/stargz-snapshotter/estargz v0.11.2-0.20220223051521-b1ce4c8d8294/go.mod h1:6VoPcf4M1wvnogWxqc4TqBWWErCS+R+ucnPZId2VbpQ=
github.com/containerd/ttrpc v0.0.0-20190828154514-0e0f228740de/go.mod h1:PvCDdDGpgqzQIzDW1TphrGLssLDZp2GuS+X5DkEJB8o=
github.com/containerd/ttrpc v0.0.0-20190828172938-92c8520ef9f8/go.mod h1:PvCDdDGpgqzQIzDW1TphrGLssLDZp2GuS+X5DkEJB8o=
github.com/containerd/ttrpc v0.0.0-20191028202541-4f1b8fe65a5c/go.mod h1:LPm1u0xBw8r8NOKoOdNMeVHSawSsltak+Ihv+etqsE8=

12
vendor/github.com/containerd/stargz-snapshotter/snapshot/snapshot.go generated vendored
View File

@ -73,6 +73,7 @@ type FileSystem interface {
// SnapshotterConfig is used to configure the remote snapshotter instance
type SnapshotterConfig struct {
asyncRemove bool
noRestore bool
}
// Opt is an option to configure the remote snapshotter
@ -87,6 +88,11 @@ func AsynchronousRemove(config *SnapshotterConfig) error {
return nil
}
func NoRestore(config *SnapshotterConfig) error {
config.noRestore = true
return nil
}
type snapshotter struct {
root string
ms *storage.MetaStore
@ -95,6 +101,7 @@ type snapshotter struct {
// fs is a filesystem that this snapshotter recognizes.
fs FileSystem
userxattr bool // whether to enable "userxattr" mount option
noRestore bool
}
// NewSnapshotter returns a Snapshotter which can use unpacked remote layers
@ -143,6 +150,7 @@ func NewSnapshotter(ctx context.Context, root string, targetFs FileSystem, opts
asyncRemove: config.asyncRemove,
fs: targetFs,
userxattr: userxattr,
noRestore: config.noRestore,
}
if err := o.restoreRemoteSnapshot(ctx); err != nil {
@ -719,6 +727,10 @@ func (o *snapshotter) restoreRemoteSnapshot(ctx context.Context) error {
}
}
if o.noRestore {
return nil
}
var task []snapshots.Info
if err := o.Walk(ctx, func(ctx context.Context, info snapshots.Info) error {
if _, ok := info.Labels[remoteLabel]; ok {

4
vendor/modules.txt vendored
View File

@ -152,7 +152,7 @@ github.com/containerd/go-cni
# github.com/containerd/go-runc v1.0.0
## explicit; go 1.13
github.com/containerd/go-runc
# github.com/containerd/stargz-snapshotter v0.11.1
# github.com/containerd/stargz-snapshotter v0.11.2-0.20220223051521-b1ce4c8d8294
## explicit; go 1.16
github.com/containerd/stargz-snapshotter/cache
github.com/containerd/stargz-snapshotter/fs
@ -171,7 +171,7 @@ github.com/containerd/stargz-snapshotter/task
github.com/containerd/stargz-snapshotter/util/cacheutil
github.com/containerd/stargz-snapshotter/util/namedmutex
github.com/containerd/stargz-snapshotter/util/testutil
# github.com/containerd/stargz-snapshotter/estargz v0.11.1
# github.com/containerd/stargz-snapshotter/estargz v0.11.2-0.20220223051521-b1ce4c8d8294
## explicit; go 1.16
github.com/containerd/stargz-snapshotter/estargz
github.com/containerd/stargz-snapshotter/estargz/errorutil