Fix bug in MtmUpdateLsnMapping

knizhnik · knizhnik · commit 72cb36ad1660 · 2016-08-12T16:04:19.000+03:00
diff --git a/contrib/mmts/multimaster.c b/contrib/mmts/multimaster.c
@@ -2478,8 +2478,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
`@@ -2478,8 +2478,8 @@ void MtmUpdateLsnMapping(int node_id, XLogRecPtr end_lsn)`
`2478`	`2478`	`flushpos = dlist_container(MtmFlushPosition, node, iter.cur);`
`2479`	`2479`	`if (flushpos->local_end <= local_flush)`
`2480`	`2480`	`{`
`2481`		`- if (Mtm->nodes[node_id-1].flushPos < local_flush) {`
`2482`		`- Mtm->nodes[node_id-1].flushPos = local_flush;`
	`2481`	`+ if (Mtm->nodes[node_id-1].flushPos < flushpos->remote_end) {`
	`2482`	`+ Mtm->nodes[node_id-1].flushPos = flushpos->remote_end;`
`2483`	`2483`	`}`
`2484`	`2484`	`dlist_delete(iter.cur);`
`2485`	`2485`	`pfree(flushpos);`