NotificationsYou must be signed in to change notification settings
Fork6
Star31

Commit918de37

committed

Revert ill-considered change in pg_resetwal output.

Commit31dcfae changed one pg_resetwal output string, and acorresponding test in pg_upgrade, without sufficient thought forthe consequences. We can't change that output without creatinghazards for cross-version upgrades, since pg_upgrade needs to be ableto 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 reallyought to do here is have a separate, stable, easily machine-readableoutput format for pg_resetwal and pg_controldata, as proposedyears ago by Alvaro. Once that's in place and tools no longerneed 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 parentb4f584f commit918de37Copy full SHA for 918de37

File tree

2 files changed

-2

lines changed

src/bin
- pg_resetwal
  - pg_resetwal.c
- pg_upgrade
  - controldata.c

2 files changed

-2

lines changed

`‎src/bin/pg_resetwal/pg_resetwal.c`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -788,7 +788,7 @@ PrintNewControlValues(void)`
`788`	`788`
`789`	`789`	`XLogFileName(fname,ControlFile.checkPointCopy.ThisTimeLineID,`
`790`	`790`	`newXlogSegNo,WalSegSz);`
`791`		`-printf(_("FirstWAL segment after reset: %s\n"),fname);`
	`791`	`+printf(_("Firstlog segment after reset: %s\n"),fname);`
`792`	`792`
`793`	`793`	`if (set_mxid!=0)`
`794`	`794`	`{`

`‎src/bin/pg_upgrade/controldata.c`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -348,7 +348,7 @@ get_control_data(ClusterInfo *cluster, bool live_check)`
`348`	`348`	`cluster->controldata.chkpnt_nxtmxoff=str2uint(p);`
`349`	`349`	`got_mxoff= true;`
`350`	`350`	`}`
`351`		`-elseif ((p=strstr(bufin,"FirstWAL segment after reset:"))!=NULL)`
	`351`	`+elseif ((p=strstr(bufin,"Firstlog segment after reset:"))!=NULL)`
`352`	`352`	`{`
`353`	`353`	`/* Skip the colon and any whitespace after it */`
`354`	`354`	`p=strchr(p,':');`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit918de37

File tree

2 files changed

2 files changed

`‎src/bin/pg_resetwal/pg_resetwal.c`

`‎src/bin/pg_upgrade/controldata.c`

0 commit comments