Skip to content

Commit 31aa418

Browse files
estespestesp
authored
Merge pull request #2704 from jterry75/remove_tar2vhd
Remove dependency on tar2vhd for LCOW differ
2 parents 15f19d7 + cce78d4 commit 31aa418

13 files changed

Lines changed: 2085 additions & 48 deletions

File tree

‎diff/lcow/lcow.go‎

Lines changed: 22 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,11 @@ package lcow
2121
import (
2222
"context"
2323
"io"
24-
"os/exec"
24+
"os"
2525
"path"
2626
"time"
2727

28+
"github.com/Microsoft/hcsshim/ext4/tar2ext4"
2829
"github.com/containerd/containerd/archive/compression"
2930
"github.com/containerd/containerd/content"
3031
"github.com/containerd/containerd/diff"
@@ -40,6 +41,11 @@ import (
4041
"github.com/sirupsen/logrus"
4142
)
4243

44+
const (
45+
// maxLcowVhdSizeGB is the max size in GB of any layer
46+
maxLcowVhdSizeGB = 128 * 1024 * 1024 * 1024
47+
)
48+
4349
func init() {
4450
plugin.Register(&plugin.Registration{
4551
Type: plugin.DiffPlugin,
@@ -131,15 +137,22 @@ func (s windowsLcowDiff) Apply(ctx context.Context, desc ocispec.Descriptor, mou
131137
r: io.TeeReader(rdr, digester.Hash()),
132138
}
133139

134-
cmd := exec.Command(
135-
"runhcs.exe",
136-
"tar2vhd",
137-
"--scratchpath", path.Join(layer, "sandbox.vhdx"), // TODO: JTERRY75 when the snapshotter changes this to be scratch.vhdx update it here too.
138-
"--destpath", path.Join(layer, "layer.vhd"))
140+
layerPath := path.Join(layer, "layer.vhd")
141+
outFile, err := os.Create(layerPath)
142+
if err != nil {
143+
return emptyDesc, err
144+
}
145+
defer outFile.Close()
146+
defer func() {
147+
if err != nil {
148+
outFile.Close()
149+
os.Remove(layerPath)
150+
}
151+
}()
139152

140-
cmd.Stdin = rc
141-
if bytes, err := cmd.CombinedOutput(); err != nil {
142-
return emptyDesc, errors.Wrapf(err, "failed to exec runhcs.exe tar2vhd: %s", string(bytes))
153+
err = tar2ext4.Convert(rc, outFile, tar2ext4.ConvertWhiteout, tar2ext4.AppendVhdFooter, tar2ext4.MaximumDiskSize(maxLcowVhdSizeGB))
154+
if err != nil {
155+
return emptyDesc, errors.Wrapf(err, "failed to convert tar to ext4 vhd")
143156
}
144157

145158
return ocispec.Descriptor{

‎vendor.conf‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ golang.org/x/sync 450f422ab23cf9881c94e2db30cac0eb1b7cf80c
3333
github.com/BurntSushi/toml a368813c5e648fee92e5f6c30e3944ff9d5e8895
3434
github.com/grpc-ecosystem/go-grpc-prometheus 6b7015e65d366bf3f19b2b2a000a831940f0f7e0
3535
github.com/Microsoft/go-winio v0.4.10
36-
github.com/Microsoft/hcsshim v0.7.6
36+
github.com/Microsoft/hcsshim v0.7.9
3737
google.golang.org/genproto d80a6e20e776b0b17a324d0ba1ab50a39c8e8944
3838
golang.org/x/text 19e51611da83d6be54ddafce4a4af510cb3e9ea4
3939
github.com/containerd/ttrpc 2a805f71863501300ae1976d29f0454ae003e85a

‎vendor/github.com/Microsoft/hcsshim/cmd/go-runhcs/runhcs.go‎

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/Microsoft/hcsshim/cmd/go-runhcs/runhcs_create.go‎

Lines changed: 3 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/Microsoft/hcsshim/cmd/go-runhcs/runhcs_exec.go‎

Lines changed: 2 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)