[master] 37b6c8326 Revert "setting thread_pool_timeout is useless because vtc_mode overrides"

[Nils Goroll]

commit 37b6c83265ee4f7178784513e7f1177d97802590
Author: Nils Goroll <nils.goroll at uplex.de>
Date:   Tue Apr 23 17:20:28 2019 +0200

    Revert "setting thread_pool_timeout is useless because vtc_mode overrides"
    
    This reverts commit fa3e141975ee5c26735c150ce07c5575ae746578.
    
    We might have over-bread such that thread_pool_timeout becomes relevant
    at the other place in pool_herder()

diff --git a/bin/varnishtest/tests/r01490.vtc b/bin/varnishtest/tests/r01490.vtc
index 7ca0b23e2..88c2550aa 100644
--- a/bin/varnishtest/tests/r01490.vtc
+++ b/bin/varnishtest/tests/r01490.vtc
@@ -9,6 +9,7 @@ varnish v1 \
 	-arg "-p thread_pool_min=2" \
 	-arg "-p thread_pool_max=3" \
 	-arg "-p thread_pools=1" \
+	-arg "-p thread_pool_timeout=10" \
 	-vcl+backend {}
 varnish v1 -start
 
@@ -23,16 +24,16 @@ logexpect l1 -v v1 -g raw {
 
 varnish v1 -cliok "param.set thread_pool_min 3"
 
-# thread_pool_timeout overridden by vtc_mode with delay=0.5
-delay 1
+# Have to wait longer than thread_pool_timeout
+delay 11
 
 varnish v1 -expect threads == 3
 
 varnish v1 -cliok "param.set thread_pool_min 2"
 varnish v1 -cliok "param.set thread_pool_max 2"
 
-# thread_pool_timeout overridden by vtc_mode with delay=0.5
-delay 1
+# Have to wait longer than thread_pool_timeout
+delay 11
 
 varnish v1 -expect threads == 2