Commit734b737

knizhnik

authored and

kelvich

committed

Detect zombies

1 parent92927df commit734b737Copy full SHA for 734b737

File tree

2 files changed

+18

-5

lines changed

2 files changed

+18

-5

lines changed

`‎arbiter.c‎`

Lines changed: 4 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -694,7 +694,10 @@ static void MtmTransReceiver(Datum arg)`
`694`	`694`	`MtmTransStatets= (MtmTransState)hash_search(MtmXid2State,&msg->dxid,HASH_FIND,NULL);`
`695`	`695`	`Assert(ts!=NULL);`
`696`	`696`	`Assert(msg->node>0&&msg->node <=nNodes&&msg->node!=MtmNodeId);`
`697`		`-`
	`697`	`+`
	`698`	`+if (BIT_CHECK(msg->disabledNodeMask,MtmNodeId-1)&&Mtm->status!=MTM_RECOVERY) {`
	`699`	`+elog(PANIC,"Node %d thinks that I was dead: perform hara-kiri not to be a zombie",msg->node);`
	`700`	`+}`
`698`	`701`	`Mtm->nodes[msg->node-1].oldestSnapshot=msg->oldestSnapshot;`
`699`	`702`
`700`	`703`	`if (MtmIsCoordinator(ts)) {`

`‎multimaster.c‎`

Lines changed: 14 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -139,6 +139,8 @@ HTAB* MtmXid2State;`
`139`	`139`	`staticHTAB*MtmGid2State;`
`140`	`140`	`staticHTAB*MtmLocalTables;`
`141`	`141`
	`142`	`+staticboolMtmIsRecoverySession;`
	`143`	`+`
`142`	`144`	`staticMtmCurrentTransMtmTx;`
`143`	`145`
`144`	`146`	`staticTransactionManagerMtmTM= {`
`@@ -1022,7 +1024,15 @@ static int64 MtmGetSlotLag(int nodeId)`
`1022`	`1024`	`*/`
`1023`	`1025`	`boolMtmIsRecoveredNode(intnodeId)`
`1024`	`1026`	`{`
`1025`		`-returnBIT_CHECK(Mtm->disabledNodeMask,nodeId-1);`
	`1027`	`+if (BIT_CHECK(Mtm->disabledNodeMask,nodeId-1)) {`
	`1028`	`+if (!MtmIsRecoverySession) {`
	`1029`	`+elog(ERROR,"Node %d is marked as disabled but is not in recovery mode",nodeId);`
	`1030`	`+}`
	`1031`	`+return true;`
	`1032`	`+}else {`
	`1033`	`+MtmIsRecoverySession= false;/* recovery is completed */`
	`1034`	`+return false;`
	`1035`	`+}`
`1026`	`1036`	`}`
`1027`	`1037`
`1028`	`1038`
`@@ -1871,17 +1881,17 @@ static void`
`1871`	`1881`	`MtmReplicationStartupHook(structPGLogicalStartupHookArgs*args)`
`1872`	`1882`	`{`
`1873`	`1883`	`ListCell*param;`
`1874`		`-boolisRecoverySession= false;`
	`1884`	`+MtmIsRecoverySession= false;`
`1875`	`1885`	`foreach(param,args->in_params)`
`1876`	`1886`	`{`
`1877`	`1887`	`DefElem*elem=lfirst(param);`
`1878`	`1888`	`if (strcmp("mtm_replication_mode",elem->defname)==0) {`
`1879`		`-isRecoverySession=elem->arg!=NULL&&strVal(elem->arg)!=NULL&&strcmp(strVal(elem->arg),"recovery")==0;`
	`1889`	`+MtmIsRecoverySession=elem->arg!=NULL&&strVal(elem->arg)!=NULL&&strcmp(strVal(elem->arg),"recovery")==0;`
`1880`	`1890`	`break;`
`1881`	`1891`	`}`
`1882`	`1892`	`}`
`1883`	`1893`	`MtmLock(LW_EXCLUSIVE);`
`1884`		`-if (isRecoverySession) {`
	`1894`	`+if (MtmIsRecoverySession) {`
`1885`	`1895`	`elog(WARNING,"%d: Node %d start recovery of node %d",MyProcPid,MtmNodeId,MtmReplicationNodeId);`
`1886`	`1896`	`if (!BIT_CHECK(Mtm->disabledNodeMask,MtmReplicationNodeId-1)) {`
`1887`	`1897`	`BIT_SET(Mtm->disabledNodeMask,MtmReplicationNodeId-1);`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit734b737

File tree

2 files changed

2 files changed

`‎arbiter.c‎`

`‎multimaster.c‎`

0 commit comments