LuoGe
/
openGauss-server
forked from huawei/openGauss-server
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix bug for barrier preparse 

Offering: openGaussDev

More detail:

Match-id-478a97c2593006ff511072ea037227fb26f9d5a4
This commit is contained in:
openGaussDev 2022-03-08 10:27:59 +08:00 committed by yanghao
parent 2b09dd1a67
commit 5ee5433c5b
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/gausskernel/process/postmaster/barrier_preparse.cpp
View File

@ -173,10 +173,11 @@ void BarrierPreParseMain(void)
XLogReaderState *xlogreader = NULL;
char *errormsg = NULL;
XLogPageReadPrivate readprivate;
XLogRecPtr startLSN;
XLogRecPtr preStartLSN;
XLogRecPtr startLSN = InvalidXLogRecPtr;
XLogRecPtr preStartLSN = InvalidXLogRecPtr;
XLogRecPtr lastReadLSN = InvalidXLogRecPtr;
bool found = false;
XLogRecPtr barrierLSN;
XLogRecPtr barrierLSN = InvalidXLogRecPtr;
char *xLogBarrierId = NULL;
char barrierId[MAX_BARRIER_ID_LENGTH] = {0};
const uint32 shiftSize = 32;
@ -258,6 +259,8 @@ void BarrierPreParseMain(void)
found = false;
preStartLSN = startLSN;
ereport(DEBUG1, (errmsg("[BarrierPreParse] start to preparse at: %08X/%08X",
(uint32)(startLSN >> shiftSize), (uint32)startLSN)));
startLSN = XLogFindNextRecord(xlogreader, startLSN);
if (XLogRecPtrIsInvalid(startLSN)) {
startLSN = preStartLSN;
@ -276,6 +279,7 @@ void BarrierPreParseMain(void)
if (record == NULL) {
break;
}
lastReadLSN = xlogreader->EndRecPtr;
uint8 info = XLogRecGetInfo(xlogreader) & ~XLR_INFO_MASK;
if (NEED_INSERT_INTO_HASH) {
xLogBarrierId = XLogRecGetData(xlogreader);
@ -305,7 +309,7 @@ void BarrierPreParseMain(void)
SetBarrieID(barrierId, barrierLSN);
}
startLSN = XLogRecPtrIsInvalid(xlogreader->ReadRecPtr) ? preStartLSN : xlogreader->ReadRecPtr;
startLSN = XLogRecPtrIsInvalid(lastReadLSN) ? preStartLSN : lastReadLSN;
if (XLogRecPtrIsInvalid(xlogreader->ReadRecPtr) && errormsg) {
ereport(LOG, (errmsg("[BarrierPreParse] preparse thread get an error info %s", errormsg)));