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

!6406 fix undorecycle core

Browse Source 
Merge pull request !6406 from lyannaa/master932
This commit is contained in:
opengauss_bot
2024-09-23 06:06:41 +00:00
committed by Gitee
parent 92a5ac8935 b84cc027a0
commit aa5715b8e2
1 changed files with 4 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/gausskernel/storage/access/ustore/undo/knl_uundorecycle.cpp
View File

@ -127,7 +127,7 @@ bool VerifyFrozenXidAdvance(TransactionId oldestXmin, TransactionId globalFrozen
return true;
}
if (TransactionIdIsNormal(globalFrozenXid) && TransactionIdFollows(globalFrozenXid, oldestXmin)) {
ereport(PANIC, (errmodule(MOD_UNDO),
ereport(WARNING, (errmodule(MOD_UNDO),
errmsg(UNDOFORMAT(
"Advance frozen xid failed, globalFrozenXid %lu is bigger than oldestXmin %lu."),
globalFrozenXid, oldestXmin)));
@ -135,7 +135,7 @@ bool VerifyFrozenXidAdvance(TransactionId oldestXmin, TransactionId globalFrozen
if (TransactionIdIsNormal(globalFrozenXid) &&
TransactionIdIsNormal(g_instance.undo_cxt.globalFrozenXid) &&
TransactionIdPrecedes(globalFrozenXid, g_instance.undo_cxt.globalFrozenXid)) {
ereport(PANIC, (errmodule(MOD_UNDO),
ereport(WARNING, (errmodule(MOD_UNDO),
errmsg(UNDOFORMAT(
"Advance frozen xid failed, globalFrozenXid %lu is smaller than globalFrozenXid %lu."),
globalFrozenXid, g_instance.undo_cxt.globalFrozenXid)));
@ -143,7 +143,7 @@ bool VerifyFrozenXidAdvance(TransactionId oldestXmin, TransactionId globalFrozen
if (TransactionIdIsNormal(globalFrozenXid) &&
TransactionIdIsNormal(g_instance.undo_cxt.globalRecycleXid) &&
TransactionIdPrecedes(globalFrozenXid, g_instance.undo_cxt.globalRecycleXid)) {
ereport(PANIC, (errmodule(MOD_UNDO),
ereport(WARNING, (errmodule(MOD_UNDO),
errmsg(UNDOFORMAT(
"Advance frozen xid failed, globalFrozenXid %lu is smaller than globalRecycleXid %lu."),
globalFrozenXid, g_instance.undo_cxt.globalRecycleXid)));
@ -157,19 +157,11 @@ bool VerifyRecycleXidAdvance(TransactionId globalFrozenXid, TransactionId oldest
return true;
}
if (TransactionIdIsNormal(oldestRecycleXid) && TransactionIdFollows(oldestRecycleXid, globalFrozenXid)) {
ereport(PANIC, (errmodule(MOD_UNDO),
ereport(WARNING, (errmodule(MOD_UNDO),
errmsg(UNDOFORMAT(
"Advance recycle xid failed, oldestRecycleXid %lu is bigger than globalFrozenXid %lu."),
oldestRecycleXid, globalFrozenXid)));
}
if (TransactionIdIsNormal(oldestRecycleXid) &&
TransactionIdIsNormal(g_instance.undo_cxt.globalRecycleXid) &&
TransactionIdPrecedes(oldestRecycleXid, g_instance.undo_cxt.globalRecycleXid)) {
ereport(PANIC, (errmodule(MOD_UNDO),
errmsg(UNDOFORMAT(
"Advance recycle xid failed, oldestRecycleXid %lu is smaller than globalRecycleXid %lu."),
globalFrozenXid, g_instance.undo_cxt.globalRecycleXid)));
}
return true;
}