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

diff --git a/src/test/isolation/README b/src/test/isolation/README
index bea278a856fffc911a7819fe8055f7e328fcac5f..780b6dca1b8eec4bf088d36a54c2129d5eae81f5 100644 (file)
--- a/src/test/isolation/README
+++ b/src/test/isolation/README
@@ -108,8 +108,8 @@ Each step may contain commands that block until further action has been taken
 deadlock).  A test that uses this ability must manually specify valid
 permutations, i.e. those that would not expect a blocked session to execute a
 command.  If a test fails to follow that rule, isolationtester will cancel it
-after 60 seconds.  If the cancel doesn't work, isolationtester will exit
-uncleanly after a total of 75 seconds of wait time.  Testing invalid
+after 180 seconds.  If the cancel doesn't work, isolationtester will exit
+uncleanly after a total of 200 seconds of wait time.  Testing invalid
 permutations should be avoided because they can make the isolation tests take
 a very long time to run, and they serve no useful testing purpose.
 

diff --git a/src/test/isolation/isolationtester.c b/src/test/isolation/isolationtester.c
index 4f0c8ad4a8538155c65972697e4dfb9407935db1..f6316ad52a6af003f813499d66d2e3319cc23eec 100644 (file)
--- a/src/test/isolation/isolationtester.c
+++ b/src/test/isolation/isolationtester.c
@@ -768,15 +768,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);
 
@@ -793,15 +793,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();
            }