Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit 918de37

Browse files
committed
Revert ill-considered change in pg_resetwal output.
Commit 31dcfae changed one pg_resetwal output string, and a corresponding test in pg_upgrade, without sufficient thought for the consequences. We can't change that output without creating hazards for cross-version upgrades, since pg_upgrade needs to be able to read the output of several different versions of pg_resetwal. There may well be external tools with the same requirement. For the moment, just revert those two changes. What we really ought to do here is have a separate, stable, easily machine-readable output format for pg_resetwal and pg_controldata, as proposed years ago by Alvaro. Once that's in place and tools no longer need to depend on the exact spelling of the human-readable output, we can put back this change. Discussion: https://postgr.es/m/fbea8c6f-415a-bad9-c3de-969c40d08a84@dunslane.net
1 parent b4f584f commit 918de37

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

src/bin/pg_resetwal/pg_resetwal.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -788,7 +788,7 @@ PrintNewControlValues(void)
788788

789789
XLogFileName(fname, ControlFile.checkPointCopy.ThisTimeLineID,
790790
newXlogSegNo, WalSegSz);
791-
printf(_("First WAL segment after reset: %s\n"), fname);
791+
printf(_("First log segment after reset: %s\n"), fname);
792792

793793
if (set_mxid != 0)
794794
{

src/bin/pg_upgrade/controldata.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -348,7 +348,7 @@ get_control_data(ClusterInfo *cluster, bool live_check)
348348
cluster->controldata.chkpnt_nxtmxoff = str2uint(p);
349349
got_mxoff = true;
350350
}
351-
else if ((p = strstr(bufin, "First WAL segment after reset:")) != NULL)
351+
else if ((p = strstr(bufin, "First log segment after reset:")) != NULL)
352352
{
353353
/* Skip the colon and any whitespace after it */
354354
p = strchr(p, ':');

0 commit comments

Comments
 (0)