From c3fc7a64edcb0cb3b6c41e01f48634afe2c077f1 Mon Sep 17 00:00:00 2001 From: hiddenbomb Date: Wed, 11 Oct 2023 02:09:51 +0000 Subject: [PATCH] fix error usage of ret and set tenant id for allocator --- src/storage/ls/ob_ls_tablet_service.cpp | 2 +- src/storage/slog_ckpt/ob_tenant_checkpoint_slog_handler.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/storage/ls/ob_ls_tablet_service.cpp b/src/storage/ls/ob_ls_tablet_service.cpp index c9d41aa94..8ff07cf2c 100755 --- a/src/storage/ls/ob_ls_tablet_service.cpp +++ b/src/storage/ls/ob_ls_tablet_service.cpp @@ -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)); } } diff --git a/src/storage/slog_ckpt/ob_tenant_checkpoint_slog_handler.cpp b/src/storage/slog_ckpt/ob_tenant_checkpoint_slog_handler.cpp index 1088d7fc0..369b03efa 100755 --- a/src/storage/slog_ckpt/ob_tenant_checkpoint_slog_handler.cpp +++ b/src/storage/slog_ckpt/ob_tenant_checkpoint_slog_handler.cpp @@ -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;