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

[BUG.FIX] reduce macro id set memory footprints by using without no lock mode.

Browse Source
This commit is contained in:
Tyshawn
2023-08-29 07:48:02 +00:00
committed by ob-robot
parent 22160842d6
commit c399d81179
3 changed files with 26 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/storage/blocksstable/ob_block_manager.cpp
View File

@ -927,7 +927,7 @@ int ObBlockManager::do_sweep(MacroBlkIdMap &mark_info)
void ObBlockManager::mark_and_sweep() void ObBlockManager::mark_and_sweep()
{ {
int ret = OB_SUCCESS; int ret = OB_SUCCESS;
ObHashSet<MacroBlockId> macro_id_set; ObHashSet<MacroBlockId, NoPthreadDefendMode> macro_id_set;
MacroBlkIdMap mark_info; MacroBlkIdMap mark_info;
ObMacroBlockMarkerStatus tmp_status; ObMacroBlockMarkerStatus tmp_status;
bool skip_mark = false; bool skip_mark = false;
@ -946,7 +946,8 @@ void ObBlockManager::mark_and_sweep()
} else { } else {
if (OB_FAIL(mark_info.init(ObModIds::OB_STORAGE_FILE_BLOCK_REF, OB_SERVER_TENANT_ID))) { if (OB_FAIL(mark_info.init(ObModIds::OB_STORAGE_FILE_BLOCK_REF, OB_SERVER_TENANT_ID))) {
LOG_WARN("fail to init mark info, ", K(ret)); LOG_WARN("fail to init mark info, ", K(ret));
} else if (OB_FAIL(macro_id_set.create(MAX(2, block_map_.count())))) { } else if (OB_FAIL(macro_id_set.create(MAX(2, block_map_.count()), "BlkIdSetBkt", "BlkIdSetNode",
OB_SERVER_TENANT_ID))) {
LOG_WARN("fail to create macro id set", K(ret)); LOG_WARN("fail to create macro id set", K(ret));
} else { } else {
GetPendingFreeBlockFunctor pending_free_functor(mark_info, tmp_status.hold_count_); GetPendingFreeBlockFunctor pending_free_functor(mark_info, tmp_status.hold_count_);
@ -999,7 +1000,7 @@ void ObBlockManager::mark_and_sweep()
int ObBlockManager::mark_macro_blocks( int ObBlockManager::mark_macro_blocks(
MacroBlkIdMap &mark_info, MacroBlkIdMap &mark_info,
common::hash::ObHashSet<MacroBlockId> &macro_id_set, common::hash::ObHashSet<MacroBlockId, common::hash::NoPthreadDefendMode> &macro_id_set,
ObMacroBlockMarkerStatus &tmp_status) ObMacroBlockMarkerStatus &tmp_status)
{ {
int ret = OB_SUCCESS; int ret = OB_SUCCESS;
@ -1038,7 +1039,7 @@ int ObBlockManager::mark_macro_blocks(
int ObBlockManager::mark_held_shared_block( int ObBlockManager::mark_held_shared_block(
const MacroBlockId &macro_id, const MacroBlockId &macro_id,
MacroBlkIdMap &mark_info, MacroBlkIdMap &mark_info,
common::hash::ObHashSet<MacroBlockId> &macro_id_set, common::hash::ObHashSet<MacroBlockId, common::hash::NoPthreadDefendMode> &macro_id_set,
ObMacroBlockMarkerStatus &tmp_status) ObMacroBlockMarkerStatus &tmp_status)
{ {
int ret = OB_SUCCESS; int ret = OB_SUCCESS;
@ -1062,7 +1063,7 @@ int ObBlockManager::mark_held_shared_block(
int ObBlockManager::mark_tenant_blocks( int ObBlockManager::mark_tenant_blocks(
MacroBlkIdMap &mark_info, MacroBlkIdMap &mark_info,
common::hash::ObHashSet<MacroBlockId> &macro_id_set, common::hash::ObHashSet<MacroBlockId, common::hash::NoPthreadDefendMode> &macro_id_set,
ObMacroBlockMarkerStatus &tmp_status) ObMacroBlockMarkerStatus &tmp_status)
{ {
int ret = OB_SUCCESS; int ret = OB_SUCCESS;
@ -1106,7 +1107,7 @@ int ObBlockManager::mark_tenant_blocks(
int ObBlockManager::mark_sstable_blocks( int ObBlockManager::mark_sstable_blocks(
MacroBlkIdMap &mark_info, MacroBlkIdMap &mark_info,
ObTabletHandle &handle, ObTabletHandle &handle,
common::hash::ObHashSet<MacroBlockId> &macro_id_set, common::hash::ObHashSet<MacroBlockId, common::hash::NoPthreadDefendMode> &macro_id_set,
ObMacroBlockMarkerStatus &tmp_status) ObMacroBlockMarkerStatus &tmp_status)
{ {
int ret = OB_SUCCESS; int ret = OB_SUCCESS;
@ -1227,7 +1228,7 @@ int ObBlockManager::mark_sstable_blocks(
int ObBlockManager::mark_tablet_meta_blocks( int ObBlockManager::mark_tablet_meta_blocks(
MacroBlkIdMap &mark_info, MacroBlkIdMap &mark_info,
storage::ObTabletHandle &handle, storage::ObTabletHandle &handle,
common::hash::ObHashSet<MacroBlockId> &macro_id_set, common::hash::ObHashSet<MacroBlockId, common::hash::NoPthreadDefendMode> &macro_id_set,
ObMacroBlockMarkerStatus &tmp_status) ObMacroBlockMarkerStatus &tmp_status)
{ {
int ret = OB_SUCCESS; int ret = OB_SUCCESS;
@ -1258,7 +1259,7 @@ int ObBlockManager::mark_tablet_meta_blocks(
int ObBlockManager::mark_sstable_meta_block( int ObBlockManager::mark_sstable_meta_block(
const blocksstable::ObSSTable &sstable, const blocksstable::ObSSTable &sstable,
MacroBlkIdMap &mark_info, MacroBlkIdMap &mark_info,
common::hash::ObHashSet<MacroBlockId> &macro_id_set, common::hash::ObHashSet<MacroBlockId, common::hash::NoPthreadDefendMode> &macro_id_set,
ObMacroBlockMarkerStatus &tmp_status) ObMacroBlockMarkerStatus &tmp_status)
{ {
int ret = OB_SUCCESS; int ret = OB_SUCCESS;
@ -1286,7 +1287,7 @@ int ObBlockManager::mark_sstable_meta_block(
int ObBlockManager::mark_tenant_ckpt_blocks( int ObBlockManager::mark_tenant_ckpt_blocks(
MacroBlkIdMap &mark_info, MacroBlkIdMap &mark_info,
common::hash::ObHashSet<MacroBlockId> &macro_id_set, common::hash::ObHashSet<MacroBlockId, common::hash::NoPthreadDefendMode> &macro_id_set,
ObTenantCheckpointSlogHandler &hdl, ObTenantCheckpointSlogHandler &hdl,
ObMacroBlockMarkerStatus &tmp_status) ObMacroBlockMarkerStatus &tmp_status)
{ {
@ -1308,7 +1309,7 @@ int ObBlockManager::mark_tenant_ckpt_blocks(
int ObBlockManager::mark_tmp_file_blocks( int ObBlockManager::mark_tmp_file_blocks(
MacroBlkIdMap &mark_info, MacroBlkIdMap &mark_info,
common::hash::ObHashSet<MacroBlockId> &macro_id_set, common::hash::ObHashSet<MacroBlockId, common::hash::NoPthreadDefendMode> &macro_id_set,
ObMacroBlockMarkerStatus &tmp_status) ObMacroBlockMarkerStatus &tmp_status)
{ {
int ret = OB_SUCCESS; int ret = OB_SUCCESS;
@ -1329,7 +1330,7 @@ int ObBlockManager::mark_tmp_file_blocks(
int ObBlockManager::mark_server_meta_blocks( int ObBlockManager::mark_server_meta_blocks(
MacroBlkIdMap &mark_info, MacroBlkIdMap &mark_info,
common::hash::ObHashSet<MacroBlockId> &macro_id_set, common::hash::ObHashSet<MacroBlockId, common::hash::NoPthreadDefendMode> &macro_id_set,
ObMacroBlockMarkerStatus &tmp_status) ObMacroBlockMarkerStatus &tmp_status)
{ {
int ret = OB_SUCCESS; int ret = OB_SUCCESS;
@ -1356,7 +1357,7 @@ bool ObBlockManager::continue_mark()
int ObBlockManager::update_mark_info( int ObBlockManager::update_mark_info(
const ObIArray<MacroBlockId> &macro_block_list, const ObIArray<MacroBlockId> &macro_block_list,
common::hash::ObHashSet<MacroBlockId> &macro_id_set, common::hash::ObHashSet<MacroBlockId, common::hash::NoPthreadDefendMode> &macro_id_set,
MacroBlkIdMap &mark_info) MacroBlkIdMap &mark_info)
{ {
int ret = OB_SUCCESS; int ret = OB_SUCCESS;

24
src/storage/blocksstable/ob_block_manager.h
View File

@ -274,7 +274,7 @@ private:
{ {
public: public:
GetOldestHoldBlockFunctor( GetOldestHoldBlockFunctor(
common::hash::ObHashSet<MacroBlockId> &id_set, common::hash::ObHashSet<MacroBlockId, common::hash::NoPthreadDefendMode> &id_set,
ObSimpleMacroBlockInfo &info) ObSimpleMacroBlockInfo &info)
: ret_code_(common::OB_SUCCESS), : ret_code_(common::OB_SUCCESS),
macro_id_set_(id_set), macro_id_set_(id_set),
@ -285,7 +285,7 @@ private:
int get_ret_code() const { return ret_code_; } int get_ret_code() const { return ret_code_; }
private: private:
int ret_code_; int ret_code_;
common::hash::ObHashSet<MacroBlockId> &macro_id_set_; common::hash::ObHashSet<MacroBlockId, common::hash::NoPthreadDefendMode> &macro_id_set_;
ObSimpleMacroBlockInfo &oldest_hold_block_info_; ObSimpleMacroBlockInfo &oldest_hold_block_info_;
}; };
@ -332,51 +332,51 @@ private:
bool is_bad_block(const MacroBlockId &macro_block_id); bool is_bad_block(const MacroBlockId &macro_block_id);
int mark_macro_blocks( int mark_macro_blocks(
MacroBlkIdMap &mark_info, MacroBlkIdMap &mark_info,
common::hash::ObHashSet<MacroBlockId> &macro_id_set, common::hash::ObHashSet<MacroBlockId, common::hash::NoPthreadDefendMode> &macro_id_set,
ObMacroBlockMarkerStatus &tmp_status); ObMacroBlockMarkerStatus &tmp_status);
int mark_held_shared_block( int mark_held_shared_block(
const MacroBlockId &macro_id, const MacroBlockId &macro_id,
MacroBlkIdMap &mark_info, MacroBlkIdMap &mark_info,
common::hash::ObHashSet<MacroBlockId> &macro_id_set, common::hash::ObHashSet<MacroBlockId, common::hash::NoPthreadDefendMode> &macro_id_set,
ObMacroBlockMarkerStatus &tmp_status); ObMacroBlockMarkerStatus &tmp_status);
int mark_tenant_blocks( int mark_tenant_blocks(
MacroBlkIdMap &mark_info, MacroBlkIdMap &mark_info,
common::hash::ObHashSet<MacroBlockId> &macro_id_set, common::hash::ObHashSet<MacroBlockId, common::hash::NoPthreadDefendMode> &macro_id_set,
ObMacroBlockMarkerStatus &tmp_status); ObMacroBlockMarkerStatus &tmp_status);
int mark_sstable_blocks( int mark_sstable_blocks(
MacroBlkIdMap &mark_info, MacroBlkIdMap &mark_info,
storage::ObTabletHandle &handle, storage::ObTabletHandle &handle,
common::hash::ObHashSet<MacroBlockId> &macro_id_set, common::hash::ObHashSet<MacroBlockId, common::hash::NoPthreadDefendMode> &macro_id_set,
ObMacroBlockMarkerStatus &tmp_status); ObMacroBlockMarkerStatus &tmp_status);
int mark_sstable_meta_block( int mark_sstable_meta_block(
const blocksstable::ObSSTable &sstable, const blocksstable::ObSSTable &sstable,
MacroBlkIdMap &mark_info, MacroBlkIdMap &mark_info,
common::hash::ObHashSet<MacroBlockId> &macro_id_set, common::hash::ObHashSet<MacroBlockId, common::hash::NoPthreadDefendMode> &macro_id_set,
ObMacroBlockMarkerStatus &tmp_status); ObMacroBlockMarkerStatus &tmp_status);
int mark_tablet_meta_blocks( int mark_tablet_meta_blocks(
MacroBlkIdMap &mark_info, MacroBlkIdMap &mark_info,
storage::ObTabletHandle &handle, storage::ObTabletHandle &handle,
common::hash::ObHashSet<MacroBlockId> &macro_id_set, common::hash::ObHashSet<MacroBlockId, common::hash::NoPthreadDefendMode> &macro_id_set,
ObMacroBlockMarkerStatus &tmp_status); ObMacroBlockMarkerStatus &tmp_status);
int mark_tenant_ckpt_blocks( int mark_tenant_ckpt_blocks(
MacroBlkIdMap &mark_info, MacroBlkIdMap &mark_info,
common::hash::ObHashSet<MacroBlockId> &macro_id_set, common::hash::ObHashSet<MacroBlockId, common::hash::NoPthreadDefendMode> &macro_id_set,
storage::ObTenantCheckpointSlogHandler &hdl, storage::ObTenantCheckpointSlogHandler &hdl,
ObMacroBlockMarkerStatus &tmp_status); ObMacroBlockMarkerStatus &tmp_status);
int mark_tmp_file_blocks( int mark_tmp_file_blocks(
MacroBlkIdMap &mark_info, MacroBlkIdMap &mark_info,
common::hash::ObHashSet<MacroBlockId> &macro_id_set, common::hash::ObHashSet<MacroBlockId, common::hash::NoPthreadDefendMode> &macro_id_set,
ObMacroBlockMarkerStatus &tmp_status); ObMacroBlockMarkerStatus &tmp_status);
int mark_server_meta_blocks( int mark_server_meta_blocks(
MacroBlkIdMap &mark_info, MacroBlkIdMap &mark_info,
common::hash::ObHashSet<MacroBlockId> &macro_id_set, common::hash::ObHashSet<MacroBlockId, common::hash::NoPthreadDefendMode> &macro_id_set,
ObMacroBlockMarkerStatus &tmp_status); ObMacroBlockMarkerStatus &tmp_status);
bool continue_mark(); bool continue_mark();
int do_sweep(MacroBlkIdMap &mark_info); int do_sweep(MacroBlkIdMap &mark_info);
int update_mark_info( int update_mark_info(
const common::ObIArray<MacroBlockId> &macro_block_list, const common::ObIArray<MacroBlockId> &macro_block_list,
common::hash::ObHashSet<MacroBlockId> &macro_id_set, common::hash::ObHashSet<MacroBlockId, common::hash::NoPthreadDefendMode> &macro_id_set,
MacroBlkIdMap &mark_info); MacroBlkIdMap &mark_info);
int update_mark_info( int update_mark_info(
const MacroBlockId &macro_id, const MacroBlockId &macro_id,

2
unittest/storage/blocksstable/test_block_manager.cpp
View File

@ -165,7 +165,7 @@ TEST_F(TestBlockManager, test_mark_and_sweep)
ret = mark_info.init(ObModIds::OB_STORAGE_FILE_BLOCK_REF, OB_SERVER_TENANT_ID); ret = mark_info.init(ObModIds::OB_STORAGE_FILE_BLOCK_REF, OB_SERVER_TENANT_ID);
ASSERT_EQ(OB_SUCCESS, ret); ASSERT_EQ(OB_SUCCESS, ret);
common::hash::ObHashSet<MacroBlockId> macro_id_set; common::hash::ObHashSet<MacroBlockId, common::hash::NoPthreadDefendMode> macro_id_set;
ret = macro_id_set.create(MAX(2, OB_SERVER_BLOCK_MGR.block_map_.count())); ret = macro_id_set.create(MAX(2, OB_SERVER_BLOCK_MGR.block_map_.count()));
ASSERT_EQ(OB_SUCCESS, ret); ASSERT_EQ(OB_SUCCESS, ret);
int64_t safe_ts = ObTimeUtility::current_time(); int64_t safe_ts = ObTimeUtility::current_time();