hcq/oceanbase
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

fix reserve_mem_mode for mini compaction

Browse Source
This commit is contained in:
Fengjingkun
2023-11-29 10:16:08 +00:00
committed by ob-robot
parent 9caad1da27
commit 25c261abdb
2 changed files with 18 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/storage/compaction/ob_tablet_merge_task.cpp
View File

@ -1160,6 +1160,14 @@ int ObTabletMergeTask::process()
return ret;
}
ObTxTableMergeDag::~ObTxTableMergeDag()
{
if (param_.is_reserve_mode_) {
MTL(ObTenantCompactionMemPool *)->release_reserve_mem();
FLOG_INFO("TxTable Compaction Leave the Reserve Mode", K(param_));
}
}
ObTabletMiniMergeDag::~ObTabletMiniMergeDag()
{
if (param_.is_reserve_mode_) {

13
src/storage/compaction/ob_tablet_merge_task.h
View File

@ -331,18 +331,25 @@ static void prepare_allocator(
class DAG_NAME : public ObTabletMergeDag { \
public: \
DAG_NAME() : ObTabletMergeDag(DAG_TYPE) {} \
~DAG_NAME() = default; \
virtual ~DAG_NAME() = default; \
};
DEFINE_MERGE_DAG(ObTxTableMergeDag, share::ObDagType::DAG_TYPE_TX_TABLE_MERGE);
DEFINE_MERGE_DAG(ObTabletMajorMergeDag, share::ObDagType::DAG_TYPE_MAJOR_MERGE);
class ObTxTableMergeDag : public ObTabletMergeDag {
public:
ObTxTableMergeDag()
: ObTabletMergeDag(share::ObDagType::DAG_TYPE_TX_TABLE_MERGE)
{}
virtual ~ObTxTableMergeDag();
};
class ObTabletMiniMergeDag : public ObTabletMergeDag {
public:
ObTabletMiniMergeDag()
: ObTabletMergeDag(share::ObDagType::DAG_TYPE_MINI_MERGE)
{}
~ObTabletMiniMergeDag();
virtual ~ObTabletMiniMergeDag();
};
} // namespace compaction