diff options
| author | Noah Misch <noah@leadboat.com> | 2018-12-10 20:15:42 -0800 |
|---|---|---|
| committer | Noah Misch <noah@leadboat.com> | 2018-12-10 20:15:42 -0800 |
| commit | 1db439ad49255d8fb0371cc7166cdc33f6b3fdf3 (patch) | |
| tree | d295a9d7b19f3c6c2265ca7218fd488eef35287d /src/test/isolation/isolationtester.c | |
| parent | 001bb9f3ed05e7c370151f7aad3a83447c52c157 (diff) | |
| download | postgresql-1db439ad49255d8fb0371cc7166cdc33f6b3fdf3.tar.gz postgresql-1db439ad49255d8fb0371cc7166cdc33f6b3fdf3.zip | |
Raise some timeouts to 180s, in test code.
Slow runs of buildfarm members chipmunk, hornet and mandrill saw the
shorter timeouts expire. The 180s timeout in poll_query_until has been
trouble-free since 2a0f89cd717ce6d49cdc47850577823682167e87 introduced
it two years ago, so use 180s more widely. Back-patch to 9.6, where the
first of these timeouts was introduced.
Reviewed by Michael Paquier.
Discussion: https://postgr.es/m/20181209001601.GC2973271@rfd.leadboat.com
Diffstat (limited to 'src/test/isolation/isolationtester.c')
| -rw-r--r-- | src/test/isolation/isolationtester.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/test/isolation/isolationtester.c b/src/test/isolation/isolationtester.c index 7df67da333c..9134b0505eb 100644 --- a/src/test/isolation/isolationtester.c +++ b/src/test/isolation/isolationtester.c @@ -783,15 +783,15 @@ try_complete_step(Step *step, int flags) td += (int64) current_time.tv_usec - (int64) start_time.tv_usec; /* - * After 60 seconds, try to cancel the query. + * After 180 seconds, try to cancel the query. * * If the user tries to test an invalid permutation, we don't want * to hang forever, especially when this is running in the - * buildfarm. So try to cancel it after a minute. This will - * presumably lead to this permutation failing, but remaining - * permutations and tests should still be OK. + * buildfarm. This will presumably lead to this permutation + * failing, but remaining permutations and tests should still be + * OK. */ - if (td > 60 * USECS_PER_SEC && !canceled) + if (td > 180 * USECS_PER_SEC && !canceled) { PGcancel *cancel = PQgetCancel(conn); @@ -808,15 +808,15 @@ try_complete_step(Step *step, int flags) } /* - * After 75 seconds, just give up and die. + * After 200 seconds, just give up and die. * * Since cleanup steps won't be run in this case, this may cause * later tests to fail. That stinks, but it's better than waiting * forever for the server to respond to the cancel. */ - if (td > 75 * USECS_PER_SEC) + if (td > 200 * USECS_PER_SEC) { - fprintf(stderr, "step %s timed out after 75 seconds\n", + fprintf(stderr, "step %s timed out after 200 seconds\n", step->name); exit_nicely(); } |