Disable distributed commit during proc_exit_inprogress.

arssher · arssher · commit 6fd0c30e3842 · 2021-04-01T14:16:53.000+03:00
diff --git a/src/commit.c b/src/commit.c
@@ -188,7 +188,13 @@ MtmBeginTransaction()
 	/* XXX: clean MtmTx on commit and check on begin that it is clean. */
 	/* That should unveil probable issues with subxacts. */
 
-	if (!MtmIsEnabled())
+	/*
+	 * XXX: proc_exit_inprogress added after weird failure in JIT guts
+	 * (through MtmLoadConfig) on RemoveTempRelationsCallback xact start. The
+	 * reasons are not exactly clear, but we hardly need distributed xacts
+	 * during shutdown.
+	 */
+	if (proc_exit_inprogress || !MtmIsEnabled())
 	{
 		MtmTx.distributed = false;
 		return;
diff --git a/src/multimaster.c b/src/multimaster.c
@@ -1444,7 +1444,7 @@ mtm_join_node(PG_FUNCTION_ARGS)
 }
 
 /*
- * Check that all current gen members have the same gen and doesn't want to
+ * Check that all current gen members have the same gen and don't want to
  * change it. This is useful for learning when cluster has finally started up
  * and no generation switch perturbations will happen anymore unless some
  * failure happens. Note that it asserts that all gen members are online -- we
diff --git a/src/pglogical_apply.c b/src/pglogical_apply.c
@@ -197,6 +197,7 @@ process_remote_begin(StringInfo s, MtmReceiverWorkerContext *rwctx)
 	int sender_node_id = pq_getmsgint(s, 4);
 	Assert(rwctx->sender_node_id == sender_node_id);
 	rwctx->origin_xid = pq_getmsgint64(s);
+	mtm_log(MtmApplyTrace, "processing begin of xid " XID_FMT, rwctx->origin_xid);
 
 	InterruptPending = false;
 	QueryCancelPending = false;

Original file line number	Diff line number	Diff line change
`@@ -1444,7 +1444,7 @@ mtm_join_node(PG_FUNCTION_ARGS)`
`1444`	`1444`	`}`
`1445`	`1445`
`1446`	`1446`	`/*`
`1447`		`- * Check that all current gen members have the same gen and doesn't want to`
	`1447`	`+ * Check that all current gen members have the same gen and don't want to`
`1448`	`1448`	`* change it. This is useful for learning when cluster has finally started up`
`1449`	`1449`	`* and no generation switch perturbations will happen anymore unless some`
`1450`	`1450`	`* failure happens. Note that it asserts that all gen members are online -- we`