database/openGauss-server
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix multixact redo error

Browse Source
This commit is contained in:
xiong_xjun
2020-09-05 15:05:57 +08:00
parent c83a927258
commit e2200b279b
5 changed files with 26 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/gausskernel/storage/access/rmgrdesc/mxactdesc.cpp
View File

@ -26,6 +26,7 @@ void multixact_desc(StringInfo buf, XLogReaderState* record)
uint8 info = XLogRecGetInfo(record) & ~XLR_INFO_MASK;
errno_t rc;
info = info & XLOG_MULTIXACT_MASK;
if (info == XLOG_MULTIXACT_ZERO_OFF_PAGE) {
int64 pageno = 0;

5
src/gausskernel/storage/access/transam/extreme_rto/dispatcher.cpp
View File

@ -150,7 +150,7 @@ static const RmgrDispatchData g_dispatchTable[RM_MAX_ID + 1] = {
RmgrRecordInfoValid,
RM_MULTIXACT_ID,
XLOG_MULTIXACT_ZERO_OFF_PAGE,
XLOG_MULTIXACT_INT64_PAGENO},
XLOG_MULTIXACT_CREATE_ID},
{DispatchRelMapRecord, RmgrRecordInfoValid, RM_RELMAP_ID, XLOG_RELMAP_UPDATE, XLOG_RELMAP_UPDATE},
#ifndef ENABLE_MULTIPLE_NODES
{DispatchStandbyRecord, RmgrRecordInfoValid, RM_STANDBY_ID, XLOG_STANDBY_LOCK, XLOG_STANDBY_CSN_ABORTED},
@ -590,6 +590,9 @@ static bool RmgrRecordInfoValid(XLogReaderState* record, uint8 minInfo, uint8 ma
if ((XLogRecGetRmid(record) == RM_HEAP2_ID) || (XLogRecGetRmid(record) == RM_HEAP_ID)) {
info = (info & XLOG_HEAP_OPMASK);
}
if ((XLogRecGetRmid(record) == RM_MULTIXACT_ID)) {
info = (info & XLOG_MULTIXACT_MASK);
}
info = (info >> XLOG_INFO_SHIFT_SIZE);
minInfo = (minInfo >> XLOG_INFO_SHIFT_SIZE);

23
src/gausskernel/storage/access/transam/multixact.cpp
View File

@ -200,6 +200,7 @@ static void ExtendMultiXactOffset(MultiXactId multi);
static void ExtendMultiXactMember(MultiXactOffset offset, int nmembers);
static void TruncateMultiXact(void);
static void WriteMZeroPageXlogRec(int64 pageno, uint8 info);
static void get_multixact_pageno(uint8 info, int64* pageno, XLogReaderState* record);
/*
* MultiXactIdCreate
@ -1789,20 +1790,19 @@ static void WriteMZeroPageXlogRec(int64 pageno, uint8 info)
XLogRecParseState* multixact_xlog_ddl_parse_to_block(XLogReaderState* record, uint32* blocknum)
{
uint8 info = XLogRecGetInfo(record) & ~XLR_INFO_MASK;
uint8 mask_info = info & XLOG_MULTIXACT_MASK;
int64 pageno;
ForkNumber forknum = MAIN_FORKNUM;
BlockNumber lowblknum = InvalidBlockNumber;
XLogRecParseState* recordstatehead = NULL;
int ddltype = BLOCK_DDL_TYPE_NONE;
errno_t rc;
*blocknum = 0;
if (info == XLOG_MULTIXACT_ZERO_OFF_PAGE) {
rc = memcpy_s(&pageno, sizeof(int64), XLogRecGetData(record), XLogRecGetDataLen(record));
securec_check(rc, "", "");
if (mask_info == XLOG_MULTIXACT_ZERO_OFF_PAGE) {
get_multixact_pageno(info, &pageno, record);
ddltype = BLOCK_DDL_MULTIXACT_OFF_ZERO;
} else if (info == XLOG_MULTIXACT_ZERO_MEM_PAGE) {
rc = memcpy_s(&pageno, sizeof(int64), XLogRecGetData(record), XLogRecGetDataLen(record));
securec_check(rc, "", "");
} else if (mask_info == XLOG_MULTIXACT_ZERO_MEM_PAGE) {
get_multixact_pageno(info, &pageno, record);
ddltype = BLOCK_DDL_MULTIXACT_MEM_ZERO;
}
forknum = (pageno >> LOW_BLOKNUMBER_BITS);
@ -1955,6 +1955,8 @@ XLogRecParseState* multixact_redo_parse_to_block(XLogReaderState* record, uint32
uint8 info = XLogRecGetInfo(record) & ~XLR_INFO_MASK;
XLogRecParseState* recordstatehead = NULL;
*blocknum = 0;
info = info & XLOG_MULTIXACT_MASK;
if ((info == XLOG_MULTIXACT_ZERO_OFF_PAGE) || (info == XLOG_MULTIXACT_ZERO_MEM_PAGE)) {
recordstatehead = multixact_xlog_ddl_parse_to_block(record, blocknum);
} else if (info == XLOG_MULTIXACT_CREATE_ID) {
@ -1982,11 +1984,12 @@ static void get_multixact_pageno(uint8 info, int64* pageno, XLogReaderState* rec
void multixact_redo(XLogReaderState* record)
{
uint8 info = XLogRecGetInfo(record) & ~XLR_INFO_MASK;
uint8 mask_info = info & XLOG_MULTIXACT_MASK;
/* Backup blocks are not used in multixact records */
Assert(!XLogRecHasAnyBlockRefs(record));
if ((info & XLOG_MULTIXACT_ZERO_OFF_PAGE) != 0) {
if (mask_info == XLOG_MULTIXACT_ZERO_OFF_PAGE) {
int64 pageno = 0;
int slotno;
@ -1999,7 +2002,7 @@ void multixact_redo(XLogReaderState* record)
Assert(!t_thrd.shemem_ptr_cxt.MultiXactOffsetCtl->shared->page_dirty[slotno]);
LWLockRelease(MultiXactOffsetControlLock);
} else if ((info & XLOG_MULTIXACT_ZERO_MEM_PAGE) != 0) {
} else if (mask_info == XLOG_MULTIXACT_ZERO_MEM_PAGE) {
int64 pageno = 0;
int slotno;
@ -2012,7 +2015,7 @@ void multixact_redo(XLogReaderState* record)
Assert(!t_thrd.shemem_ptr_cxt.MultiXactMemberCtl->shared->page_dirty[slotno]);
LWLockRelease(MultiXactMemberControlLock);
} else if (info == XLOG_MULTIXACT_CREATE_ID) {
} else if (mask_info == XLOG_MULTIXACT_CREATE_ID) {
xl_multixact_create* xlrec = (xl_multixact_create*)XLogRecGetData(record);
TransactionId* xids = xlrec->xids;
TransactionId max_xid;

5
src/gausskernel/storage/access/transam/parallel_recovery/dispatcher.cpp
View File

@ -155,7 +155,7 @@ static const RmgrDispatchData g_dispatchTable[RM_MAX_ID + 1] = {
RmgrRecordInfoValid,
RM_MULTIXACT_ID,
XLOG_MULTIXACT_ZERO_OFF_PAGE,
XLOG_MULTIXACT_INT64_PAGENO},
XLOG_MULTIXACT_CREATE_ID},
{DispatchRelMapRecord, RmgrRecordInfoValid, RM_RELMAP_ID, XLOG_RELMAP_UPDATE, XLOG_RELMAP_UPDATE},
#ifdef ENABLE_MULTIPLE_NODES
{DispatchStandbyRecord, RmgrRecordInfoValid, RM_STANDBY_ID, XLOG_STANDBY_LOCK, XLOG_STANDBY_CSN},
@ -527,6 +527,9 @@ static bool RmgrRecordInfoValid(XLogReaderState* record, uint8 minInfo, uint8 ma
if ((XLogRecGetRmid(record) == RM_HEAP2_ID) || (XLogRecGetRmid(record) == RM_HEAP_ID)) {
info = (info & XLOG_HEAP_OPMASK);
}
if ((XLogRecGetRmid(record) == RM_MULTIXACT_ID)) {
info = (info & XLOG_MULTIXACT_MASK);
}
info = (info >> XLOG_INFO_SHIFT_SIZE);
minInfo = (minInfo >> XLOG_INFO_SHIFT_SIZE);

5
src/include/access/multixact.h
View File

@ -34,7 +34,10 @@
#define XLOG_MULTIXACT_ZERO_OFF_PAGE 0x00
#define XLOG_MULTIXACT_ZERO_MEM_PAGE 0x10
#define XLOG_MULTIXACT_CREATE_ID 0x20
#define XLOG_MULTIXACT_INT64_PAGENO 0x30
#define XLOG_MULTIXACT_MASK 0x70
#define XLOG_MULTIXACT_INT64_PAGENO 0x80
typedef struct xl_multixact_create {