postgres.git / summary / log / commit / refs

commit    d4bfc06e292ee2f537f42d4ed216209c4537ee92
Author:   Peter Eisentraut <peter_e@gmx.net>
Date:     Wed Jun 07 01:51:31 2017 +0000

    Consistently use subscription name as application name
    
    The logical replication apply worker uses the subscription name as
    application name, except for table sync.  This was incorrectly set to
    use the replication slot name, which might be different, in one case.
    Also add a comment why the other case is different.


 src/backend/replication/logical/tablesync.c | 5 +++++
 src/backend/replication/logical/worker.c    | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/backend/replication/logical/tablesync.c b/src/backend/replication/logical/tablesync.c
index 6e55d2d6069..6fe39d20237 100644
--- a/src/backend/replication/logical/tablesync.c
+++ b/src/backend/replication/logical/tablesync.c
@@ -817,6 +817,11 @@ LogicalRepSyncTableStart(XLogRecPtr *origin_startpos)
 						MySubscription->oid,
 						MyLogicalRepWorker->relid);
 
+	/*
+	 * Here we use the slot name instead of the subscription name as the
+	 * application_name, so that it is different from the main apply worker,
+	 * so that synchronous replication can distinguish them.
+	 */
 	wrconn = walrcv_connect(MySubscription->conninfo, true, slotname, &err);
 	if (wrconn == NULL)
 		ereport(ERROR,
diff --git a/src/backend/replication/logical/worker.c b/src/backend/replication/logical/worker.c
index 999d627c872..6ba70773bfd 100644
--- a/src/backend/replication/logical/worker.c
+++ b/src/backend/replication/logical/worker.c
@@ -1595,7 +1595,7 @@ ApplyWorkerMain(Datum main_arg)
 		origin_startpos = replorigin_session_get_progress(false);
 		CommitTransactionCommand();
 
-		wrconn = walrcv_connect(MySubscription->conninfo, true, myslotname,
+		wrconn = walrcv_connect(MySubscription->conninfo, true, MySubscription->name,
 								&err);
 		if (wrconn == NULL)
 			ereport(ERROR,


[parent: 9206ced1dc05]