aboutsummaryrefslogtreecommitdiffstats
path: root/vm
diff options
context:
space:
mode:
authorDmitry Vyukov <dvyukov@google.com>2019-05-20 18:53:12 +0200
committerDmitry Vyukov <dvyukov@google.com>2019-05-20 19:40:20 +0200
commit32ebe81cf3e222b41b03b774ce59bee2e7ec923f (patch)
treeae20bdad248b6946682738a3869c4e898e4e6bc8 /vm
parent2c9280d432039ad490051c3e1ba130ee268057a6 (diff)
pkg/repro: fix no output timeout
We duplicated the no output timeout in the repro package, and it got out of sync. It's not 3 mins now, but 5 mins. Remove the duplication and fix this.
Diffstat (limited to 'vm')
-rw-r--r--vm/vm.go4
-rw-r--r--vm/vm_test.go2
2 files changed, 3 insertions, 3 deletions
diff --git a/vm/vm.go b/vm/vm.go
index 3e6ee0cd7..28eddeef0 100644
--- a/vm/vm.go
+++ b/vm/vm.go
@@ -225,7 +225,7 @@ func (inst *Instance) MonitorExecution(outc <-chan []byte, errc <-chan error,
// in 140-280s detection delay.
// So the current timeout is 5 mins (300s).
// We don't want it to be too long too because it will waste time on real hangs.
- if time.Since(lastExecuteTime) < noOutputTimeout {
+ if time.Since(lastExecuteTime) < NoOutputTimeout {
break
}
diag, wait := inst.Diagnose()
@@ -347,7 +347,7 @@ var (
beforeContext = 1024 << 10
afterContext = 128 << 10
+ NoOutputTimeout = 5 * time.Minute
tickerPeriod = 10 * time.Second
- noOutputTimeout = 5 * time.Minute
waitForOutputTimeout = 10 * time.Second
)
diff --git a/vm/vm_test.go b/vm/vm_test.go
index 702e2626e..e55cf2184 100644
--- a/vm/vm_test.go
+++ b/vm/vm_test.go
@@ -72,7 +72,7 @@ func (inst *testInstance) Close() {
func init() {
beforeContext = 200
tickerPeriod = 1 * time.Second
- noOutputTimeout = 5 * time.Second
+ NoOutputTimeout = 5 * time.Second
waitForOutputTimeout = 3 * time.Second
ctor := func(env *vmimpl.Env) (vmimpl.Pool, error) {