database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-07-12 21:01:52 +03:00
Code Activity

Cancel CV sleep during subtransaction abort.

Browse Source 
Generally, error recovery paths that need to do things like
LWLockReleaseAll and pgstat_report_wait_end also need to call
ConditionVariableCancelSleep, but AbortSubTransaction was missed.

Since subtransaction abort might destroy up the DSM segment that
contains the ConditionVariable stored in cv_sleep_target, this
can result in a crash for anything using condition variables.

Reported and diagnosed by Andres Freund.

Discussion: http://postgr.es/m/20171221110048.rxk6464azzl5t2fi@alap3.anarazel.de
This commit is contained in:
Robert Haas
2017-12-21 09:09:04 -05:00
parent 7be0d775a2
commit f3decdc94e
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/backend/access/transam/xact.c
View File

@ -4596,6 +4596,9 @@ AbortSubTransaction(void)
/* Reset WAL record construction state */ /* Reset WAL record construction state */
XLogResetInsertion(); XLogResetInsertion();
/* Cancel condition variable sleep */
ConditionVariableCancelSleep();
/* /*
* Also clean up any open wait for lock, since the lock manager will choke * Also clean up any open wait for lock, since the lock manager will choke
* if we try to wait for another lock before doing this. * if we try to wait for another lock before doing this.