Skip to content

Commit e1552b2

Browse files
committed
cache: remove MigrateV2
This migration code was added in BuildKit v0.7.0 (Docker v20.10.0) in 31a9aee. That was in 2019, which is now 6 Years ago, so it's very unlikely for the old files to be still present. Removing this code would impact users migrating from Docker 19.03 or older, which are versions that reached EOL many years ago, so very unlikely. Signed-off-by: Sebastiaan van Stijn <[email protected]>
1 parent 649062d commit e1552b2

File tree

3 files changed

+3
-297
lines changed

3 files changed

+3
-297
lines changed

cache/migrate_v2.go

Lines changed: 0 additions & 267 deletions
This file was deleted.

worker/containerd/containerd.go

Lines changed: 1 addition & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ import (
1212
"github.com/containerd/containerd/v2/core/leases"
1313
"github.com/containerd/containerd/v2/pkg/gc"
1414
"github.com/containerd/platforms"
15-
"github.com/moby/buildkit/cache"
1615
"github.com/moby/buildkit/cache/metadata"
1716
"github.com/moby/buildkit/executor/containerdexecutor"
1817
"github.com/moby/buildkit/executor/oci"
@@ -135,19 +134,6 @@ func newContainerd(client *ctd.Client, workerOpts WorkerOptions) (base.WorkerOpt
135134
}
136135
}
137136

138-
snap := containerdsnapshot.NewSnapshotter(workerOpts.SnapshotterName, client.SnapshotService(workerOpts.SnapshotterName), workerOpts.Namespace, nil)
139-
140-
if err := cache.MigrateV2(
141-
context.TODO(),
142-
filepath.Join(root, "metadata.db"),
143-
filepath.Join(root, "metadata_v2.db"),
144-
cs,
145-
snap,
146-
lm,
147-
); err != nil {
148-
return base.WorkerOpt{}, err
149-
}
150-
151137
md, err := metadata.NewStore(filepath.Join(root, "metadata_v2.db"))
152138
if err != nil {
153139
return base.WorkerOpt{}, err
@@ -174,7 +160,7 @@ func newContainerd(client *ctd.Client, workerOpts WorkerOptions) (base.WorkerOpt
174160
MetadataStore: md,
175161
NetworkProviders: np,
176162
Executor: containerdexecutor.New(executorOpts),
177-
Snapshotter: snap,
163+
Snapshotter: containerdsnapshot.NewSnapshotter(workerOpts.SnapshotterName, client.SnapshotService(workerOpts.SnapshotterName), workerOpts.Namespace, nil),
178164
ContentStore: cs,
179165
Applier: winlayers.NewFileSystemApplierWithWindows(cs, df),
180166
Differ: winlayers.NewWalkingDiffWithWindows(cs, df),

worker/runc/runc.go

Lines changed: 2 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ import (
1515
"github.com/containerd/containerd/v2/plugins/content/local"
1616
"github.com/containerd/containerd/v2/plugins/diff/walking"
1717
"github.com/containerd/platforms"
18-
"github.com/moby/buildkit/cache"
1918
"github.com/moby/buildkit/cache/metadata"
2019
"github.com/moby/buildkit/executor/oci"
2120
"github.com/moby/buildkit/executor/resources"
@@ -130,18 +129,6 @@ func NewWorkerOpt(root string, snFactory SnapshotterFactory, rootless bool, proc
130129
}
131130

132131
maps.Copy(xlabels, labels)
133-
lm := leaseutil.WithNamespace(ctdmetadata.NewLeaseManager(mdb), "buildkit")
134-
snap := containerdsnapshot.NewSnapshotter(snFactory.Name, mdb.Snapshotter(snFactory.Name), "buildkit", idmap)
135-
if err := cache.MigrateV2(
136-
context.TODO(),
137-
filepath.Join(root, "metadata.db"),
138-
filepath.Join(root, "metadata_v2.db"),
139-
c,
140-
snap,
141-
lm,
142-
); err != nil {
143-
return opt, err
144-
}
145132

146133
md, err := metadata.NewStore(filepath.Join(root, "metadata_v2.db"))
147134
if err != nil {
@@ -155,14 +142,14 @@ func NewWorkerOpt(root string, snFactory SnapshotterFactory, rootless bool, proc
155142
MetadataStore: md,
156143
NetworkProviders: np,
157144
Executor: exe,
158-
Snapshotter: snap,
145+
Snapshotter: containerdsnapshot.NewSnapshotter(snFactory.Name, mdb.Snapshotter(snFactory.Name), "buildkit", idmap),
159146
ContentStore: c,
160147
Applier: winlayers.NewFileSystemApplierWithWindows(c, apply.NewFileSystemApplier(c)),
161148
Differ: winlayers.NewWalkingDiffWithWindows(c, walking.NewWalkingDiff(c)),
162149
ImageStore: nil, // explicitly
163150
Platforms: []ocispecs.Platform{platforms.Normalize(platforms.DefaultSpec())},
164151
IdentityMapping: idmap,
165-
LeaseManager: lm,
152+
LeaseManager: leaseutil.WithNamespace(ctdmetadata.NewLeaseManager(mdb), "buildkit"),
166153
GarbageCollect: mdb.GarbageCollect,
167154
ParallelismSem: parallelismSem,
168155
MountPoolRoot: filepath.Join(root, "cachemounts"),

0 commit comments

Comments
 (0)