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

!6095 修复校验误报error

Browse Source 
Merge pull request !6095 from 徐达标/0821
This commit is contained in:
Mijamind
2024-08-21 10:53:59 +00:00
committed by Gitee
parent 8ceeab2f80 c551a48b84
commit 9822f5f51c
1 changed files with 16 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/gausskernel/storage/access/ubtree/ubtrecycle.cpp
View File

@ -1329,26 +1329,32 @@ static void UBTRecycleMetaDataVerify(UBTRecycleMeta metaData, Relation rel, Bloc
BYPASS_VERIFY(USTORE_VERIFY_MOD_UBTREE, rel);
CHECK_VERIFY_LEVEL(USTORE_VERIFY_FAST)
BlockNumber indexBlocks = (rel == NULL ? metaData->nblocksUpper : RelationGetNumberOfBlocks(rel));
uint32 urqBlocks = MaxBlockNumber;
Oid oid = InvalidOid;
bool metaError = false;
BlockNumber urqBlocks = MaxBlockNumber;
BlockNumber indexBlocks = metaData->nblocksUpper;
RelFileNode rNode = rel ? rel->rd_node : RelFileNode{InvalidOid, InvalidOid, InvalidOid};
if (rel != NULL) {
RelationOpenSmgr(rel);
urqBlocks = Max(minRecycleQueueBlockNumber, smgrnblocks(rel->rd_smgr, FSM_FORKNUM));
oid = rel->rd_id;
indexBlocks = RelationGetNumberOfBlocks(rel);
}
metaError = ((metaData->headBlkno == 1 - metaBlkno) || (metaData->tailBlkno == 1 - metaBlkno)) ||
(metaData->headBlkno >= urqBlocks || metaData->tailBlkno >= urqBlocks) || (metaData->nblocksUpper > indexBlocks);
bool metaError = (metaData->headBlkno == 1 - metaBlkno) || (metaData->tailBlkno == 1 - metaBlkno);
if (!metaError && rel != NULL) {
if (metaData->headBlkno >= urqBlocks || metaData->tailBlkno >= urqBlocks) {
urqBlocks = Max(minRecycleQueueBlockNumber, smgrnblocks(rel->rd_smgr, FSM_FORKNUM));
metaError = metaData->headBlkno >= urqBlocks || metaData->tailBlkno >= urqBlocks;
}
if (!metaError && metaData->nblocksUpper > indexBlocks) {
indexBlocks = RelationGetNumberOfBlocks(rel);
metaError = metaData->nblocksUpper > indexBlocks;
}
}
if (metaError) {
ereport(ustore_verify_errlevel(), (errcode(ERRCODE_DATA_CORRUPTED),errmsg(
"[Verify URQ] urq meta is invalid : (meta info : headBlkno = %u, tailBlkno = %u, "
"nblocksUpper = %u, nblocksLower = %u; urq_blocks = %u, index_blocks = %u), rnode[%u,%u,%u], block %u",
oid, metaBlkno, metaData->headBlkno, metaData->tailBlkno, metaData->nblocksUpper,
metaData->nblocksLower, urqBlocks, indexBlocks, rNode.spcNode, rNode.dbNode, rNode.relNode, metaBlkno)));
metaData->headBlkno, metaData->tailBlkno, metaData->nblocksUpper, metaData->nblocksLower,
urqBlocks, indexBlocks, rNode.spcNode, rNode.dbNode, rNode.relNode, metaBlkno)));
}
}