summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Paquier2023-09-14 01:30:37 +0000
committerMichael Paquier2023-09-14 01:30:37 +0000
commita4cef3384d6de4d60989303e56883a9ff2239608 (patch)
tree32773f22d33b824fb0ed3acad183b9bcc9e496f5
parent6ae57f190e276f46bc2d0b616515bed4b4f664ce (diff)
Improve error message on snapshot import in snapmgr.c
When a snapshot file fails to be read in ImportSnapshot(), it would issue an ERROR as "invalid snapshot identifier" when opening a stream for it in read-only mode. This error message is reworded to be the same as all the other messages used in this case on failure, which is useful when debugging this area. Thinko introduced by bb446b689b66 where snapshot imports have been added. A backpatch down to 11 is done as this can improve any work related to snapshot imports in older branches. Author: Bharath Rupireddy Reviewed-by: Daniel Gustafsson Discussion: https://postgr.es/m/CALj2ACWmr=3KdxDkm8h7Zn1XxBoF6hdzq8WQyMn2y1OL5RYFrg@mail.gmail.com Backpatch-through: 11
-rw-r--r--src/backend/utils/time/snapmgr.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/backend/utils/time/snapmgr.c b/src/backend/utils/time/snapmgr.c
index 8fadec32c5f..2f17a433455 100644
--- a/src/backend/utils/time/snapmgr.c
+++ b/src/backend/utils/time/snapmgr.c
@@ -1496,8 +1496,9 @@ ImportSnapshot(const char *idstr)
f = AllocateFile(path, PG_BINARY_R);
if (!f)
ereport(ERROR,
- (errcode(ERRCODE_INVALID_PARAMETER_VALUE),
- errmsg("invalid snapshot identifier: \"%s\"", idstr)));
+ (errcode_for_file_access(),
+ errmsg("could not open file \"%s\" for reading: %m",
+ path)));
/* get the size of the file so that we know how much memory we need */
if (fstat(fileno(f), &stat_buf))