Allow starting recovery from specified donor (extracted from fa0ca21)

kelvich · kelvich · commit 426b00dd7090 · 2017-11-13T02:21:38.000+03:00
diff --git a/multimaster.c b/multimaster.c
@@ -3343,8 +3343,10 @@ MtmReplicationMode MtmGetReplicationMode(int nodeId, sig_atomic_t volatile* shut
 
 	if (BIT_CHECK(Mtm->disabledNodeMask, MtmNodeId - 1))
 	{
-		/* Ok, then start recovery by luckiest walreceiver */
-		if (Mtm->recoverySlot == 0 || Mtm->recoverySlot == nodeId)
+		/* Ok, then start recovery by luckiest walreceiver (if there is no donor node).
+		 * If this node was populated using basebackup, then donorNodeId is not zero and we should choose this node for recovery */
+		if ((Mtm->recoverySlot == 0 || Mtm->recoverySlot == nodeId)
+			&& (Mtm->donorNodeId == MtmNodeId || Mtm->donorNodeId == nodeId))
 		{
 			/* Lock on us */
 			Mtm->recoverySlot = nodeId;

Original file line number	Diff line number	Diff line change
`@@ -3343,8 +3343,10 @@ MtmReplicationMode MtmGetReplicationMode(int nodeId, sig_atomic_t volatile* shut`
`3343`	`3343`
`3344`	`3344`	`if (BIT_CHECK(Mtm->disabledNodeMask, MtmNodeId - 1))`
`3345`	`3345`	`{`
`3346`		`- /* Ok, then start recovery by luckiest walreceiver */`
`3347`		`- if (Mtm->recoverySlot == 0 \|\| Mtm->recoverySlot == nodeId)`
	`3346`	`+ /* Ok, then start recovery by luckiest walreceiver (if there is no donor node).`
	`3347`	`+ * If this node was populated using basebackup, then donorNodeId is not zero and we should choose this node for recovery */`
	`3348`	`+ if ((Mtm->recoverySlot == 0 \|\| Mtm->recoverySlot == nodeId)`
	`3349`	`+ && (Mtm->donorNodeId == MtmNodeId \|\| Mtm->donorNodeId == nodeId))`
`3348`	`3350`	`{`
`3349`	`3351`	`/* Lock on us */`
`3350`	`3352`	`Mtm->recoverySlot = nodeId;`