rdelaage
/
postgresql
mirror of https://git.postgresql.org/git/postgresql.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Make synchronous replication query cancel/die messages more consistent. 

Per a gripe from Thom Brown about my previous commit in this area,
commit 9a56dc3389.
This commit is contained in:
Robert Haas 2011-03-18 10:20:22 -04:00
parent c5eb835bbf
commit 7a37900443
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/backend/replication/syncrep.c
View File

@ -204,8 +204,8 @@ SyncRepWaitForLSN(XLogRecPtr XactCommitLSN)
{
ereport(WARNING,
(errcode(ERRCODE_ADMIN_SHUTDOWN),
errmsg("canceling the wait for replication and terminating connection due to administrator command"),
errdetail("The transaction has already been committed locally but might have not been replicated to the standby.")));
errmsg("canceling the wait for synchronous replication and terminating connection due to administrator command"),
errdetail("The transaction has already committed locally, but may not have been replicated to the standby.")));
whereToSendOutput = DestNone;
SyncRepCancelWait();
break;
@ -222,7 +222,7 @@ SyncRepWaitForLSN(XLogRecPtr XactCommitLSN)
QueryCancelPending = false;
ereport(WARNING,
(errmsg("canceling wait for synchronous replication due to user request"),
errdetail("The transaction has committed locally, but may not have replicated to the standby.")));
errdetail("The transaction has already committed locally, but may not have been replicated to the standby.")));
SyncRepCancelWait();
break;
}