postgres.git / summary / log / commit / refs

commit    263af458e4ceb0c17e717a2cafd648908aeb4911
Author:   Michael Paquier <michael@paquier.xyz>
Date:     Wed Feb 04 07:38:12 2026 +0000
First released in: 17.8, 18.2

    pg_resetwal: Fix incorrect error message related to pg_wal/summaries/
    
    A failure while closing pg_wal/summaries/ incorrectly generated a report
    about pg_wal/archive_status/.
    
    While at it, this commit adds #undefs for the macros used in
    KillExistingWALSummaries() and KillExistingArchiveStatus() to prevent
    those values from being misused in an incorrect function context.
    
    Oversight in dc212340058b.
    
    Author: Tianchen Zhang <zhang_tian_chen@163.com>
    Reviewed-by: Chao Li <li.evan.chao@gmail.com>
    Reviewed-by: Kyotaro Horiguchi <horikyota.ntt@gmail.com>
    Discussion: https://postgr.es/m/SE2P216MB2390C84C23F428A7864EE07FA19BA@SE2P216MB2390.KORP216.PROD.OUTLOOK.COM
    Backpatch-through: 17


 src/bin/pg_resetwal/pg_resetwal.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/bin/pg_resetwal/pg_resetwal.c b/src/bin/pg_resetwal/pg_resetwal.c
index 5d54a7116a9..6cb2bf47568 100644
--- a/src/bin/pg_resetwal/pg_resetwal.c
+++ b/src/bin/pg_resetwal/pg_resetwal.c
@@ -1043,6 +1043,8 @@ KillExistingArchiveStatus(void)
 
 	if (closedir(xldir))
 		pg_fatal("could not close directory \"%s\": %m", ARCHSTATDIR);
+
+#undef ARCHSTATDIR
 }
 
 /*
@@ -1077,7 +1079,10 @@ KillExistingWALSummaries(void)
 		pg_fatal("could not read directory \"%s\": %m", WALSUMMARYDIR);
 
 	if (closedir(xldir))
-		pg_fatal("could not close directory \"%s\": %m", ARCHSTATDIR);
+		pg_fatal("could not close directory \"%s\": %m", WALSUMMARYDIR);
+
+#undef WALSUMMARY_NHEXCHARS
+#undef WALSUMMARYDIR
 }
 
 /*


[parent: 3b15032dad50]