From 58b1264745fbc77b8bdc0c06f01c4358794286d6 Mon Sep 17 00:00:00 2001 From: Otto van der Schaaf Date: Mon, 16 Feb 2015 11:50:58 +0100 Subject: [PATCH] native-fetcher: bump dns timeout to deflake running the tests Nginx sometimes receives an expected response from 8.8.8.8 when resolving host names, and the subsequent retry doesn't finish up in 10 seconds. Bumping the timeout helps, but does not fully explain why nginx is sometimes receiving an unexpected response. I'll create a separate issue for investigating that. --- test/nginx_system_test.sh | 1 + test/pagespeed_test.conf.template | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/test/nginx_system_test.sh b/test/nginx_system_test.sh index 1362dcf2d..efae23001 100644 --- a/test/nginx_system_test.sh +++ b/test/nginx_system_test.sh @@ -1263,6 +1263,7 @@ OUT=$(cat "test/tmp/error.log" \ | grep -v "\\[error\\].*Failed to make directory*" \ | grep -v "\\[error\\].*Could not create directories*" \ | grep -v "\\[error\\].*opening temp file: No such file or directory.*" \ + | grep -v "\\[error\\].*unexpected response.*" \ || true) check [ -z "$OUT" ] diff --git a/test/pagespeed_test.conf.template b/test/pagespeed_test.conf.template index 425d4e726..4f68513e8 100644 --- a/test/pagespeed_test.conf.template +++ b/test/pagespeed_test.conf.template @@ -40,7 +40,7 @@ http { pagespeed MessageBufferSize 200000; # Increase the default fetcher timeout to resolve sporadic flakeyness when # the native fetcher uses 8.8.8.8 to resolve. - pagespeed FetcherTimeoutMs 10000; + pagespeed FetcherTimeoutMs 30000; pagespeed NativeFetcherMaxKeepaliveRequests 50; root "@@SERVER_ROOT@@";