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

Bugfix: TmpBlockMap use 500 tenant memory.

Browse Source
This commit is contained in:
ND501
2024-02-10 02:13:38 +00:00
committed by ob-robot
parent 4decb5b506
commit d8667f105a
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/storage/blocksstable/ob_tmp_file_store.cpp
View File

@ -741,10 +741,10 @@ ObTmpTenantMacroBlockManager::~ObTmpTenantMacroBlockManager()
destroy(); destroy();
} }
int ObTmpTenantMacroBlockManager::init(common::ObIAllocator &allocator) int ObTmpTenantMacroBlockManager::init(const uint64_t tenant_id, common::ObIAllocator &allocator)
{ {
int ret = OB_SUCCESS; int ret = OB_SUCCESS;
ObMemAttr attr = SET_USE_500(ObModIds::OB_TMP_BLOCK_MAP); ObMemAttr attr(tenant_id, ObModIds::OB_TMP_BLOCK_MAP);
if (IS_INIT) { if (IS_INIT) {
ret = OB_INIT_TWICE; ret = OB_INIT_TWICE;
STORAGE_LOG(WARN, "ObTmpMacroBlockManager has been inited", K(ret)); STORAGE_LOG(WARN, "ObTmpMacroBlockManager has been inited", K(ret));
@ -947,7 +947,7 @@ int ObTmpTenantFileStore::init(const uint64_t tenant_id)
} else if (OB_ISNULL(page_cache_ = &ObTmpPageCache::get_instance())) { } else if (OB_ISNULL(page_cache_ = &ObTmpPageCache::get_instance())) {
ret = OB_ERR_UNEXPECTED; ret = OB_ERR_UNEXPECTED;
STORAGE_LOG(WARN, "fail to get the page cache", K(ret)); STORAGE_LOG(WARN, "fail to get the page cache", K(ret));
} else if (OB_FAIL(tmp_block_manager_.init(allocator_))) { } else if (OB_FAIL(tmp_block_manager_.init(tenant_id, allocator_))) {
STORAGE_LOG(WARN, "fail to init the block manager for ObTmpFileStore", K(ret)); STORAGE_LOG(WARN, "fail to init the block manager for ObTmpFileStore", K(ret));
} else if (OB_FAIL(tmp_mem_block_manager_.init(tenant_id, allocator_))) { } else if (OB_FAIL(tmp_mem_block_manager_.init(tenant_id, allocator_))) {
STORAGE_LOG(WARN, "fail to init memory block manager", K(ret)); STORAGE_LOG(WARN, "fail to init memory block manager", K(ret));

2
src/storage/blocksstable/ob_tmp_file_store.h
View File

@ -218,7 +218,7 @@ class ObTmpTenantMacroBlockManager final
public: public:
ObTmpTenantMacroBlockManager(); ObTmpTenantMacroBlockManager();
~ObTmpTenantMacroBlockManager(); ~ObTmpTenantMacroBlockManager();
int init(common::ObIAllocator &allocator); int init(const uint64_t tenant_id, common::ObIAllocator &allocator);
void destroy(); void destroy();
int alloc_macro_block(const int64_t dir_id, const uint64_t tenant_id, ObTmpMacroBlock *&t_mblk); int alloc_macro_block(const int64_t dir_id, const uint64_t tenant_id, ObTmpMacroBlock *&t_mblk);
int free_macro_block(const int64_t block_id); int free_macro_block(const int64_t block_id);