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

reset tablet_allocator before release tenant

Browse Source
This commit is contained in:
obdev
2023-03-21 16:15:28 +00:00
committed by ob-robot
parent 6bb3ee6c54
commit 43a79e5d56
3 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/observer/virtual_table/ob_all_virtual_table_mgr.cpp
View File

@ -95,6 +95,7 @@ void ObAllVirtualTableMgr::release_last_tenant()
tablet_iter_->~ObTenantTabletIterator(); tablet_iter_->~ObTenantTabletIterator();
tablet_iter_ = nullptr; tablet_iter_ = nullptr;
} }
tablet_allocator_.reset();
} }
bool ObAllVirtualTableMgr::is_need_process(uint64_t tenant_id) bool ObAllVirtualTableMgr::is_need_process(uint64_t tenant_id)

2
src/observer/virtual_table/ob_all_virtual_tablet_compaction_info.cpp
View File

@ -93,6 +93,8 @@ void ObAllVirtualTabletCompactionInfo::release_last_tenant()
tablet_iter_->~ObTenantTabletIterator(); tablet_iter_->~ObTenantTabletIterator();
tablet_iter_ = nullptr; tablet_iter_ = nullptr;
} }
tablet_handle_.reset();
tablet_allocator_.reset();
} }
bool ObAllVirtualTabletCompactionInfo::is_need_process(uint64_t tenant_id) bool ObAllVirtualTabletCompactionInfo::is_need_process(uint64_t tenant_id)

5
src/observer/virtual_table/ob_all_virtual_tablet_sstable_macro_info.cpp
View File

@ -34,6 +34,7 @@ ObAllVirtualTabletSSTableMacroInfo::MacroInfo::MacroInfo()
data_checksum_(0), data_checksum_(0),
occupy_size_(0), occupy_size_(0),
original_size_(0), original_size_(0),
data_size_(0),
data_zsize_(0), data_zsize_(0),
store_range_(), store_range_(),
row_count_(0), row_count_(0),
@ -56,6 +57,7 @@ void ObAllVirtualTabletSSTableMacroInfo::MacroInfo::reset()
data_checksum_ = 0; data_checksum_ = 0;
occupy_size_ = 0; occupy_size_ = 0;
original_size_ = 0; original_size_ = 0;
data_size_ = 0;
data_zsize_ = 0; data_zsize_ = 0;
store_range_.reset(); store_range_.reset();
row_count_ = 0; row_count_ = 0;
@ -467,6 +469,7 @@ void ObAllVirtualTabletSSTableMacroInfo::release_last_tenant()
macro_iter_ = nullptr; macro_iter_ = nullptr;
} }
curr_range_.reset(); curr_range_.reset();
tablet_allocator_.reset();
} }
bool ObAllVirtualTabletSSTableMacroInfo::is_need_process(uint64_t tenant_id) bool ObAllVirtualTabletSSTableMacroInfo::is_need_process(uint64_t tenant_id)
@ -513,6 +516,8 @@ int ObAllVirtualTabletSSTableMacroInfo::get_next_tablet()
} }
} }
while(OB_SUCC(ret)) { while(OB_SUCC(ret)) {
tablet_handle_.reset();
tablet_allocator_.reuse();
if (OB_FAIL(tablet_iter_->get_next_tablet(tablet_handle_))) { if (OB_FAIL(tablet_iter_->get_next_tablet(tablet_handle_))) {
if (OB_UNLIKELY(OB_ITER_END != ret)) { if (OB_UNLIKELY(OB_ITER_END != ret)) {
SERVER_LOG(WARN, "fail to get tablet iter", K(ret)); SERVER_LOG(WARN, "fail to get tablet iter", K(ret));