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

fix error usage of ret and set tenant id for allocator

Browse Source
This commit is contained in:
hiddenbomb 2023-10-11 02:09:51 +00:00 committed by ob-robot
parent 269a531263
commit c3fc7a64ed
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/storage/ls/ob_ls_tablet_service.cpp
View File

@ -1845,7 +1845,7 @@ int ObLSTabletService::replay_create_tablet(
} else {
int tmp_ret = OB_SUCCESS;
if (OB_TMP_FAIL(tablet_id_set_.erase(tablet_id))) {
if (OB_HASH_NOT_EXIST != ret) {
if (OB_HASH_NOT_EXIST != tmp_ret) {
LOG_ERROR("fail to erase tablet id from set", K(tmp_ret), K(tablet_id));
}
}

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

@ -690,7 +690,7 @@ int ObTenantCheckpointSlogHandler::record_ls_transfer_info(
LOG_INFO("The log stream does not need to record transfer_info", "ls_id", ls->get_ls_id(), K(current_migration_status), K(new_migration_status));
} else if (!tablet_transfer_info.has_transfer_table()) {
ret = OB_ERR_UNEXPECTED;
LOG_WARN("tablet should has transfer table", K(ret), "ls_id", ls->get_ls_id(), K(tablet_id), K(tablet_transfer_info));
LOG_WARN("tablet should have transfer table", K(ret), "ls_id", ls->get_ls_id(), K(tablet_id), K(tablet_transfer_info));
} else if (ls->get_ls_startup_transfer_info().is_valid()) {
if (ls->get_ls_startup_transfer_info().ls_id_ != tablet_transfer_info.ls_id_
|| ls->get_ls_startup_transfer_info().transfer_start_scn_ != tablet_transfer_info.transfer_start_scn_) {
@ -812,7 +812,7 @@ int ObTenantCheckpointSlogHandler::replay_create_tablets_per_task(
ObTabletTransferInfo tablet_transfer_info;
for (int64_t i = 0; OB_SUCC(ret) && i < tablet_addr_arr.count(); i++) {
ObArenaAllocator allocator("ReplayTablet");
ObArenaAllocator allocator(common::ObMemAttr(MTL_ID(), "ReplayTablet"));
const ObTabletMapKey &key = tablet_addr_arr.at(i).first;
const ObMetaDiskAddr &addr = tablet_addr_arr.at(i).second;
ObLSTabletService *ls_tablet_svr = nullptr;