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

fix restart issue

Browse Source
This commit is contained in:
obdev
2024-02-07 23:54:00 +00:00
committed by ob-robot
parent 2597a75601
commit 237b6e517b
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -501,6 +501,7 @@ int ObTenantCheckpointSlogHandler::replay_new_ls(
int ret = OB_SUCCESS; int ret = OB_SUCCESS;
ObLSCkptMember ls_ckpt_member; ObLSCkptMember ls_ckpt_member;
int64_t pos = 0; int64_t pos = 0;
ObSArray<MacroBlockId> tmp_block_list(OB_MALLOC_NORMAL_BLOCK_SIZE, ModulePageAllocator("ReplayCKPT", MTL_ID()));
ObTenantStorageCheckpointReader tablet_ckpt_reader; ObTenantStorageCheckpointReader tablet_ckpt_reader;
ObTenantStorageCheckpointReader::ObStorageMetaOp replay_tablet_op = ObTenantStorageCheckpointReader::ObStorageMetaOp replay_tablet_op =
std::bind(&ObTenantCheckpointSlogHandler::replay_new_tablet, std::bind(&ObTenantCheckpointSlogHandler::replay_new_tablet,
@ -513,8 +514,14 @@ int ObTenantCheckpointSlogHandler::replay_new_ls(
} else if (OB_FAIL(replay_dup_table_ls_meta(ls_ckpt_member.dup_ls_meta_))) { } else if (OB_FAIL(replay_dup_table_ls_meta(ls_ckpt_member.dup_ls_meta_))) {
LOG_WARN("fail to replay set dup table ls meta", K(ret), K(ls_ckpt_member)); LOG_WARN("fail to replay set dup table ls meta", K(ret), K(ls_ckpt_member));
} else if (OB_FAIL(tablet_ckpt_reader.iter_read_meta_item( } else if (OB_FAIL(tablet_ckpt_reader.iter_read_meta_item(
ls_ckpt_member.tablet_meta_entry_, replay_tablet_op, tablet_block_list))) { ls_ckpt_member.tablet_meta_entry_, replay_tablet_op, tmp_block_list))) {
LOG_WARN("fail to iter replay tablet", K(ret), K(ls_ckpt_member)); LOG_WARN("fail to iter replay tablet", K(ret), K(ls_ckpt_member));
} else {
for (int64_t i = 0; OB_SUCC(ret) && i < tmp_block_list.count(); i++) {
if (OB_FAIL(tablet_block_list.push_back(tmp_block_list.at(i)))) {
LOG_WARN("fail to push back macro block id", K(ret), K(i));
}
}
} }
return ret; return ret;
} }