db/pg_probackup
1
0
Fork 0
mirror of https://github.com/postgrespro/pg_probackup.git synced 2026-06-21 01:34:15 +02:00
Code Issues Releases Activity

[Issue #261] PG13 support, WIP

Browse Source
This commit is contained in:
Grigory Smolkin
2020-09-24 10:45:12 +03:00
parent a693fb54af
commit 1c1236e3ad
1 changed files with 43 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/parsexlog.c
+43 -23
View File
@@ -148,10 +148,12 @@ typedef struct
int ret;
} xlog_thread_arg;
static XLogRecord* WalReadRecord(XLogReaderState *xlogreader, XLogRecPtr startpoint, char **errormsg);
static XLogReaderState* WalReaderAllocate(uint32 wal_seg_size, XLogReaderData *reader_data);
static int SimpleXLogPageRead(XLogReaderState *xlogreader,
XLogRecPtr targetPagePtr,
int reqLen, XLogRecPtr targetRecPtr, char *readBuf,
TimeLineID *pageTLI);
int reqLen, XLogRecPtr targetRecPtr, char *readBuf);
static XLogReaderState *InitXLogPageRead(XLogReaderData *reader_data,
const char *archivedir,
TimeLineID tli, uint32 segment_size,
@@ -551,7 +553,7 @@ read_recovery_info(const char *archivedir, TimeLineID tli, uint32 wal_seg_size,
TimestampTz last_time = 0;
char *errormsg;
record = XLogReadRecord(xlogreader, startpoint, &errormsg);
record = WalReadRecord(xlogreader, startpoint, &errormsg);
if (record == NULL)
{
XLogRecPtr errptr;
@@ -615,7 +617,7 @@ wal_contains_lsn(const char *archivedir, XLogRecPtr target_lsn,
xlogreader->system_identifier = instance_config.system_identifier;
res = XLogReadRecord(xlogreader, target_lsn, &errormsg) != NULL;
res = WalReadRecord(xlogreader, target_lsn, &errormsg) != NULL;
/* Didn't find 'target_lsn' and there is no error, return false */
if (errormsg)
@@ -733,7 +735,7 @@ get_next_record_lsn(const char *archivedir, XLogSegNo segno,
if (interrupted)
elog(ERROR, "Interrupted during WAL reading");
record = XLogReadRecord(xlogreader, startpoint, &errormsg);
record = WalReadRecord(xlogreader, startpoint, &errormsg);
if (record == NULL)
{
@@ -846,7 +848,7 @@ get_prior_record_lsn(const char *archivedir, XLogRecPtr start_lsn,
if (interrupted)
elog(ERROR, "Interrupted during WAL reading");
record = XLogReadRecord(xlogreader, startpoint, &errormsg);
record = WalReadRecord(xlogreader, startpoint, &errormsg);
if (record == NULL)
{
XLogRecPtr errptr;
@@ -905,8 +907,7 @@ get_gz_error(gzFile gzf)
/* XLogreader callback function, to read a WAL page */
static int
SimpleXLogPageRead(XLogReaderState *xlogreader, XLogRecPtr targetPagePtr,
int reqLen, XLogRecPtr targetRecPtr, char *readBuf,
TimeLineID *pageTLI)
int reqLen, XLogRecPtr targetRecPtr, char *readBuf)
{
XLogReaderData *reader_data;
uint32 targetPageOff;
@@ -1040,7 +1041,7 @@ SimpleXLogPageRead(XLogReaderState *xlogreader, XLogRecPtr targetPagePtr,
reader_data->prev_page_off == targetPageOff)
{
memcpy(readBuf, reader_data->page_buf, XLOG_BLCKSZ);
*pageTLI = reader_data->tli;
// *pageTLI = reader_data->tli;
return XLOG_BLCKSZ;
}
@@ -1084,7 +1085,7 @@ SimpleXLogPageRead(XLogReaderState *xlogreader, XLogRecPtr targetPagePtr,
memcpy(reader_data->page_buf, readBuf, XLOG_BLCKSZ);
reader_data->prev_page_off = targetPageOff;
*pageTLI = reader_data->tli;
// *pageTLI = reader_data->tli;
return XLOG_BLCKSZ;
}
@@ -1109,12 +1110,7 @@ InitXLogPageRead(XLogReaderData *reader_data, const char *archivedir,
if (allocate_reader)
{
#if PG_VERSION_NUM >= 110000
xlogreader = XLogReaderAllocate(wal_seg_size, &SimpleXLogPageRead,
reader_data);
#else
xlogreader = XLogReaderAllocate(&SimpleXLogPageRead, reader_data);
#endif
xlogreader = WalReaderAllocate(wal_seg_size, reader_data);
if (xlogreader == NULL)
elog(ERROR, "Out of memory");
xlogreader->system_identifier = instance_config.system_identifier;
@@ -1314,12 +1310,8 @@ XLogThreadWorker(void *arg)
uint32 prev_page_off = 0;
bool need_read = true;
#if PG_VERSION_NUM >= 110000
xlogreader = XLogReaderAllocate(wal_seg_size, &SimpleXLogPageRead,
reader_data);
#else
xlogreader = XLogReaderAllocate(&SimpleXLogPageRead, reader_data);
#endif
xlogreader = WalReaderAllocate(wal_seg_size, reader_data);
if (xlogreader == NULL)
elog(ERROR, "Thread [%d]: out of memory", reader_data->thread_num);
xlogreader->system_identifier = instance_config.system_identifier;
@@ -1376,7 +1368,7 @@ XLogThreadWorker(void *arg)
!SwitchThreadToNextWal(xlogreader, thread_arg))
break;
record = XLogReadRecord(xlogreader, thread_arg->startpoint, &errormsg);
record = WalReadRecord(xlogreader, thread_arg->startpoint, &errormsg);
if (record == NULL)
{
@@ -1857,3 +1849,31 @@ bool validate_wal_segment(TimeLineID tli, XLogSegNo segno, const char *prefetch_
return rc;
}
static XLogRecord* WalReadRecord(XLogReaderState *xlogreader, XLogRecPtr startpoint, char **errormsg)
{
#if PG_VERSION_NUM >= 130000
// if (XLogRecPtrIsInvalid(startpoint))
// startpoint = SizeOfXLogShortPHD;
XLogBeginRead(xlogreader, startpoint);
return XLogReadRecord(xlogreader, errormsg);
#else
return XLogReadRecord(xlogreader, startpoint, errormsg);
#endif
}
static XLogReaderState* WalReaderAllocate(uint32 wal_seg_size, XLogReaderData *reader_data)
{
#if PG_VERSION_NUM >= 130000
return XLogReaderAllocate(wal_seg_size, NULL,
XL_ROUTINE(.page_read = &SimpleXLogPageRead),
reader_data);
#elif PG_VERSION_NUM >= 110000
return XLogReaderAllocate(wal_seg_size, &SimpleXLogPageRead,
reader_data);
#else
return XLogReaderAllocate(&SimpleXLogPageRead, reader_data);
#endif
}