From 994fd5e49f76e40b9eae6d02d0a463d5048e9302 Mon Sep 17 00:00:00 2001 From: Michael Paquier Date: Mon, 10 Mar 2025 13:18:52 +0900 Subject: [PATCH v13 4/7] Revert "Add HINT for restartpoint race with KeepFileRestoredFromArchive()." This reverts commit 8ad6c5dbbe5a234c55c6663020db297251756006. --- src/backend/access/transam/xlog.c | 5 +---- src/backend/storage/file/fd.c | 10 ++-------- 2 files changed, 3 insertions(+), 12 deletions(-) diff --git a/src/backend/access/transam/xlog.c b/src/backend/access/transam/xlog.c index 6fbb5328fd0b..4ef417f1eddb 100644 --- a/src/backend/access/transam/xlog.c +++ b/src/backend/access/transam/xlog.c @@ -3423,10 +3423,7 @@ XLogFileInit(XLogSegNo logsegno, bool *added) if (fd < 0) ereport(ERROR, (errcode_for_file_access(), - errmsg("could not open file \"%s\": %m", path), - (AmCheckpointerProcess() ? - errhint("This is known to fail occasionally during archive recovery, where it is harmless.") : - 0))); + errmsg("could not open file \"%s\": %m", path))); elog(DEBUG2, "done creating and filling new WAL file"); diff --git a/src/backend/storage/file/fd.c b/src/backend/storage/file/fd.c index 452ab88cafad..7aa50a5d2e57 100644 --- a/src/backend/storage/file/fd.c +++ b/src/backend/storage/file/fd.c @@ -800,10 +800,7 @@ durable_rename_excl(const char *oldfile, const char *newfile, int elevel) ereport(elevel, (errcode_for_file_access(), errmsg("could not link file \"%s\" to \"%s\": %m", - oldfile, newfile), - (AmCheckpointerProcess() ? - errhint("This is known to fail occasionally during archive recovery, where it is harmless.") : - 0))); + oldfile, newfile))); return -1; } unlink(oldfile); @@ -813,10 +810,7 @@ durable_rename_excl(const char *oldfile, const char *newfile, int elevel) ereport(elevel, (errcode_for_file_access(), errmsg("could not rename file \"%s\" to \"%s\": %m", - oldfile, newfile), - (AmCheckpointerProcess() ? - errhint("This is known to fail occasionally during archive recovery, where it is harmless.") : - 0))); + oldfile, newfile))); return -1; } #endif -- 2.47.2