Commitf0ca8e8

committed

Count number of received heartbeast for statustic

1 parentf74e3f2 commitf0ca8e8Copy full SHA for f0ca8e8

File tree

-5

lines changed

-5

lines changed

Lines changed: 4 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -949,13 +949,14 @@ static void MtmReceiver(Datum arg)`
`949`	`949`	`Mtm->nodes[node-1].lastHeartbeat=MtmGetSystemTime();`
`950`	`950`
`951`	`951`	`MtmCheckResponse(msg);`
`952`		`-MTM_LOG2("Receive response %s for transaction %s from node %d",MtmMessageKindMnem[msg->code],msg->gid,msg->node);`
	`952`	`+MTM_LOG2("Receive response %s for transaction %s from node %d",MtmMessageKindMnem[msg->code],msg->gid,node);`
`953`	`953`
`954`	`954`	`switch (msg->code) {`
`955`	`955`	`caseMSG_HEARTBEAT:`
`956`	`956`	`MTM_LOG4("Receive HEARTBEAT from node %d with timestamp %lld delay %lld",`
`957`	`957`	`node,msg->csn,USEC_TO_MSEC(MtmGetSystemTime()-msg->csn));`
`958`		`-continue;`
	`958`	`+Mtm->nodes[node-1].nHeartbeats+=1;`
	`959`	`+continue;`
`959`	`960`	`caseMSG_POLL_REQUEST:`
`960`	`961`	`Assert(*msg->gid);`
`961`	`962`	`tm= (MtmTransMap*)hash_search(MtmGid2State,msg->gid,HASH_FIND,NULL);`
`@@ -965,7 +966,7 @@ static void MtmReceiver(Datum arg)`
`965`	`966`	`}else {`
`966`	`967`	`msg->status=tm->state->status;`
`967`	`968`	`msg->csn=tm->state->csn;`
`968`		`-MTM_LOG1("Send response %s for transaction %s to node %d",MtmTxnStatusMnem[msg->status],msg->gid,msg->node);`
	`969`	`+MTM_LOG1("Send response %s for transaction %s to node %d",MtmTxnStatusMnem[msg->status],msg->gid,node);`
`969`	`970`	`}`
`970`	`971`	`msg->disabledNodeMask=Mtm->disabledNodeMask;`
`971`	`972`	`msg->connectivityMask=SELF_CONNECTIVITY_MASK;`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ AS 'MODULE_PATHNAME','mtm_get_last_csn'`
`36`	`36`	`LANGUAGE C;`
`37`	`37`
`38`	`38`
`39`		`-CREATETYPEmtm.node_stateAS ("id"integer,"disabled" bool,"disconnected" bool,"catchUp" bool,"slotLag"bigint,"avgTransDelay"bigint,"lastStatusChange"timestamp,"oldestSnapshot"bigint,"SenderPid"integer,"SenderStartTime"timestamp,"ReceiverPid"integer,"ReceiverStartTime"timestamp,"connStr"text,"connectivityMask"bigint,"stalled" bool,"stopped" bool);`
	`39`	`+CREATETYPEmtm.node_stateAS ("id"integer,"disabled" bool,"disconnected" bool,"catchUp" bool,"slotLag"bigint,"avgTransDelay"bigint,"lastStatusChange"timestamp,"oldestSnapshot"bigint,"SenderPid"integer,"SenderStartTime"timestamp,"ReceiverPid"integer,"ReceiverStartTime"timestamp,"connStr"text,"connectivityMask"bigint,"stalled" bool,"stopped" bool,"nHeartbeats"bigint);`
`40`	`40`
`41`	`41`	`CREATEFUNCTIONmtm.get_nodes_state() RETURNS SETOFmtm.node_state`
`42`	`42`	`AS'MODULE_PATHNAME','mtm_get_nodes_state'`

Lines changed: 2 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -2487,6 +2487,7 @@ static void MtmInitialize()`
`2487`	`2487`	`Mtm->nodes[i].restartLSN=INVALID_LSN;`
`2488`	`2488`	`Mtm->nodes[i].originId=InvalidRepOriginId;`
`2489`	`2489`	`Mtm->nodes[i].timeline=0;`
	`2490`	`+Mtm->nodes[i].nHeartbeats=0;`
`2490`	`2491`	`}`
`2491`	`2492`	`Mtm->nodes[MtmNodeId-1].originId=DoNotReplicateId;`
`2492`	`2493`	`/* All transaction originated from the current node should be ignored during recovery */`
`@@ -3975,6 +3976,7 @@ mtm_get_nodes_state(PG_FUNCTION_ARGS)`
`3975`	`3976`	`usrfctx->values[13]=Int64GetDatum(Mtm->nodes[usrfctx->nodeId-1].connectivityMask);`
`3976`	`3977`	`usrfctx->values[14]=BoolGetDatum(BIT_CHECK(Mtm->stalledNodeMask,usrfctx->nodeId-1));`
`3977`	`3978`	`usrfctx->values[15]=BoolGetDatum(BIT_CHECK(Mtm->stoppedNodeMask,usrfctx->nodeId-1));`
	`3979`	`+usrfctx->values[16]=Int64GetDatum(Mtm->nodes[usrfctx->nodeId-1].nHeartbeats);`
`3978`	`3980`	`usrfctx->nodeId+=1;`
`3979`	`3981`
`3980`	`3982`	`SRF_RETURN_NEXT(funcctx,HeapTupleGetDatum(heap_form_tuple(usrfctx->desc,usrfctx->values,usrfctx->nulls)));`

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -84,7 +84,7 @@`
`84`	`84`	`#defineAnum_mtm_local_tables_rel_name 2`
`85`	`85`
`86`	`86`	`#defineNatts_mtm_trans_state 15`
`87`		`-#defineNatts_mtm_nodes_state16`
	`87`	`+#defineNatts_mtm_nodes_state17`
`88`	`88`	`#defineNatts_mtm_cluster_state 19`
`89`	`89`
`90`	`90`	`typedefulong64csn_t;/* commit serial number */`
`@@ -226,6 +226,7 @@ typedef struct`
`226`	`226`	`void*lockGraphData;`
`227`	`227`	`intlockGraphAllocated;`
`228`	`228`	`intlockGraphUsed;`
	`229`	`+uint64nHeartbeats;`
`229`	`230`	`}MtmNodeInfo;`
`230`	`231`
`231`	`232`	`typedefstructMtmL2List`

Comments

(0)