Commitb97727a

Andrei Krichinin

committed

fix LogLogicalMessage() in multimaster

1 parentf209c5b commitb97727aCopy full SHA for b97727a

File tree

-4

lines changed

-4

lines changed

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -680,7 +680,8 @@ MtmProcessDDLCommand(char const *queryString, bool transactional,`
`680`	`680`	`staticvoid`
`681`	`681`	`MtmFinishDDLCommand()`
`682`	`682`	`{`
`683`		`-LogLogicalMessage("E","",1, true);`
	`683`	`+constchar*msg="MTM Finish DDL Command";`
	`684`	`+LogLogicalMessage("E",msg,strlen(msg)+1, true);`
`684`	`685`	`}`
`685`	`686`
`686`	`687`

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1389,6 +1389,7 @@ mtm_join_node(PG_FUNCTION_ARGS)`
`1389`	`1389`	`/* Await for workers finish and create syncpoints */`
`1390`	`1390`	`PG_TRY();`
`1391`	`1391`	`{`
	`1392`	`+constchar*logmsg="MTM Syncpoint in join_node";`
`1392`	`1393`
`1393`	`1394`	`while (!MtmAllApplyWorkersFinished())`
`1394`	`1395`	`MtmSleep(USECS_PER_SEC /10);`
`@@ -1415,7 +1416,7 @@ mtm_join_node(PG_FUNCTION_ARGS)`
`1415`	`1416`	`LogLogicalMessage("S",msg,strlen(msg)+1, false);`
`1416`	`1417`	`replorigin_session_origin=InvalidRepOriginId;`
`1417`	`1418`	`}`
`1418`		`-LogLogicalMessage("S","",1, false);`
	`1419`	`+LogLogicalMessage("S",logmsg,strlen(logmsg)+1, false);`
`1419`	`1420`	`}`
`1420`	`1421`	`PG_CATCH();`
`1421`	`1422`	`{`

Lines changed: 4 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -103,8 +103,9 @@ MaybeLogSyncpoint(void)`
`103`	`103`	`(GetInsertRecPtr()-Mtm->latestSyncpoint >=MtmSyncpointInterval*1024))`
`104`	`104`	`{`
`105`	`105`	`XLogRecPtrsyncpoint_lsn;`
	`106`	`+constchar*msg="MTM syncpoint in MaybeLogsyncpoint";`
`106`	`107`
`107`		`-syncpoint_lsn=LogLogicalMessage("S","",1, false);`
	`108`	`+syncpoint_lsn=LogLogicalMessage("S",msg,strlen(msg)+1, false);`
`108`	`109`	`Mtm->latestSyncpoint=syncpoint_lsn;`
`109`	`110`
`110`	`111`	`mtm_log(SyncpointCreated,`
`@@ -144,6 +145,7 @@ SyncpointRegister(int origin_node_id, XLogRecPtr origin_lsn,`
`144`	`145`	`{`
`145`	`146`	`char*sql;`
`146`	`147`	`intrc;`
	`148`	`+constchar*msg="MTM Syncpoint in SyncpointRegister";`
`147`	`149`
`148`	`150`	`/* Start tx */`
`149`	`151`	`StartTransactionCommand();`
`@@ -156,7 +158,7 @@ SyncpointRegister(int origin_node_id, XLogRecPtr origin_lsn,`
`156`	`158`	`* performed instead of 3PC and so receiver is not allowed to fail`
`157`	`159`	`* applying this transaction and go ahead even in normal mode.`
`158`	`160`	`*/`
`159`		`-LogLogicalMessage("B","",1, true);`
	`161`	`+LogLogicalMessage("B",msg,strlen(msg)+1, true);`
`160`	`162`
`161`	`163`	`/* Save syncpoint */`
`162`	`164`	`sql=psprintf("insert into mtm.syncpoints values "`

Comments

(0)