Commit92c7c87

authored and

committed

Fix reace condition in tw_pahse.c

1 parent1d9e382 commit92c7c87Copy full SHA for 92c7c87

File tree

+12

-2

lines changed

+12

-2

lines changed

Lines changed: 3 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -371,7 +371,9 @@ static void MtmSendHeartbeat()`
`371`	`371`	`}else {`
`372`	`372`	`/* Connectivity mask can be cleared by MtmWatchdog: in this case sockets[i] >= 0 */`
`373`	`373`	`if (BIT_CHECK(Mtm->connectivityMask,i)) {`
`374`		`-MtmDisconnect(i);`
	`374`	`+close(sockets[i]);`
	`375`	`+sockets[i]=-1;`
	`376`	`+MtmReconnectNode(i+1);`
`375`	`377`	`//MtmOnNodeConnect(i+1);`
`376`	`378`	`}`
`377`	`379`	`MTM_LOG4("Send heartbeat to node %d with timestamp %ld",i+1,now);`

Lines changed: 8 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -2021,6 +2021,13 @@ void MtmOnNodeConnect(int nodeId)`
`2021`	`2021`	`MtmUnlock();`
`2022`	`2022`	`}`
`2023`	`2023`
	`2024`	`+voidMtmReconnectNode(intnodeId)`
	`2025`	`+{`
	`2026`	`+MtmLock(LW_EXCLUSIVE);`
	`2027`	`+BIT_SET(Mtm->reconnectMask,nodeId-1);`
	`2028`	`+MtmUnlock();`
	`2029`	`+}`
	`2030`	`+`
`2024`	`2031`
`2025`	`2032`
`2026`	`2033`	`/*`
`@@ -3301,7 +3308,7 @@ bool MtmFilterTransaction(char* record, int size)`
`3301`	`3308`	`}`
`3302`	`3309`
`3303`	`3310`	`if (duplicate) {`
`3304`		`-MTM_LOG2("Ignore transaction %s from node %d flags=%x, our restartLSN for node: %lx,restart_lsn = (origin node %d == MtmReplicationNodeId %d) ? end_lsn=%lx, origin_lsn=%lx",`
	`3311`	`+MTM_LOG1("Ignore transaction %s from node %d flags=%x, our restartLSN for node: %lx,restart_lsn = (origin node %d == MtmReplicationNodeId %d) ? end_lsn=%lx, origin_lsn=%lx",`
`3305`	`3312`	`gid,replication_node,flags,Mtm->nodes[origin_node-1].restartLSN,origin_node,MtmReplicationNodeId,end_lsn,origin_lsn);`
`3306`	`3313`	`}else {`
`3307`	`3314`	`MTM_LOG2("Apply transaction %s from node %d lsn %lx, flags=%x, origin node %d, original lsn=%lx, current lsn=%lx",`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -358,6 +358,7 @@ extern void MtmUnlock(void);`
`358`	`358`	`externvoidMtmLockNode(intnodeId,LWLockModemode);`
`359`	`359`	`externvoidMtmUnlockNode(intnodeId);`
`360`	`360`	`externvoidMtmDropNode(intnodeId,booldropSlot);`
	`361`	`+externvoidMtmReconnectNode(intnodeId);`
`361`	`362`	`externvoidMtmRecoverNode(intnodeId);`
`362`	`363`	`externvoidMtmOnNodeDisconnect(intnodeId);`
`363`	`364`	`externvoidMtmOnNodeConnect(intnodeId);`

Comments

(0)