Fix bug in MtmUpdateLsnMapping

knizhnik · kelvich · commit 698932b10da4 · 2017-11-13T02:17:30.000+03:00
diff --git a/multimaster.c b/multimaster.c
@@ -2491,8 +2491,8 @@ void  MtmUpdateLsnMapping(int node_id, XLogRecPtr end_lsn)
 		flushpos = dlist_container(MtmFlushPosition, node, iter.cur);
 		if (flushpos->local_end <= local_flush)
 		{
-			if (Mtm->nodes[node_id-1].flushPos < local_flush) { 
-				Mtm->nodes[node_id-1].flushPos = local_flush;
+			if (Mtm->nodes[node_id-1].flushPos < flushpos->remote_end) { 
+				Mtm->nodes[node_id-1].flushPos = flushpos->remote_end;
 			}
 			dlist_delete(iter.cur);
 			pfree(flushpos);

Original file line number	Diff line number	Diff line change
`@@ -2491,8 +2491,8 @@ void MtmUpdateLsnMapping(int node_id, XLogRecPtr end_lsn)`
`2491`	`2491`	`flushpos = dlist_container(MtmFlushPosition, node, iter.cur);`
`2492`	`2492`	`if (flushpos->local_end <= local_flush)`
`2493`	`2493`	`{`
`2494`		`- if (Mtm->nodes[node_id-1].flushPos < local_flush) {`
`2495`		`- Mtm->nodes[node_id-1].flushPos = local_flush;`
	`2494`	`+ if (Mtm->nodes[node_id-1].flushPos < flushpos->remote_end) {`
	`2495`	`+ Mtm->nodes[node_id-1].flushPos = flushpos->remote_end;`
`2496`	`2496`	`}`
`2497`	`2497`	`dlist_delete(iter.cur);`
`2498`	`2498`	`pfree(flushpos);`