Push responses to WAL sender

knizhnik · knizhnik · commit 6ec617b06b48 · 2016-08-12T17:42:54.000+03:00
diff --git a/contrib/mmts/multimaster.c b/contrib/mmts/multimaster.c
@@ -2475,13 +2475,14 @@ void  MtmUpdateLsnMapping(int node_id, XLogRecPtr end_lsn)
 	XLogRecPtr local_flush = GetFlushRecPtr();
 	MemoryContext old_context = MemoryContextSwitchTo(TopMemoryContext);
 
-	/* Track commit lsn */
-	flushpos = (MtmFlushPosition *) palloc(sizeof(MtmFlushPosition));
-	flushpos->node_id = node_id;
-	flushpos->local_end = XactLastCommitEnd;
-	flushpos->remote_end = end_lsn;
-	dlist_push_tail(&MtmLsnMapping, &flushpos->node);
-
+	if (end_lsn != InvalidXLogRecPtr) {
+		/* Track commit lsn */
+		flushpos = (MtmFlushPosition *) palloc(sizeof(MtmFlushPosition));
+		flushpos->node_id = node_id;
+		flushpos->local_end = XactLastCommitEnd;
+		flushpos->remote_end = end_lsn;
+		dlist_push_tail(&MtmLsnMapping, &flushpos->node);
+	}
 	MtmLock(LW_EXCLUSIVE);
 	dlist_foreach_modify(iter, &MtmLsnMapping)
 	{
diff --git a/contrib/mmts/pglogical_receiver.c b/contrib/mmts/pglogical_receiver.c
@@ -561,6 +561,7 @@ pglogical_receiver_main(Datum main_arg)
 				if (r == 0)
 				{
 					int64 now = feGetCurrentTimestamp();
+					MtmUpdateLsnMapping(nodeId, InvalidXLogRecPtr);
 					sendFeedback(conn, now, nodeId);					
 					continue;
 				}

Original file line number	Diff line number	Diff line change
`@@ -561,6 +561,7 @@ pglogical_receiver_main(Datum main_arg)`
`561`	`561`	`if (r == 0)`
`562`	`562`	`{`
`563`	`563`	`int64 now = feGetCurrentTimestamp();`
	`564`	`+ MtmUpdateLsnMapping(nodeId, InvalidXLogRecPtr);`
`564`	`565`	`sendFeedback(conn, now, nodeId);`
`565`	`566`	`continue;`
`566`	`567`	`}`