Skip to content

Commit

Permalink
Revert "Update hyperkit go module"
Browse files Browse the repository at this point in the history
The updated hyperkit go module seems to be the root cause of
crc-org/crc#2158

I've confirmed that by just changing the version of the hyperkit module
the bug comes and go. crc/bundle/machine driver code are all unchanged
in these tests.
github.com/moby/hyperkit v0.0.0-20171206102831-721ca707b187 hangs after
a few minutes
github.com/moby/hyperkit v0.0.0-20171206102043-1d2506619d57 runs for 15+
minutes without hanging
I did not test the few commits in between

This is fairly mysterious at this point as the hyperkit commandline is
identical, qcow-tool is not installed so this should not related to the
new qcow-tool code in the updated module.

This reverts commit a0c6e87.
  • Loading branch information
cfergeau authored and anjannath committed Apr 5, 2021
1 parent 551e7c7 commit b93f89d
Show file tree
Hide file tree
Showing 10 changed files with 243 additions and 736 deletions.
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ require (
github.com/code-ready/machine v0.0.0-20210211073310-3b9fff90883f
github.com/kr/text v0.2.0 // indirect
github.com/mitchellh/go-ps v1.0.0
github.com/moby/hyperkit v0.0.0-20210108224842-2f061e447e14
github.com/moby/hyperkit v0.0.0-20171204115932-858492e3d919
github.com/pkg/errors v0.9.1
github.com/sirupsen/logrus v1.8.1
github.com/zchee/go-vmnet v0.0.0-20161021174912-97ebf9174097
Expand Down
7 changes: 1 addition & 6 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,8 @@ github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
github.com/mitchellh/go-ps v1.0.0 h1:i6ampVEEF4wQFF+bkYfwYgY+F/uYJDktmvLPf7qIgjc=
github.com/mitchellh/go-ps v1.0.0/go.mod h1:J4lOc8z8yJs6vUwklHw2XEIiT4z4C40KtWVN3nvg8Pg=
github.com/moby/hyperkit v0.0.0-20210108224842-2f061e447e14 h1:XGy4iMfaG4r1uZKZQmEPSYSH0Nj5JJuKgPNUhWGQ08E=
github.com/moby/hyperkit v0.0.0-20210108224842-2f061e447e14/go.mod h1:aBcAEoy5u01cPAYvosR85gzSrMZ0TVVnkPytOQN+9z8=
github.com/moby/hyperkit v0.0.0-20171204115932-858492e3d919/go.mod h1:zGAVB/FkAf4ozkR8CCuj4LcVuErrNsj9APTDFvhOckw=
github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
Expand All @@ -23,13 +21,10 @@ github.com/sirupsen/logrus v1.8.1 h1:dJKuHgqk1NNQlqoA6BTlM1Wf9DOH3NBjQyu0h9+AZZE
github.com/sirupsen/logrus v1.8.1/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0=
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY=
github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
github.com/zchee/go-vmnet v0.0.0-20161021174912-97ebf9174097 h1:Ucx5I1l1+TWXvqFmBigYu4Ub4MLvUuUU/whjoUvV95I=
github.com/zchee/go-vmnet v0.0.0-20161021174912-97ebf9174097/go.mod h1:lFZSWRIpCfE/pt91hHBBpV6+x87YlCjsp+aIR2qCPPU=
golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20201015000850-e3ed0017c211/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20210309074719-68d13333faf2 h1:46ULzRKLh1CwgRq2dC5SlBzEqqNCi8rreOZnNrbqcIY=
golang.org/x/sys v0.0.0-20210309074719-68d13333faf2/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
Expand Down
11 changes: 6 additions & 5 deletions pkg/hyperkit/driver.go
Original file line number Diff line number Diff line change
Expand Up @@ -202,14 +202,15 @@ func (d *Driver) Start() error {
if d.ImageFormat != "qcow2" {
return fmt.Errorf("Unsupported VM image format: %s", d.ImageFormat)
}
h.Disks = []hyperkit.Disk{
&hyperkit.QcowDisk{
Path: d.getDiskPath(),
Trim: true,
h.Disks = []hyperkit.DiskConfig{
{
Path: fmt.Sprintf("file://%s", d.getDiskPath()),
Driver: "virtio-blk",
Format: "qcow",
},
}
log.Debugf("Starting with cmdline: %s", d.Cmdline)
if _, err := h.Start(d.Cmdline); err != nil {
if err := h.Start(d.Cmdline); err != nil {
log.Debugf("Error trying to execute %s", h.CmdLine)
return errors.Wrapf(err, "starting with cmd line: %s", d.Cmdline)
}
Expand Down
13 changes: 2 additions & 11 deletions vendor/github.com/moby/hyperkit/go/Makefile

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit b93f89d

Please sign in to comment.