postgres.git / summary / log / commit / refs

commit    a0d87bcd9b57d85ec99eb2b2a2150bc60e5ca842
Author:   Michael Paquier <michael@paquier.xyz>
Date:     Thu Sep 14 01:30:08 2023 +0000

    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


 src/backend/utils/time/snapmgr.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/backend/utils/time/snapmgr.c b/src/backend/utils/time/snapmgr.c
index b20440ee21f..65230811c02 100644
--- a/src/backend/utils/time/snapmgr.c
+++ b/src/backend/utils/time/snapmgr.c
@@ -1391,8 +1391,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))


[parent: b8f44a477945]