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

fix the incorrectly release of macro blocks of ls meta checkpoint

Browse Source
This commit is contained in:
windye 2023-05-15 08:16:31 +00:00 committed by ob-robot
parent 0ca17b1b8d
commit be9397596c
3 changed files with 26 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/storage/slog_ckpt/ob_tenant_checkpoint_slog_handler.cpp
View File

@ -505,6 +505,10 @@ int ObTenantCheckpointSlogHandler::update_tablet_meta_addr_and_block_list(
LOG_WARN("fail to update_tablet_meta_addr", K(ret));
} else if (OB_FAIL(ckpt_writer.get_ls_block_list(meta_block_list))) {
LOG_WARN("fail to get_ls_block_list", K(ret));
} else if (OB_FAIL(ls_block_handle_.add_macro_blocks(*meta_block_list, false /*switch handle*/))) {
LOG_WARN("fail to add_macro_blocks", K(ret));
} else if (OB_FAIL(ckpt_writer.get_dup_ls_block_list(meta_block_list))) {
LOG_WARN("fail to get_ls_block_list", K(ret));
} else if (OB_FAIL(ls_block_handle_.add_macro_blocks(*meta_block_list, true /*switch handle*/))) {
LOG_WARN("fail to add_macro_blocks", K(ret));
} else if (OB_FAIL(ckpt_writer.get_tablet_block_list(meta_block_list))) {

25
src/storage/slog_ckpt/ob_tenant_storage_checkpoint_writer.cpp
View File

@ -39,6 +39,7 @@ ObTenantStorageCheckpointWriter::ObTenantStorageCheckpointWriter()
tablet_item_addr_info_arr_(),
ls_id_set_(),
ls_item_writer_(),
dup_ls_item_writer_(),
tablet_item_writer_()
{
}
@ -70,6 +71,7 @@ void ObTenantStorageCheckpointWriter::reset()
tablet_item_addr_info_arr_.reset();
ls_id_set_.clear();
ls_item_writer_.reset();
dup_ls_item_writer_.reset();
tablet_item_writer_.reset();
}
@ -180,10 +182,10 @@ int ObTenantStorageCheckpointWriter::write_ls_dup_table_checkpoint(blocksstable:
transaction::ObDupTableLSCheckpoint::ObLSDupTableMeta dup_ls_meta;
ls_item_writer_.reset();
dup_ls_item_writer_.reset();
if (OB_FAIL(MTL(ObLSService *)->get_ls_iter(ls_iter, ObLSGetMod::STORAGE_MOD))) {
LOG_WARN("failed to get log stream iter", K(ret));
} else if (OB_FAIL(ls_item_writer_.init(false /*no need addr*/))) {
} else if (OB_FAIL(dup_ls_item_writer_.init(false /*no need addr*/))) {
LOG_WARN("failed to init logs tream item writer", K(ret));
} else {
while (OB_SUCC(ret)) {
@ -213,7 +215,7 @@ int ObTenantStorageCheckpointWriter::write_ls_dup_table_checkpoint(blocksstable:
LOG_WARN("fail to allocate memory", K(ret));
} else if (OB_FAIL(dup_ls_meta.serialize(buf, buf_len, pos))) {
LOG_WARN("fail to serialize", K(ret));
} else if (OB_FAIL(ls_item_writer_.write_item(buf, buf_len, nullptr))) {
} else if (OB_FAIL(dup_ls_item_writer_.write_item(buf, buf_len, nullptr))) {
LOG_WARN("fail to write log stream item", K(ret));
}
@ -224,9 +226,9 @@ int ObTenantStorageCheckpointWriter::write_ls_dup_table_checkpoint(blocksstable:
}
if (OB_SUCC(ret)) {
if (OB_FAIL(ls_item_writer_.close())) {
if (OB_FAIL(dup_ls_item_writer_.close())) {
LOG_WARN("fail to close log stream item writer", K(ret));
} else if (OB_FAIL(ls_item_writer_.get_entry_block(entry_block))) {
} else if (OB_FAIL(dup_ls_item_writer_.get_entry_block(entry_block))) {
LOG_WARN("fail to get entry block", K(ret));
}
}
@ -401,6 +403,19 @@ int ObTenantStorageCheckpointWriter::get_ls_block_list(common::ObIArray<MacroBlo
return ret;
}
int ObTenantStorageCheckpointWriter::get_dup_ls_block_list(common::ObIArray<MacroBlockId> *&block_list)
{
int ret = OB_SUCCESS;
if (OB_UNLIKELY(!is_inited_)) {
ret = OB_NOT_INIT;
LOG_WARN("ObTenantStorageCheckpointWriter not inited", K(ret));
} else {
ObIArray<MacroBlockId> &ls_block_list = dup_ls_item_writer_.get_meta_block_list();
block_list = &ls_block_list;
}
return ret;
}
int ObTenantStorageCheckpointWriter::get_tablet_block_list(
common::ObIArray<MacroBlockId> *&block_list)
{

2
src/storage/slog_ckpt/ob_tenant_storage_checkpoint_writer.h
View File

@ -34,6 +34,7 @@ public:
void reset();
int write_checkpoint(ObTenantSuperBlock &super_block);
int get_ls_block_list(common::ObIArray<blocksstable::MacroBlockId> *&block_list);
int get_dup_ls_block_list(common::ObIArray<blocksstable::MacroBlockId> *&block_list);
int get_tablet_block_list(common::ObIArray<blocksstable::MacroBlockId> *&block_list);
int update_tablet_meta_addr();
@ -67,6 +68,7 @@ private:
// this ensures that the ls of the tablet is replayed before than the tablet
common::hash::ObHashSet<share::ObLSID> ls_id_set_;
ObLinkedMacroBlockItemWriter ls_item_writer_;
ObLinkedMacroBlockItemWriter dup_ls_item_writer_;
ObLinkedMacroBlockItemWriter tablet_item_writer_;
};