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

Merge pull request #2644 from dgageot/nathanleclaire-xtra_vbox_logs 

Add extra logging to VirtualBox driver
This commit is contained in:
David Gageot 2015-12-21 09:46:31 +01:00
parent c584b8e641 54bda622d3
commit df30a135b2
1 changed files with 22 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
drivers/virtualbox/virtualbox.go
View File

@ -666,6 +666,9 @@ func (d *Driver) generateDiskImage(size int) error {
// magicString first so the automount script knows to format the disk
file := &tar.Header{Name: magicString, Size: int64(len(magicString))}
log.Debug("Writing magic tar header")
if err := tw.WriteHeader(file); err != nil {
return err
}
@ -677,6 +680,9 @@ func (d *Driver) generateDiskImage(size int) error {
if err := tw.WriteHeader(file); err != nil {
return err
}
log.Debug("Writing SSH key tar header")
pubKey, err := ioutil.ReadFile(d.publicSSHKeyPath())
if err != nil {
return err
@ -699,6 +705,9 @@ func (d *Driver) generateDiskImage(size int) error {
return err
}
raw := bytes.NewReader(buf.Bytes())
log.Debug("Calling inner createDiskImage")
return createDiskImage(d.diskPath(), size, raw)
}
@ -770,6 +779,8 @@ func createDiskImage(dest string, size int, r io.Reader) error {
cmd := exec.Command(vboxManageCmd, "convertfromraw", "stdin", dest,
fmt.Sprintf("%d", sizeBytes), "--format", "VMDK")
log.Debug(cmd)
if os.Getenv("MACHINE_DEBUG") != "" {
cmd.Stdout = os.Stdout
cmd.Stderr = os.Stderr
@ -779,15 +790,22 @@ func createDiskImage(dest string, size int, r io.Reader) error {
if err != nil {
return err
}
log.Debug("Starting command")
if err := cmd.Start(); err != nil {
return err
}
log.Debug("Copying to stdin")
n, err := io.Copy(stdin, r)
if err != nil {
return err
}
log.Debug("Filling zeroes")
// The total number of bytes written to stdin must match sizeBytes, or
// VBoxManage.exe on Windows will fail. Fill remaining with zeros.
if left := sizeBytes - n; left > 0 {
@ -796,11 +814,15 @@ func createDiskImage(dest string, size int, r io.Reader) error {
}
}
log.Debug("Closing STDIN")
// cmd won't exit until the stdin is closed.
if err := stdin.Close(); err != nil {
return err
}
log.Debug("Waiting on cmd")
return cmd.Wait()
}