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

Commitf676616

Browse files
committed
Prevent idle in transaction session timeout from sometimes being ignored.
The previous coding in ProcessInterrupts() could lead toidle_in_transaction_session_timeout being ignored, whenstatement_timeout occurred earlier.The problem was that ProcessInterrupts() would return beforeprocessing the transaction timeout if QueryCancelPending was set whileQueryCancelHoldoffCount != 0 - which is the case when reading newcommands from the client. Ergo when the idle transaction timeout wouldhit.Fix that by removing the early return. Alternatively the transactiontimeout code could have been moved up, but that early return seemslike an issue that could hit other cases too.Author: Lukas FittlBug: #14821Discussion:https://www.postgresql.org/message-id/20170921010956.17345.61461%40wrigleys.postgresql.orghttps://www.postgresql.org/message-id/CAP53PkxQnv3OWJpyNPGJYT62uY=n1=2CF_Lpc6gVOFnc0-gazw@mail.gmail.comBackpatch: 9.6-, where idle_in_transaction_session_timeout was introduced.
1 parent2860596 commitf676616

File tree

1 file changed

+15
-17
lines changed

1 file changed

+15
-17
lines changed

‎src/backend/tcop/postgres.c

Lines changed: 15 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -2941,26 +2941,24 @@ ProcessInterrupts(void)
29412941
" database and repeat your command.")));
29422942
}
29432943

2944-
if (QueryCancelPending)
2944+
/*
2945+
* Don't allow query cancel interrupts while reading input from the
2946+
* client, because we might lose sync in the FE/BE protocol. (Die
2947+
* interrupts are OK, because we won't read any further messages from
2948+
* the client in that case.)
2949+
*/
2950+
if (QueryCancelPending&&QueryCancelHoldoffCount!=0)
29452951
{
2946-
boollock_timeout_occurred;
2947-
boolstmt_timeout_occurred;
2948-
29492952
/*
2950-
* Don't allow query cancel interrupts while reading input from the
2951-
* client, because we might lose sync in the FE/BE protocol. (Die
2952-
* interrupts are OK, because we won't read any further messages from
2953-
* the client in that case.)
2953+
* Re-arm InterruptPending so that we process the cancel request
2954+
* as soon as we're done reading the message.
29542955
*/
2955-
if (QueryCancelHoldoffCount!=0)
2956-
{
2957-
/*
2958-
* Re-arm InterruptPending so that we process the cancel request
2959-
* as soon as we're done reading the message.
2960-
*/
2961-
InterruptPending= true;
2962-
return;
2963-
}
2956+
InterruptPending= true;
2957+
}
2958+
elseif (QueryCancelPending)
2959+
{
2960+
boollock_timeout_occurred;
2961+
boolstmt_timeout_occurred;
29642962

29652963
QueryCancelPending= false;
29662964

0 commit comments

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