Commit a9d9bdd3 authored by Peter Eisentraut's avatar Peter Eisentraut

Save errno across LWLockRelease() calls

Fixup for "Drop slot's LWLock before returning from SaveSlotToPath()"
Reported-by: default avatarMichael Paquier <michael@paquier.xyz>
parent 18d85e9b
...@@ -1259,9 +1259,13 @@ SaveSlotToPath(ReplicationSlot *slot, const char *dir, int elevel) ...@@ -1259,9 +1259,13 @@ SaveSlotToPath(ReplicationSlot *slot, const char *dir, int elevel)
/* /*
* If not an ERROR, then release the lock before returning. In case * If not an ERROR, then release the lock before returning. In case
* of an ERROR, the error recovery path automatically releases the * 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); LWLockRelease(&slot->io_in_progress_lock);
errno = save_errno;
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",
...@@ -1325,7 +1329,10 @@ SaveSlotToPath(ReplicationSlot *slot, const char *dir, int elevel) ...@@ -1325,7 +1329,10 @@ SaveSlotToPath(ReplicationSlot *slot, const char *dir, int elevel)
if (CloseTransientFile(fd) != 0) if (CloseTransientFile(fd) != 0)
{ {
int save_errno = errno;
LWLockRelease(&slot->io_in_progress_lock); LWLockRelease(&slot->io_in_progress_lock);
errno = save_errno;
ereport(elevel, ereport(elevel,
(errcode_for_file_access(), (errcode_for_file_access(),
errmsg("could not close file \"%s\": %m", errmsg("could not close file \"%s\": %m",
...@@ -1336,7 +1343,10 @@ SaveSlotToPath(ReplicationSlot *slot, const char *dir, int elevel) ...@@ -1336,7 +1343,10 @@ 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)
{ {
int save_errno = errno;
LWLockRelease(&slot->io_in_progress_lock); LWLockRelease(&slot->io_in_progress_lock);
errno = save_errno;
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",
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment