1berry/postgres
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Revert "Add HINT for restartpoint race with KeepFileRestoredFromArchive()."

Browse Source 
This reverts commit 8ad6c5dbbe5a, which was a commit specific to v14 and
older branches as the race condition between restartpoints and
KeepFileRestoredFromArchive() still existed.

1f95181b44c8 has worsened the situation on these two branches, causing
spurious failures in archive recovery (neither streaming nor archive
recovery) with concurrent restartpoints.  The same logic as v15 and
newer versions will be applied in some follow-up commits to close this
problem, making this HINT not necessary anymore.

Reported-by: Arun Thirupathi
Discussion: https://postgr.es/m/20250306193013.36.nmisch@google.com
Backpatch-through: 13
This commit is contained in:
Michael Paquier 2025-04-06 15:14:52 +09:00
parent b494640e82
commit 47d2d29827
2 changed files with 3 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/backend/access/transam/xlog.c
View File

@ -3468,10 +3468,7 @@ XLogFileInit(XLogSegNo logsegno, bool *added)
if (fd < 0) if (fd < 0)
ereport(ERROR, ereport(ERROR,
(errcode_for_file_access(), (errcode_for_file_access(),
errmsg("could not open file \"%s\": %m", path), errmsg("could not open file \"%s\": %m", path)));
(AmCheckpointerProcess() ?
errhint("This is known to fail occasionally during archive recovery, where it is harmless.") :
0)));
elog(DEBUG2, "done creating and filling new WAL file"); elog(DEBUG2, "done creating and filling new WAL file");

10
src/backend/storage/file/fd.c
View File

@ -834,10 +834,7 @@ durable_rename_excl(const char *oldfile, const char *newfile, int elevel)
ereport(elevel, ereport(elevel,
(errcode_for_file_access(), (errcode_for_file_access(),
errmsg("could not link file \"%s\" to \"%s\": %m", errmsg("could not link file \"%s\" to \"%s\": %m",
oldfile, newfile), oldfile, newfile)));
(AmCheckpointerProcess() ?
errhint("This is known to fail occasionally during archive recovery, where it is harmless.") :
0)));
return -1; return -1;
} }
unlink(oldfile); unlink(oldfile);
@ -847,10 +844,7 @@ durable_rename_excl(const char *oldfile, const char *newfile, int elevel)
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",
oldfile, newfile), oldfile, newfile)));
(AmCheckpointerProcess() ?
errhint("This is known to fail occasionally during archive recovery, where it is harmless.") :
0)));
return -1; return -1;
} }
#endif #endif