upstream/postgresql
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2026-02-13 15:53:13 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

pg_resetwal: Fix incorrect error message related to pg_wal/summaries/

Browse source 
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 dc21234005.

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
This commit is contained in:
Michael Paquier 2026-02-04 16:38:06 +09:00
parent 78bf28e3bf
commit c8ec74713b
1 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/bin/pg_resetwal/pg_resetwal.c
View file

@ -1077,6 +1077,8 @@ KillExistingArchiveStatus(void)
if (closedir(xldir))
pg_fatal("could not close directory \"%s\": %m", ARCHSTATDIR);
#undef ARCHSTATDIR
}
/*
@ -1111,7 +1113,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
}
/*