mirror/postgresql
2
0
Fork 0
mirror of https://git.postgresql.org/git/postgresql.git synced 2024-12-27 08:39:28 +08:00
Code Issues Packages Projects Releases Wiki Activity

Ensure all replication message info is available and correct via WalRcv

Browse Source
This commit is contained in:
Simon Riggs 2012-08-09 17:03:59 +01:00
parent be690e291d
commit 87d8bd7c9f
3 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/backend/replication/walreceiver.c
View File

@ -218,7 +218,7 @@ WalReceiverMain(void)
startpoint = walrcv->receiveStart; startpoint = walrcv->receiveStart;
/* Initialise to a sanish value */ /* Initialise to a sanish value */
walrcv->lastMsgSendTime = walrcv->lastMsgReceiptTime = GetCurrentTimestamp(); walrcv->lastMsgSendTime = walrcv->lastMsgReceiptTime = walrcv->latestWalEndTime = GetCurrentTimestamp();
SpinLockRelease(&walrcv->mutex); SpinLockRelease(&walrcv->mutex);
@ -749,6 +749,9 @@ ProcessWalSndrMessage(XLogRecPtr walEnd, TimestampTz sendTime)
/* Update shared-memory status */ /* Update shared-memory status */
SpinLockAcquire(&walrcv->mutex); SpinLockAcquire(&walrcv->mutex);
if (XLByteLT(walrcv->latestWalEnd, walEnd))
walrcv->latestWalEndTime = sendTime;
walrcv->latestWalEnd = walEnd;
walrcv->lastMsgSendTime = sendTime; walrcv->lastMsgSendTime = sendTime;
walrcv->lastMsgReceiptTime = lastMsgReceiptTime; walrcv->lastMsgReceiptTime = lastMsgReceiptTime;
SpinLockRelease(&walrcv->mutex); SpinLockRelease(&walrcv->mutex);

2
src/backend/replication/walreceiverfuncs.c
View File

@ -260,7 +260,7 @@ GetReplicationApplyDelay(void)
replayPtr = GetXLogReplayRecPtr(NULL); replayPtr = GetXLogReplayRecPtr(NULL);
if (XLByteLE(receivePtr, replayPtr)) if (XLByteEQ(receivePtr, replayPtr))
return 0; return 0;
TimestampDifference(GetCurrentChunkReplayStartTime(), TimestampDifference(GetCurrentChunkReplayStartTime(),

6
src/include/replication/walreceiver.h
View File

@ -83,6 +83,12 @@ typedef struct
TimestampTz lastMsgSendTime; TimestampTz lastMsgSendTime;
TimestampTz lastMsgReceiptTime; TimestampTz lastMsgReceiptTime;
/*
* Latest reported end of WAL on the sender
*/
XLogRecPtr latestWalEnd;
TimestampTz latestWalEndTime;
/* /*
* connection string; is used for walreceiver to connect with the primary. * connection string; is used for walreceiver to connect with the primary.
*/ */