From 7a37900443b016e0e7c72f6b42327bc05f8b5003 Mon Sep 17 00:00:00 2001 From: Robert Haas Date: Fri, 18 Mar 2011 10:20:22 -0400 Subject: [PATCH] Make synchronous replication query cancel/die messages more consistent. Per a gripe from Thom Brown about my previous commit in this area, commit 9a56dc3389b9470031e9ef8e45c95a680982e01a. --- src/backend/replication/syncrep.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/backend/replication/syncrep.c b/src/backend/replication/syncrep.c index b70de3993f..8aef998b47 100644 --- a/src/backend/replication/syncrep.c +++ b/src/backend/replication/syncrep.c @@ -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; }