diff options
| author | Peter Eisentraut <peter@eisentraut.org> | 2020-04-05 10:02:00 +0200 |
|---|---|---|
| committer | Peter Eisentraut <peter@eisentraut.org> | 2020-04-05 10:02:00 +0200 |
| commit | a9d9bdd3ad21a73b481911f22279e004679d172e (patch) | |
| tree | 92a20cb948979ed95e5684de46cd783d14be4cd6 | |
| parent | 18d85e9b8a2b784bcee350c59cf20c5c697a1c1f (diff) | |
| download | postgresql-a9d9bdd3ad21a73b481911f22279e004679d172e.tar.gz postgresql-a9d9bdd3ad21a73b481911f22279e004679d172e.zip | |
Save errno across LWLockRelease() calls
Fixup for "Drop slot's LWLock before returning from SaveSlotToPath()"
Reported-by: Michael Paquier <michael@paquier.xyz>
| -rw-r--r-- | src/backend/replication/slot.c | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/src/backend/replication/slot.c b/src/backend/replication/slot.c index d90c7235e98..47851ec4c1a 100644 --- a/src/backend/replication/slot.c +++ b/src/backend/replication/slot.c @@ -1259,9 +1259,13 @@ SaveSlotToPath(ReplicationSlot *slot, const char *dir, int elevel) /* * 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. + * lock, but no harm in explicitly releasing even in that case. Note + * that LWLockRelease() could affect errno. */ + int save_errno = errno; + LWLockRelease(&slot->io_in_progress_lock); + errno = save_errno; ereport(elevel, (errcode_for_file_access(), errmsg("could not create file \"%s\": %m", @@ -1325,7 +1329,10 @@ SaveSlotToPath(ReplicationSlot *slot, const char *dir, int elevel) if (CloseTransientFile(fd) != 0) { + int save_errno = errno; + LWLockRelease(&slot->io_in_progress_lock); + errno = save_errno; ereport(elevel, (errcode_for_file_access(), errmsg("could not close file \"%s\": %m", @@ -1336,7 +1343,10 @@ SaveSlotToPath(ReplicationSlot *slot, const char *dir, int elevel) /* rename to permanent file, fsync file and directory */ if (rename(tmppath, path) != 0) { + int save_errno = errno; + LWLockRelease(&slot->io_in_progress_lock); + errno = save_errno; ereport(elevel, (errcode_for_file_access(), errmsg("could not rename file \"%s\" to \"%s\": %m", |