mirror of
https://git.postgresql.org/git/postgresql.git
synced 2024-10-03 00:36:53 +02:00
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:
parent
c5eb835bbf
commit
7a37900443
@ -204,8 +204,8 @@ SyncRepWaitForLSN(XLogRecPtr XactCommitLSN)
|
|||||||
{
|
{
|
||||||
ereport(WARNING,
|
ereport(WARNING,
|
||||||
(errcode(ERRCODE_ADMIN_SHUTDOWN),
|
(errcode(ERRCODE_ADMIN_SHUTDOWN),
|
||||||
errmsg("canceling the wait for replication and terminating connection due to administrator command"),
|
errmsg("canceling the wait for synchronous 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.")));
|
errdetail("The transaction has already committed locally, but may not have been replicated to the standby.")));
|
||||||
whereToSendOutput = DestNone;
|
whereToSendOutput = DestNone;
|
||||||
SyncRepCancelWait();
|
SyncRepCancelWait();
|
||||||
break;
|
break;
|
||||||
@ -222,7 +222,7 @@ SyncRepWaitForLSN(XLogRecPtr XactCommitLSN)
|
|||||||
QueryCancelPending = false;
|
QueryCancelPending = false;
|
||||||
ereport(WARNING,
|
ereport(WARNING,
|
||||||
(errmsg("canceling wait for synchronous replication due to user request"),
|
(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();
|
SyncRepCancelWait();
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user