Commit4914097

committed

Merge branch 'PGPROEE9_6_MULTIMASTER' into PGPROEE9_6

2 parentsf7a2658 +7c0cf2e commit4914097Copy full SHA for 4914097

File tree

-2

lines changed

-2

lines changed

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -2035,7 +2035,7 @@ MtmCheckSlots()`
`2035`	`2035`	`if (slot->in_use`
`2036`	`2036`	`&&sscanf(slot->data.name.data,MULTIMASTER_SLOT_PATTERN,&nodeId)==1`
`2037`	`2037`	`&&BIT_CHECK(Mtm->disabledNodeMask,nodeId-1)`
`2038`		`-&&slot->data.confirmed_flush+MtmMaxRecoveryLag*1024<GetXLogInsertRecPtr()`
	`2038`	`+&&slot->data.confirmed_flush+(long64)MtmMaxRecoveryLag*1024<GetXLogInsertRecPtr()`
`2039`	`2039`	`&&slot->data.confirmed_flush!=0)`
`2040`	`2040`	`{`
`2041`	`2041`	`MTM_ELOG(WARNING,"Drop slot for node %d which lag %lld B is larger than threshold %d kB",`
`@@ -2104,7 +2104,7 @@ void MtmCheckRecoveryCaughtUp(int nodeId, lsn_t slotLSN)`
`2104`	`2104`	`if (MtmIsRecoveredNode(nodeId)) {`
`2105`	`2105`	`lsn_twalLSN=GetXLogInsertRecPtr();`
`2106`	`2106`	`if (!BIT_CHECK(Mtm->originLockNodeMask,nodeId-1)`
`2107`		`-&&slotLSN+MtmMinRecoveryLag*1024>walLSN)`
	`2107`	`+&&slotLSN+(long64)MtmMinRecoveryLag*1024>walLSN)`
`2108`	`2108`	`{`
`2109`	`2109`	`/*`
`2110`	`2110`	`* Wal sender almost caught up.`

Comments

(0)