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

fix invalid memory in undo

Browse Source 
Offering: openGaussDev

More detail: fix invalid memory in undo

Match-id-496852205f7ba0be46bf71ec29580aeece9d50f5
This commit is contained in:
openGaussDev
2022-03-10 10:21:28 +08:00
committed by yanghao
parent 9014fc5261
commit c3339b5ba1
3 changed files with 14 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/gausskernel/storage/access/ustore/knl_undoaction.cpp
View File

@ -35,6 +35,14 @@ static UHeapDiskTuple CopyTupleFromUndoRecord(Relation relation, UndoRecord *und
static void RestoreXactFromUndoRecord(UndoRecord *undorecord, Buffer buffer, UHeapDiskTuple tuple);
static void LogUHeapUndoActions(UHeapUndoActionWALInfo *walInfo, Relation rel);
static int GetUndoApplySize()
{
uint64 undoApplySize = (uint64)u_sess->attr.attr_memory.maintenance_work_mem * 1024L;
uint64 applySize = MAX_UNDO_APPLY_SIZE > undoApplySize ? undoApplySize : MAX_UNDO_APPLY_SIZE;
Assert(applySize <= MAX_UNDO_APPLY_SIZE);
return (int)applySize;
}
/*
* execute_undo_actions - Execute the undo actions
*
@ -49,10 +57,7 @@ void ExecuteUndoActions(TransactionId fullXid, UndoRecPtr fromUrecptr, UndoRecPt
Assert(toUrecptr != INVALID_UNDO_REC_PTR && fromUrecptr != INVALID_UNDO_REC_PTR);
Assert(slotPtr != INVALID_UNDO_REC_PTR);
Assert(fullXid != InvalidTransactionId);
int undoApplySize = u_sess->attr.attr_memory.maintenance_work_mem * 1024L;
/* setting maintenance_work_mem atleast 2GB will cause an overflow */
undoApplySize = (undoApplySize < 0) ? INT_MAX : undoApplySize;
int undoApplySize = GetUndoApplySize();
UndoRecPtr urecPtr = fromUrecptr;
UndoRecord *urec = New(CurrentMemoryContext)UndoRecord();
urec->SetUrp(toUrecptr);
@ -165,10 +170,7 @@ void ExecuteUndoActions(TransactionId fullXid, UndoRecPtr fromUrecptr, UndoRecPt
void ExecuteUndoActionsPage(UndoRecPtr fromUrp, Relation rel, Buffer buffer, TransactionId xid)
{
UndoRecPtr urp = fromUrp;
int undoApplySize = u_sess->attr.attr_memory.maintenance_work_mem * 1024L;
/* setting maintenance_work_mem atleast 2GB will cause an overflow */
undoApplySize = (undoApplySize < 0) ? INT_MAX : undoApplySize;
int undoApplySize = GetUndoApplySize();
/*
* Fetch the multiple undo records which can fit into undoApplySize;

2
src/gausskernel/storage/access/ustore/knl_uundovec.cpp
View File

@ -480,7 +480,7 @@ URecVector* FetchUndoRecordRange( __inout UndoRecPtr *startUrp,
}
totalSize += urec->MemoryRecordSize();
if (totalSize > maxUndoApplySize) {
if (totalSize >= maxUndoApplySize) {
*startUrp = currUrp;
break;
}

3
src/include/access/ustore/knl_undorequest.h
View File

@ -21,6 +21,9 @@
#include "access/ustore/knl_uundovec.h"
#include "utils/rel.h"
/* Maximum size of the cache of undo records in a single rollback, 64M. */
const uint64 MAX_UNDO_APPLY_SIZE = 64 * 1024 * 1024;
typedef struct RollbackRequestsHashKey {
TransactionId xid;
UndoRecPtr startUndoPtr;