]> granicus.if.org Git - postgresql/commit
Prevent idle in transaction session timeout from sometimes being ignored.
authorAndres Freund <andres@anarazel.de>
Wed, 11 Oct 2017 19:03:26 +0000 (12:03 -0700)
committerAndres Freund <andres@anarazel.de>
Wed, 11 Oct 2017 21:02:41 +0000 (14:02 -0700)
commit61ace8fe7fe82dc04c1de493a414597989f05e56
treedce216cedf0705fe499e7a7eb06c5ae5ef320933
parentfbac00a4a8d3d9ff97ceb7176fce038fea5239b5
Prevent idle in transaction session timeout from sometimes being ignored.

The previous coding in ProcessInterrupts() could lead to
idle_in_transaction_session_timeout being ignored, when
statement_timeout occurred earlier.

The problem was that ProcessInterrupts() would return before
processing the transaction timeout if QueryCancelPending was set while
QueryCancelHoldoffCount != 0 - which is the case when reading new
commands from the client. Ergo when the idle transaction timeout would
hit.

Fix that by removing the early return. Alternatively the transaction
timeout code could have been moved up, but that early return seems
like an issue that could hit other cases too.

Author: Lukas Fittl
Bug: #14821
Discussion:
    https://www.postgresql.org/message-id/20170921010956.17345.61461%40wrigleys.postgresql.org
    https://www.postgresql.org/message-id/CAP53PkxQnv3OWJpyNPGJYT62uY=n1=2CF_Lpc6gVOFnc0-gazw@mail.gmail.com
Backpatch: 9.6-, where idle_in_transaction_session_timeout was introduced.
src/backend/tcop/postgres.c