mirror of
https://git.postgresql.org/git/postgresql.git
synced 2026-02-15 19:06:59 +08:00
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
This commit is contained in:
@ -1067,6 +1067,8 @@ KillExistingArchiveStatus(void)
|
||||
|
||||
if (closedir(xldir))
|
||||
pg_fatal("could not close directory \"%s\": %m", ARCHSTATDIR);
|
||||
|
||||
#undef ARCHSTATDIR
|
||||
}
|
||||
|
||||
/*
|
||||
@ -1101,7 +1103,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
|
||||
}
|
||||
|
||||
/*
|
||||
|
||||
Reference in New Issue
Block a user