Make synchronous replication query cancel/die messages more consistent.

robertmhaas · robertmhaas · commit 7a37900443b0 · 2011-03-18T10:20:22.000-04:00
Per a gripe from Thom Brown about my previous commit in this area, commit 9a56dc3.
diff --git 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;
 		}
