database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-11-10 17:42:29 +03:00
Code Activity

Add current WAL end (as seen by walsender, ie, GetWriteRecPtr() result)

Browse Source 
and current server clock time to SR data messages.  These are not currently
used on the slave side but seem likely to be useful in future, and it'd be
better not to change the SR protocol after release.  Per discussion.
Also do some minor code review and cleanup on walsender.c, and improve the
protocol documentation.
This commit is contained in:
Tom Lane
2010-06-03 22:17:32 +00:00
parent 572ec5a276
commit 0cc59cc1f3
5 changed files with 337 additions and 207 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -29,7 +29,7 @@
*
*
* IDENTIFICATION
* $PostgreSQL: pgsql/src/backend/replication/walreceiver.c,v 1.10 2010/04/20 22:55:03 tgl Exp $
* $PostgreSQL: pgsql/src/backend/replication/walreceiver.c,v 1.11 2010/06/03 22:17:32 tgl Exp $
*
*-------------------------------------------------------------------------
*/
@@ -41,6 +41,7 @@
#include "access/xlog_internal.h"
#include "libpq/pqsignal.h"
#include "miscadmin.h"
#include "replication/walprotocol.h"
#include "replication/walreceiver.h"
#include "storage/ipc.h"
#include "storage/pmsignal.h"
@@ -393,18 +394,18 @@ XLogWalRcvProcessMsg(unsigned char type, char *buf, Size len)
{
case 'w': /* WAL records */
{
XLogRecPtr recptr;
WalDataMessageHeader msghdr;
if (len < sizeof(XLogRecPtr))
if (len < sizeof(WalDataMessageHeader))
ereport(ERROR,
(errcode(ERRCODE_PROTOCOL_VIOLATION),
errmsg_internal("invalid WAL message received from primary")));
/* memcpy is required here for alignment reasons */
memcpy(&msghdr, buf, sizeof(WalDataMessageHeader));
buf += sizeof(WalDataMessageHeader);
len -= sizeof(WalDataMessageHeader);
memcpy(&recptr, buf, sizeof(XLogRecPtr));
buf += sizeof(XLogRecPtr);
len -= sizeof(XLogRecPtr);
XLogWalRcvWrite(buf, len, recptr);
XLogWalRcvWrite(buf, len, msghdr.dataStart);
break;
}
default: