database/postgres
database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-05-05 09:19:17 +03:00
Code

Drop slot's LWLock before returning from SaveSlotToPath()

Browse Source 
When SaveSlotToPath() is called with elevel=LOG, the early exits didn't
release the slot's io_in_progress_lock.

This could result in a walsender being stuck on the lock forever.  A
possible way to get into this situation is if the offending code paths
are triggered in a low disk space situation.

Author: Pavan Deolasee <pavan.deolasee@2ndquadrant.com>
Reported-by: Craig Ringer <craig@2ndquadrant.com>
Discussion: https://www.postgresql.org/message-id/flat/56a138c5-de61-f553-7e8f-6789296de785%402ndquadrant.com
This commit is contained in:
Peter Eisentraut 2020-03-26 11:51:39 +01:00
parent ef7f01a504
commit 2d8597ba66
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/backend/replication/slot.c
View File

@ -1062,6 +1062,12 @@ SaveSlotToPath(ReplicationSlot *slot, const char *dir, int elevel)
S_IRUSR | S_IWUSR); S_IRUSR | S_IWUSR);
if (fd < 0) if (fd < 0)
{ {
/*
* If not an ERROR, then release the lock before returning. In case
* of an ERROR, the error recovery path automatically releases the
* lock, but no harm in explicitly releasing even in that case.
*/
LWLockRelease(&slot->io_in_progress_lock);
ereport(elevel, ereport(elevel,
(errcode_for_file_access(), (errcode_for_file_access(),
errmsg("could not create file \"%s\": %m", errmsg("could not create file \"%s\": %m",
@ -1091,6 +1097,7 @@ SaveSlotToPath(ReplicationSlot *slot, const char *dir, int elevel)
int save_errno = errno; int save_errno = errno;
CloseTransientFile(fd); CloseTransientFile(fd);
LWLockRelease(&slot->io_in_progress_lock);
/* if write didn't set errno, assume problem is no disk space */ /* if write didn't set errno, assume problem is no disk space */
errno = save_errno ? save_errno : ENOSPC; errno = save_errno ? save_errno : ENOSPC;
@ -1107,6 +1114,7 @@ SaveSlotToPath(ReplicationSlot *slot, const char *dir, int elevel)
int save_errno = errno; int save_errno = errno;
CloseTransientFile(fd); CloseTransientFile(fd);
LWLockRelease(&slot->io_in_progress_lock);
errno = save_errno; errno = save_errno;
ereport(elevel, ereport(elevel,
(errcode_for_file_access(), (errcode_for_file_access(),
@ -1120,6 +1128,7 @@ SaveSlotToPath(ReplicationSlot *slot, const char *dir, int elevel)
/* rename to permanent file, fsync file and directory */ /* rename to permanent file, fsync file and directory */
if (rename(tmppath, path) != 0) if (rename(tmppath, path) != 0)
{ {
LWLockRelease(&slot->io_in_progress_lock);
ereport(elevel, ereport(elevel,
(errcode_for_file_access(), (errcode_for_file_access(),
errmsg("could not rename file \"%s\" to \"%s\": %m", errmsg("could not rename file \"%s\" to \"%s\": %m",