From dc8201832ea473ebf006649d5e45cad0151bac5c Mon Sep 17 00:00:00 2001 From: lyanna <1016943941@qq.com> Date: Mon, 23 Sep 2024 11:47:46 +0800 Subject: [PATCH] =?UTF-8?q?fix=20undorecycle=20core=20=EF=BC=88cherry=20pi?= =?UTF-8?q?cked=20commit=20from=20?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../access/ustore/undo/knl_uundorecycle.cpp | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/src/gausskernel/storage/access/ustore/undo/knl_uundorecycle.cpp b/src/gausskernel/storage/access/ustore/undo/knl_uundorecycle.cpp index a513dffad..916ae7133 100755 --- a/src/gausskernel/storage/access/ustore/undo/knl_uundorecycle.cpp +++ b/src/gausskernel/storage/access/ustore/undo/knl_uundorecycle.cpp @@ -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; }