From 8c933bc839f6b3591152d188b626cb43aced3828 Mon Sep 17 00:00:00 2001 From: Wang Xu Date: Wed, 10 May 2017 15:51:07 +0800 Subject: [PATCH] update runV dep for 0.8.1 release - hyperhq/runv#498 Signed-off-by: Wang Xu --- .../hyperhq/runv/hypervisor/vm_states.go | 15 ++- vendor/vendor.json | 114 +++++++++--------- 2 files changed, 66 insertions(+), 63 deletions(-) diff --git a/vendor/github.com/hyperhq/runv/hypervisor/vm_states.go b/vendor/github.com/hyperhq/runv/hypervisor/vm_states.go index 47a48c9d..2e25563a 100644 --- a/vendor/github.com/hyperhq/runv/hypervisor/vm_states.go +++ b/vendor/github.com/hyperhq/runv/hypervisor/vm_states.go @@ -172,6 +172,7 @@ func streamCopy(tty *TtyIO, stdinPipe io.WriteCloser, stdoutPipe, stderrPipe io. var wg sync.WaitGroup // old way cleanup all(expect stdinPipe) no matter what kinds of fails, TODO: change it var once sync.Once + // cleanup closes tty.Stdin and thus terminates the first go routine cleanup := func() { tty.Close() // stdinPipe is directly closed in the first go routine @@ -181,7 +182,6 @@ func streamCopy(tty *TtyIO, stdinPipe io.WriteCloser, stdoutPipe, stderrPipe io. } } if tty.Stdin != nil { - wg.Add(1) go func() { _, err := io.Copy(stdinPipe, tty.Stdin) stdinPipe.Close() @@ -189,22 +189,25 @@ func streamCopy(tty *TtyIO, stdinPipe io.WriteCloser, stdoutPipe, stderrPipe io. // we should not call cleanup when tty.Stdin reaches EOF once.Do(cleanup) } - wg.Done() }() } if tty.Stdout != nil { wg.Add(1) go func() { - io.Copy(tty.Stdout, stdoutPipe) - once.Do(cleanup) + _, err := io.Copy(tty.Stdout, stdoutPipe) + if err != nil { + once.Do(cleanup) + } wg.Done() }() } if tty.Stderr != nil && stderrPipe != nil { wg.Add(1) go func() { - io.Copy(tty.Stderr, stderrPipe) - once.Do(cleanup) + _, err := io.Copy(tty.Stderr, stderrPipe) + if err != nil { + once.Do(cleanup) + } wg.Done() }() } diff --git a/vendor/vendor.json b/vendor/vendor.json index 14b9a743..fbf6dd25 100644 --- a/vendor/vendor.json +++ b/vendor/vendor.json @@ -1562,190 +1562,190 @@ "checksumSHA1": "FdMUnoay+C6KMuQJycdmclH5IcI=", "comment": "v0.8.0-21-g2ff5bd5", "path": "github.com/hyperhq/runv/api", - "revision": "73016ca16dc8d72e8ee8c9c587f57bd7e1a4f98f", - "revisionTime": "2017-04-25T01:53:18Z" + "revision": "9a99c100e223c8c134a79a7fb454347b37a88a5e", + "revisionTime": "2017-05-08T02:00:23Z" }, { - "checksumSHA1": "8YILZAPjZSzXy0I53S6TiVdd5pY=", + "checksumSHA1": "rpg/EPhyWW/AuX+uvrHnRQHELt8=", "comment": "v0.8.0-21-g2ff5bd5", "path": "github.com/hyperhq/runv/driverloader", - "revision": "73016ca16dc8d72e8ee8c9c587f57bd7e1a4f98f", - "revisionTime": "2017-04-25T01:53:18Z" + "revision": "9a99c100e223c8c134a79a7fb454347b37a88a5e", + "revisionTime": "2017-05-08T02:00:23Z" }, { "checksumSHA1": "q6YN3/ZY/L6eGUiu9inc4VJy7bo=", "comment": "v0.8.0-21-g2ff5bd5", "path": "github.com/hyperhq/runv/factory", - "revision": "73016ca16dc8d72e8ee8c9c587f57bd7e1a4f98f", - "revisionTime": "2017-04-25T01:53:18Z" + "revision": "9a99c100e223c8c134a79a7fb454347b37a88a5e", + "revisionTime": "2017-05-08T02:00:23Z" }, { "checksumSHA1": "3fMRgjly6yNBVu+dK3+VAkA2Ijg=", "comment": "v0.8.0-21-g2ff5bd5", "path": "github.com/hyperhq/runv/factory/base", - "revision": "73016ca16dc8d72e8ee8c9c587f57bd7e1a4f98f", - "revisionTime": "2017-04-25T01:53:18Z" + "revision": "9a99c100e223c8c134a79a7fb454347b37a88a5e", + "revisionTime": "2017-05-08T02:00:23Z" }, { "checksumSHA1": "J0IhP6X/2ANAFulzfrZS3iPvlHE=", "comment": "v0.8.0-21-g2ff5bd5", "path": "github.com/hyperhq/runv/factory/cache", - "revision": "73016ca16dc8d72e8ee8c9c587f57bd7e1a4f98f", - "revisionTime": "2017-04-25T01:53:18Z" + "revision": "9a99c100e223c8c134a79a7fb454347b37a88a5e", + "revisionTime": "2017-05-08T02:00:23Z" }, { "checksumSHA1": "dMqyDvvPH/9jn08hg1smsu95qmQ=", "comment": "v0.8.0-21-g2ff5bd5", "path": "github.com/hyperhq/runv/factory/direct", - "revision": "73016ca16dc8d72e8ee8c9c587f57bd7e1a4f98f", - "revisionTime": "2017-04-25T01:53:18Z" + "revision": "9a99c100e223c8c134a79a7fb454347b37a88a5e", + "revisionTime": "2017-05-08T02:00:23Z" }, { "checksumSHA1": "uuz/WaRZ9KqIFKIxAXuLdL0qdbg=", "comment": "v0.8.0-21-g2ff5bd5", "path": "github.com/hyperhq/runv/factory/multi", - "revision": "73016ca16dc8d72e8ee8c9c587f57bd7e1a4f98f", - "revisionTime": "2017-04-25T01:53:18Z" + "revision": "9a99c100e223c8c134a79a7fb454347b37a88a5e", + "revisionTime": "2017-05-08T02:00:23Z" }, { "checksumSHA1": "TfPen9XyXhztUtbOCZQfsIgauRc=", "comment": "v0.8.0-21-g2ff5bd5", "path": "github.com/hyperhq/runv/factory/single", - "revision": "73016ca16dc8d72e8ee8c9c587f57bd7e1a4f98f", - "revisionTime": "2017-04-25T01:53:18Z" + "revision": "9a99c100e223c8c134a79a7fb454347b37a88a5e", + "revisionTime": "2017-05-08T02:00:23Z" }, { "checksumSHA1": "tHQbmmuYiQ5I4jEjLZDdWkuAt9Y=", "comment": "v0.8.0-21-g2ff5bd5", "path": "github.com/hyperhq/runv/factory/template", - "revision": "73016ca16dc8d72e8ee8c9c587f57bd7e1a4f98f", - "revisionTime": "2017-04-25T01:53:18Z" + "revision": "9a99c100e223c8c134a79a7fb454347b37a88a5e", + "revisionTime": "2017-05-08T02:00:23Z" }, { "checksumSHA1": "ShG4X3Myzi4GXZ7Q8wI1W27aa0M=", "comment": "v0.8.0-21-g2ff5bd5", "path": "github.com/hyperhq/runv/hyperstart/api/json", - "revision": "73016ca16dc8d72e8ee8c9c587f57bd7e1a4f98f", - "revisionTime": "2017-04-25T01:53:18Z" + "revision": "9a99c100e223c8c134a79a7fb454347b37a88a5e", + "revisionTime": "2017-05-08T02:00:23Z" }, { "checksumSHA1": "raItqW5UAOXxu44TKajkJ2BNidY=", "comment": "v0.8.0-21-g2ff5bd5", "path": "github.com/hyperhq/runv/hyperstart/libhyperstart", - "revision": "73016ca16dc8d72e8ee8c9c587f57bd7e1a4f98f", - "revisionTime": "2017-04-25T01:53:18Z" + "revision": "9a99c100e223c8c134a79a7fb454347b37a88a5e", + "revisionTime": "2017-05-08T02:00:23Z" }, { - "checksumSHA1": "MKxOJ2hfYLQb98wpxNs9/Imab0s=", + "checksumSHA1": "zBktNAA+z2h2BmlCbqriU/NkCoo=", "comment": "v0.8.0-21-g2ff5bd5", "path": "github.com/hyperhq/runv/hypervisor", - "revision": "73016ca16dc8d72e8ee8c9c587f57bd7e1a4f98f", - "revisionTime": "2017-04-25T01:53:18Z" + "revision": "9a99c100e223c8c134a79a7fb454347b37a88a5e", + "revisionTime": "2017-05-08T02:00:23Z" }, { "checksumSHA1": "611n4L0WF9iZ8EmD6oM83eUJ6/M=", "comment": "v0.8.0-21-g2ff5bd5", "path": "github.com/hyperhq/runv/hypervisor/libvirt", - "revision": "73016ca16dc8d72e8ee8c9c587f57bd7e1a4f98f", - "revisionTime": "2017-04-25T01:53:18Z" + "revision": "9a99c100e223c8c134a79a7fb454347b37a88a5e", + "revisionTime": "2017-05-08T02:00:23Z" }, { "checksumSHA1": "h/pDLdFw6PWPK6rt0XJIS8w01C8=", "comment": "v0.8.0-21-g2ff5bd5", "path": "github.com/hyperhq/runv/hypervisor/network", - "revision": "73016ca16dc8d72e8ee8c9c587f57bd7e1a4f98f", - "revisionTime": "2017-04-25T01:53:18Z" + "revision": "9a99c100e223c8c134a79a7fb454347b37a88a5e", + "revisionTime": "2017-05-08T02:00:23Z" }, { "checksumSHA1": "YAUAfc2PYReSINQp6X3xClJJpgs=", "comment": "v0.8.0-21-g2ff5bd5", "path": "github.com/hyperhq/runv/hypervisor/network/ipallocator", - "revision": "73016ca16dc8d72e8ee8c9c587f57bd7e1a4f98f", - "revisionTime": "2017-04-25T01:53:18Z" + "revision": "9a99c100e223c8c134a79a7fb454347b37a88a5e", + "revisionTime": "2017-05-08T02:00:23Z" }, { "checksumSHA1": "X0A7y9yULUB+nT28FCOZZrXSglU=", "comment": "v0.8.0-21-g2ff5bd5", "path": "github.com/hyperhq/runv/hypervisor/network/iptables", - "revision": "73016ca16dc8d72e8ee8c9c587f57bd7e1a4f98f", - "revisionTime": "2017-04-25T01:53:18Z" + "revision": "9a99c100e223c8c134a79a7fb454347b37a88a5e", + "revisionTime": "2017-05-08T02:00:23Z" }, { "checksumSHA1": "TYTgJQHjo1W4BpRsgGU0Kc/sH/U=", "comment": "v0.8.0-21-g2ff5bd5", "path": "github.com/hyperhq/runv/hypervisor/network/portmapper", - "revision": "73016ca16dc8d72e8ee8c9c587f57bd7e1a4f98f", - "revisionTime": "2017-04-25T01:53:18Z" + "revision": "9a99c100e223c8c134a79a7fb454347b37a88a5e", + "revisionTime": "2017-05-08T02:00:23Z" }, { "checksumSHA1": "pXK1QzkWIat+rgAvE5Rz0pu/ujQ=", "comment": "v0.8.0-21-g2ff5bd5", "path": "github.com/hyperhq/runv/hypervisor/qemu", - "revision": "73016ca16dc8d72e8ee8c9c587f57bd7e1a4f98f", - "revisionTime": "2017-04-25T01:53:18Z" + "revision": "9a99c100e223c8c134a79a7fb454347b37a88a5e", + "revisionTime": "2017-05-08T02:00:23Z" }, { "checksumSHA1": "3THNIXtFjo57ExxWu0qIV2P4jJ4=", "comment": "v0.8.0-21-g2ff5bd5", "path": "github.com/hyperhq/runv/hypervisor/types", - "revision": "73016ca16dc8d72e8ee8c9c587f57bd7e1a4f98f", - "revisionTime": "2017-04-25T01:53:18Z" + "revision": "9a99c100e223c8c134a79a7fb454347b37a88a5e", + "revisionTime": "2017-05-08T02:00:23Z" }, { "checksumSHA1": "ZB5ND5VcrKnyqxfD0eW497ZCZyg=", "comment": "v0.8.0-21-g2ff5bd5", "path": "github.com/hyperhq/runv/hypervisor/vbox", - "revision": "73016ca16dc8d72e8ee8c9c587f57bd7e1a4f98f", - "revisionTime": "2017-04-25T01:53:18Z" + "revision": "9a99c100e223c8c134a79a7fb454347b37a88a5e", + "revisionTime": "2017-05-08T02:00:23Z" }, { "checksumSHA1": "WDwdjUNiB686Y639rAyUfvg17rE=", "comment": "v0.8.0-21-g2ff5bd5", "path": "github.com/hyperhq/runv/hypervisor/xen", - "revision": "73016ca16dc8d72e8ee8c9c587f57bd7e1a4f98f", - "revisionTime": "2017-04-25T01:53:18Z" + "revision": "9a99c100e223c8c134a79a7fb454347b37a88a5e", + "revisionTime": "2017-05-08T02:00:23Z" }, { "checksumSHA1": "CDAtmOBgEoM0EuL54NVwFc2Eynk=", "comment": "v0.8.0-21-g2ff5bd5", "path": "github.com/hyperhq/runv/lib/govbox", - "revision": "73016ca16dc8d72e8ee8c9c587f57bd7e1a4f98f", - "revisionTime": "2017-04-25T01:53:18Z" + "revision": "9a99c100e223c8c134a79a7fb454347b37a88a5e", + "revisionTime": "2017-05-08T02:00:23Z" }, { "checksumSHA1": "d0GuiUdHWWWsd8l8cfzAntU8AYw=", "comment": "v0.8.0-21-g2ff5bd5", "path": "github.com/hyperhq/runv/lib/telnet", - "revision": "73016ca16dc8d72e8ee8c9c587f57bd7e1a4f98f", - "revisionTime": "2017-04-25T01:53:18Z" + "revision": "9a99c100e223c8c134a79a7fb454347b37a88a5e", + "revisionTime": "2017-05-08T02:00:23Z" }, { "checksumSHA1": "EG1PoTyBE8u4bZvfCt7wKvqc6bU=", "comment": "v0.8.0-21-g2ff5bd5", "path": "github.com/hyperhq/runv/lib/term", - "revision": "73016ca16dc8d72e8ee8c9c587f57bd7e1a4f98f", - "revisionTime": "2017-04-25T01:53:18Z" + "revision": "9a99c100e223c8c134a79a7fb454347b37a88a5e", + "revisionTime": "2017-05-08T02:00:23Z" }, { - "checksumSHA1": "SnGYzTky8nYM8r1Hd2s7STWSuTQ=", + "checksumSHA1": "ovVdfwcewRlI6Kha2Dx4ynC/Nyo=", "comment": "v0.8.0-21-g2ff5bd5", "path": "github.com/hyperhq/runv/lib/utils", - "revision": "73016ca16dc8d72e8ee8c9c587f57bd7e1a4f98f", - "revisionTime": "2017-04-25T01:53:18Z" + "revision": "9a99c100e223c8c134a79a7fb454347b37a88a5e", + "revisionTime": "2017-05-08T02:00:23Z" }, { "checksumSHA1": "qVEK/HSC/OfWvcecGBs5N7BPlvg=", "comment": "v0.8.0-21-g2ff5bd5", "path": "github.com/hyperhq/runv/lib/vsock", - "revision": "73016ca16dc8d72e8ee8c9c587f57bd7e1a4f98f", - "revisionTime": "2017-04-25T01:53:18Z" + "revision": "9a99c100e223c8c134a79a7fb454347b37a88a5e", + "revisionTime": "2017-05-08T02:00:23Z" }, { "checksumSHA1": "u8YbTIs1ALeZy2kkrDwHeA2j5U0=", "comment": "v0.8.0-21-g2ff5bd5", "path": "github.com/hyperhq/runv/template", - "revision": "73016ca16dc8d72e8ee8c9c587f57bd7e1a4f98f", - "revisionTime": "2017-04-25T01:53:18Z" + "revision": "9a99c100e223c8c134a79a7fb454347b37a88a5e", + "revisionTime": "2017-05-08T02:00:23Z" }, { "comment": "0.2.2-6-g50d4dbd",