aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPalash Oswal <oswalpalash@gmail.com>2020-10-03 18:05:55 +0530
committerDmitry Vyukov <dvyukov@google.com>2020-10-04 10:20:58 +0200
commiteafbf0c3456ba8d59abc88830116a64282e5ff2e (patch)
treee8548a2930ff25456d1528624480890577f9e827
parent1a3f94087169f62f9a5832828f62b4900e98b781 (diff)
vm/qemu/qemu.go: update SCP Timeout for Slower devices/Nested Virtualisation
Increased the timeout for SCP of the initial binaries after boot to 10 minutes to allow more time in a slow environment. This was causing timeouts often in a nested virtualised environment on a slower hardware.
-rw-r--r--CONTRIBUTORS1
-rw-r--r--vm/qemu/qemu.go2
2 files changed, 2 insertions, 1 deletions
diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index e3a7857a6..7bb381c12 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -77,3 +77,4 @@ Jouni Högander
VMware
Radoslav Gerganov
Suraj K Suresh
+Palash Oswal
diff --git a/vm/qemu/qemu.go b/vm/qemu/qemu.go
index 13716d48e..3034382ce 100644
--- a/vm/qemu/qemu.go
+++ b/vm/qemu/qemu.go
@@ -522,7 +522,7 @@ func (inst *instance) Copy(hostSrc string) (string, error) {
if inst.debug {
log.Logf(0, "running command: scp %#v", args)
}
- _, err := osutil.RunCmd(3*time.Minute, "", "scp", args...)
+ _, err := osutil.RunCmd(10*time.Minute, "", "scp", args...)
if err != nil {
return "", err
}