Commit7a37900

committed

Make synchronous replication query cancel/die messages more consistent.

Per a gripe from Thom Brown about my previous commit in this area,commit9a56dc3.

1 parentc5eb835 commit7a37900Copy full SHA for 7a37900

File tree

-3

lines changed

-3

lines changed

Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -204,8 +204,8 @@ SyncRepWaitForLSN(XLogRecPtr XactCommitLSN)`
`204`	`204`	`{`
`205`	`205`	`ereport(WARNING,`
`206`	`206`	`(errcode(ERRCODE_ADMIN_SHUTDOWN),`
`207`		`-errmsg("canceling the wait for replication and terminating connection due to administrator command"),`
`208`		`-errdetail("The transaction has alreadybeencommitted locally butmight havenot been replicated to the standby.")));`
	`207`	`+errmsg("canceling the wait forsynchronousreplication and terminating connection due to administrator command"),`
	`208`	`+errdetail("The transaction has already committed locally, butmaynot have been replicated to the standby.")));`
`209`	`209`	`whereToSendOutput=DestNone;`
`210`	`210`	`SyncRepCancelWait();`
`211`	`211`	`break;`
`@@ -222,7 +222,7 @@ SyncRepWaitForLSN(XLogRecPtr XactCommitLSN)`
`222`	`222`	`QueryCancelPending= false;`
`223`	`223`	`ereport(WARNING,`
`224`	`224`	`(errmsg("canceling wait for synchronous replication due to user request"),`
`225`		`-errdetail("The transaction has committed locally, but may not have replicated to the standby.")));`
	`225`	`+errdetail("The transaction hasalreadycommitted locally, but may not have been replicated to the standby.")));`
`226`	`226`	`SyncRepCancelWait();`
`227`	`227`	`break;`
`228`	`228`	`}`

Comments

(0)