Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit752278e

Browse files
committed
Raise some timeouts to 180s, in test code.
Slow runs of buildfarm members chipmunk, hornet and mandrill saw theshorter timeouts expire. The 180s timeout in poll_query_until has beentrouble-free since2a0f89c introducedit two years ago, so use 180s more widely. Back-patch to 9.6, where thefirst of these timeouts was introduced.Reviewed by Michael Paquier.Discussion:https://postgr.es/m/20181209001601.GC2973271@rfd.leadboat.com
1 parent0f9fd74 commit752278e

File tree

2 files changed

+10
-10
lines changed

2 files changed

+10
-10
lines changed

‎src/test/isolation/README

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -108,8 +108,8 @@ Each step may contain commands that block until further action has been taken
108108
deadlock). A test that uses this ability must manually specify valid
109109
permutations, i.e. those that would not expect a blocked session to execute a
110110
command. If a test fails to follow that rule, isolationtester will cancel it
111-
after60 seconds. If the cancel doesn't work, isolationtester will exit
112-
uncleanly after a total of75 seconds of wait time. Testing invalid
111+
after180 seconds. If the cancel doesn't work, isolationtester will exit
112+
uncleanly after a total of200 seconds of wait time. Testing invalid
113113
permutations should be avoided because they can make the isolation tests take
114114
a very long time to run, and they serve no useful testing purpose.
115115

‎src/test/isolation/isolationtester.c

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -768,15 +768,15 @@ try_complete_step(Step *step, int flags)
768768
td+= (int64)current_time.tv_usec- (int64)start_time.tv_usec;
769769

770770
/*
771-
* After60 seconds, try to cancel the query.
771+
* After180 seconds, try to cancel the query.
772772
*
773773
* If the user tries to test an invalid permutation, we don't want
774774
* to hang forever, especially when this is running in the
775-
* buildfarm.So try to cancel it after a minute. This will
776-
*presumably lead to this permutation failing, but remaining
777-
*permutations and tests should still beOK.
775+
* buildfarm.This will presumably lead to this permutation
776+
*failing, but remaining permutations and tests should still be
777+
* OK.
778778
*/
779-
if (td>60*USECS_PER_SEC&& !canceled)
779+
if (td>180*USECS_PER_SEC&& !canceled)
780780
{
781781
PGcancel*cancel=PQgetCancel(conn);
782782

@@ -793,15 +793,15 @@ try_complete_step(Step *step, int flags)
793793
}
794794

795795
/*
796-
* After75 seconds, just give up and die.
796+
* After200 seconds, just give up and die.
797797
*
798798
* Since cleanup steps won't be run in this case, this may cause
799799
* later tests to fail. That stinks, but it's better than waiting
800800
* forever for the server to respond to the cancel.
801801
*/
802-
if (td>75*USECS_PER_SEC)
802+
if (td>200*USECS_PER_SEC)
803803
{
804-
fprintf(stderr,"step %s timed out after75 seconds\n",
804+
fprintf(stderr,"step %s timed out after200 seconds\n",
805805
step->name);
806806
exit_nicely();
807807
}

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp