diff --git a/src/storage/backup/ob_backup_task.cpp b/src/storage/backup/ob_backup_task.cpp index 769647979..4cbccfc9c 100644 --- a/src/storage/backup/ob_backup_task.cpp +++ b/src/storage/backup/ob_backup_task.cpp @@ -89,7 +89,7 @@ static int get_ls_handle(const uint64_t tenant_id, const share::ObLSID &ls_id, s } else if (OB_ISNULL(ls_service = MTL_WITH_CHECK_TENANT(ObLSService *, tenant_id))) { ret = OB_ERR_UNEXPECTED; LOG_WARN("log stream service is NULL", K(ret)); - } else if (OB_FAIL(ls_service->get_ls(ls_id, ls_handle, ObLSGetMod::STORAGE_MOD))) { + } else if (OB_FAIL(ls_service->get_ls(ls_id, ls_handle, ObLSGetMod::HA_MOD))) { LOG_WARN("failed to get log stream", K(ret), K(ls_id)); } return ret; diff --git a/src/storage/backup/ob_backup_utils.cpp b/src/storage/backup/ob_backup_utils.cpp index f8d02e0f9..217cc7802 100644 --- a/src/storage/backup/ob_backup_utils.cpp +++ b/src/storage/backup/ob_backup_utils.cpp @@ -406,7 +406,7 @@ int ObBackupUtils::check_ls_valid_for_backup(const uint64_t tenant_id, const sha } else if (OB_ISNULL(ls_service = MTL_WITH_CHECK_TENANT(ObLSService *, tenant_id))) { ret = OB_ERR_UNEXPECTED; LOG_WARN("log stream service is NULL", K(ret)); - } else if (OB_FAIL(ls_service->get_ls(ls_id, handle, ObLSGetMod::STORAGE_MOD))) { + } else if (OB_FAIL(ls_service->get_ls(ls_id, handle, ObLSGetMod::HA_MOD))) { LOG_WARN("failed to get log stream", K(ret), K(ls_id)); } else if (OB_ISNULL(ls = handle.get_ls())) { ret = OB_ERR_UNEXPECTED; @@ -2011,7 +2011,7 @@ int ObBackupTabletProvider::inner_get_tablet_handle_without_memtables_(const uin } else if (OB_ISNULL(ls_service = MTL_WITH_CHECK_TENANT(ObLSService *, tenant_id))) { ret = OB_ERR_UNEXPECTED; LOG_WARN("log stream service is NULL", K(ret), K(tenant_id)); - } else if (OB_FAIL(ls_service->get_ls(ls_id, handle, ObLSGetMod::STORAGE_MOD))) { + } else if (OB_FAIL(ls_service->get_ls(ls_id, handle, ObLSGetMod::HA_MOD))) { LOG_WARN("failed to get log stream", K(ret), K(ls_id)); } else if (OB_ISNULL(ls = handle.get_ls())) { ret = OB_ERR_UNEXPECTED; @@ -2071,7 +2071,7 @@ int ObBackupTabletProvider::get_tablet_skipped_type_(const uint64_t tenant_id, c if (OB_ISNULL(ls_service = MTL_WITH_CHECK_TENANT(ObLSService *, tenant_id))) { ret = OB_ERR_UNEXPECTED; LOG_WARN("log stream service is NULL", K(ret), K(tenant_id)); - } else if (OB_FAIL(ls_service->get_ls(ls_id, handle, ObLSGetMod::STORAGE_MOD))) { + } else if (OB_FAIL(ls_service->get_ls(ls_id, handle, ObLSGetMod::HA_MOD))) { LOG_WARN("failed to get log stream", K(ret), K(ls_id)); } else if (OB_ISNULL(ls = handle.get_ls())) { ret = OB_ERR_UNEXPECTED; diff --git a/src/storage/column_store/ob_co_merge_dag.cpp b/src/storage/column_store/ob_co_merge_dag.cpp index f861bcd0e..5f710b52f 100644 --- a/src/storage/column_store/ob_co_merge_dag.cpp +++ b/src/storage/column_store/ob_co_merge_dag.cpp @@ -1536,7 +1536,7 @@ int ObCOMergeDagNet::get_compat_mode() } else if (OB_UNLIKELY(merge_batch_size_ <= 0)) { ret = OB_ERR_UNEXPECTED; LOG_WARN("merge batch size is not valid", K(ret), K(merge_batch_size_)); - } else if (OB_FAIL(MTL(ObLSService *)->get_ls(ls_id_, tmp_ls_handle, ObLSGetMod::STORAGE_MOD))) { + } else if (OB_FAIL(MTL(ObLSService *)->get_ls(ls_id_, tmp_ls_handle, ObLSGetMod::COMPACT_MODE))) { LOG_WARN("failed to get log stream", K(ret), K(ls_id_), K(tablet_id_)); } else if (OB_FAIL(tmp_ls_handle.get_ls()->get_tablet_svr()->get_tablet( tablet_id_, diff --git a/src/storage/compaction/ob_basic_tablet_merge_ctx.cpp b/src/storage/compaction/ob_basic_tablet_merge_ctx.cpp index b0bd4be43..6c35da3e8 100644 --- a/src/storage/compaction/ob_basic_tablet_merge_ctx.cpp +++ b/src/storage/compaction/ob_basic_tablet_merge_ctx.cpp @@ -524,7 +524,7 @@ int ObBasicTabletMergeCtx::get_ls_and_tablet() { int ret = OB_SUCCESS; ObLSHandle &ls_handle = static_param_.ls_handle_; - if (OB_FAIL(MTL(ObLSService *)->get_ls(static_param_.get_ls_id(), ls_handle, ObLSGetMod::STORAGE_MOD))) { + if (OB_FAIL(MTL(ObLSService *)->get_ls(static_param_.get_ls_id(), ls_handle, ObLSGetMod::COMPACT_MODE))) { LOG_WARN("failed to get log stream", K(ret), K(static_param_.get_ls_id())); } else if (ls_handle.get_ls()->is_offline()) { ret = OB_CANCELED; diff --git a/src/storage/compaction/ob_compaction_diagnose.cpp b/src/storage/compaction/ob_compaction_diagnose.cpp index 3f895f10d..666367798 100644 --- a/src/storage/compaction/ob_compaction_diagnose.cpp +++ b/src/storage/compaction/ob_compaction_diagnose.cpp @@ -1016,7 +1016,7 @@ int ObCompactionDiagnoseMgr::check_ls_status( need_merge = ls_check_status.need_merge_; weak_read_ts_ready = ls_check_status.weak_read_ts_ready_; } - if (OB_FAIL(MTL(ObLSService *)->get_ls(ls_id, ls_handle, ObLSGetMod::STORAGE_MOD))) { + if (OB_FAIL(MTL(ObLSService *)->get_ls(ls_id, ls_handle, ObLSGetMod::COMPACT_MODE))) { LOG_WARN("failed to get log stream", K(ret), K(ls_id)); } else if (OB_ISNULL(ls = ls_handle.get_ls())) { ret = OB_ERR_UNEXPECTED; diff --git a/src/storage/compaction/ob_compaction_schedule_iterator.h b/src/storage/compaction/ob_compaction_schedule_iterator.h index 370cfdf5a..02d01b024 100644 --- a/src/storage/compaction/ob_compaction_schedule_iterator.h +++ b/src/storage/compaction/ob_compaction_schedule_iterator.h @@ -35,7 +35,7 @@ class ObCompactionScheduleIterator public: ObCompactionScheduleIterator( const bool is_major, - storage::ObLSGetMod mod = storage::ObLSGetMod::STORAGE_MOD); + storage::ObLSGetMod mod = storage::ObLSGetMod::COMPACT_MODE); ~ObCompactionScheduleIterator() { reset(); } int build_iter(const int64_t schedule_batch_size); int get_next_ls(ObLSHandle &ls_handle); diff --git a/src/storage/compaction/ob_medium_compaction_func.cpp b/src/storage/compaction/ob_medium_compaction_func.cpp index bf4901b41..22c936d66 100644 --- a/src/storage/compaction/ob_medium_compaction_func.cpp +++ b/src/storage/compaction/ob_medium_compaction_func.cpp @@ -1296,7 +1296,7 @@ int ObMediumCompactionScheduleFunc::batch_check_medium_checksum( } else if (OB_SUCCESS == check_ret) { ObLSHandle ls_handle; ObTabletHandle unused_handle; - if (OB_TMP_FAIL((MTL(storage::ObLSService *)->get_ls(ls_id, ls_handle, ObLSGetMod::STORAGE_MOD)))) { + if (OB_TMP_FAIL((MTL(storage::ObLSService *)->get_ls(ls_id, ls_handle, ObLSGetMod::COMPACT_MODE)))) { if (OB_LS_NOT_EXIST == tmp_ret) { LOG_TRACE("ls not exist", K(tmp_ret), K(ls_id)); } else { diff --git a/src/storage/compaction/ob_tablet_merge_task.cpp b/src/storage/compaction/ob_tablet_merge_task.cpp index b7acf337f..563d0024b 100644 --- a/src/storage/compaction/ob_tablet_merge_task.cpp +++ b/src/storage/compaction/ob_tablet_merge_task.cpp @@ -303,7 +303,7 @@ int ObTabletMergeDag::get_tablet_and_compat_mode() // the last compaction dag is not finished yet, tablet is in old version ObLSHandle tmp_ls_handle; ObTabletHandle tmp_tablet_handle; - if (OB_FAIL(MTL(ObLSService *)->get_ls(ls_id_, tmp_ls_handle, ObLSGetMod::STORAGE_MOD))) { + if (OB_FAIL(MTL(ObLSService *)->get_ls(ls_id_, tmp_ls_handle, ObLSGetMod::COMPACT_MODE))) { LOG_WARN("failed to get log stream", K(ret), K(ls_id_)); } else if (OB_FAIL(tmp_ls_handle.get_ls()->get_tablet_svr()->get_tablet( tablet_id_, tmp_tablet_handle, 0/*timeout_us*/, storage::ObMDSGetTabletMode::READ_ALL_COMMITED))) { @@ -1340,7 +1340,7 @@ int ObBatchFreezeTabletsTask::process() ObLSHandle ls_handle; ObLS *ls = nullptr; int64_t weak_read_ts = 0; - if (OB_FAIL(MTL(ObLSService *)->get_ls(param.ls_id_, ls_handle, ObLSGetMod::STORAGE_MOD))) { + if (OB_FAIL(MTL(ObLSService *)->get_ls(param.ls_id_, ls_handle, ObLSGetMod::COMPACT_MODE))) { LOG_WARN("failed to get log stream", K(ret), K(param)); } else if (OB_ISNULL(ls = ls_handle.get_ls())) { ret = OB_ERR_UNEXPECTED; diff --git a/src/storage/compaction/ob_tenant_compaction_progress.cpp b/src/storage/compaction/ob_tenant_compaction_progress.cpp index 3d224dfd7..863c6a7cd 100644 --- a/src/storage/compaction/ob_tenant_compaction_progress.cpp +++ b/src/storage/compaction/ob_tenant_compaction_progress.cpp @@ -160,7 +160,7 @@ int ObTenantCompactionProgressMgr::loop_major_sstable_( common::ObTimeGuard timeguard("loop_major_sstable_to_calc_progress_size", 30 * 1000 * 1000); // 30s ObSharedGuard ls_iter_guard; ObLS *ls = nullptr; - if (OB_FAIL(MTL(ObLSService *)->get_ls_iter(ls_iter_guard, ObLSGetMod::STORAGE_MOD))) { + if (OB_FAIL(MTL(ObLSService *)->get_ls_iter(ls_iter_guard, ObLSGetMod::COMPACT_MODE))) { LOG_WARN("failed to get ls iterator", K(ret)); } else { while (OB_SUCC(ret)) { // loop all log_stream diff --git a/src/storage/compaction/ob_tenant_freeze_info_mgr.cpp b/src/storage/compaction/ob_tenant_freeze_info_mgr.cpp index 54fd9dc0b..fc081cb2d 100644 --- a/src/storage/compaction/ob_tenant_freeze_info_mgr.cpp +++ b/src/storage/compaction/ob_tenant_freeze_info_mgr.cpp @@ -709,7 +709,7 @@ int ObTenantFreezeInfoMgr::try_update_reserved_snapshot() ObSharedGuard ls_iter_guard; ObLS *ls = nullptr; if (OB_FAIL(ret) || reserved_snapshot <= 0) { - } else if (OB_FAIL(MTL(ObLSService *)->get_ls_iter(ls_iter_guard, ObLSGetMod::STORAGE_MOD))) { + } else if (OB_FAIL(MTL(ObLSService *)->get_ls_iter(ls_iter_guard, ObLSGetMod::COMPACT_MODE))) { LOG_WARN("failed to get ls iterator", K(ret)); } else { int tmp_ret = OB_SUCCESS; diff --git a/src/storage/compaction/ob_tenant_tablet_scheduler.cpp b/src/storage/compaction/ob_tenant_tablet_scheduler.cpp index c6c7714f5..5c4beeb82 100644 --- a/src/storage/compaction/ob_tenant_tablet_scheduler.cpp +++ b/src/storage/compaction/ob_tenant_tablet_scheduler.cpp @@ -1571,7 +1571,7 @@ int ObTenantTabletScheduler::get_ls_tablet_medium_list( share::SCN &weak_read_ts) { int ret = OB_SUCCESS; - if (OB_FAIL((MTL(storage::ObLSService *)->get_ls(ls_id, ls_handle, ObLSGetMod::STORAGE_MOD)))) { + if (OB_FAIL((MTL(storage::ObLSService *)->get_ls(ls_id, ls_handle, ObLSGetMod::COMPACT_MODE)))) { if (OB_LS_NOT_EXIST == ret) { LOG_TRACE("ls not exist", K(ret), K(ls_id)); } else { @@ -2207,7 +2207,7 @@ int ObTenantTabletScheduler::try_schedule_tablet_medium_merge( } else if (!could_major_merge_start()) { ret = OB_MAJOR_FREEZE_NOT_ALLOW; LOG_WARN("major compaction is suspended", K(ret), K(ls_id), K(tablet_id)); - } else if (OB_FAIL(MTL(ObLSService *)->get_ls(ls_id, ls_handle, ObLSGetMod::STORAGE_MOD))) { + } else if (OB_FAIL(MTL(ObLSService *)->get_ls(ls_id, ls_handle, ObLSGetMod::COMPACT_MODE))) { LOG_WARN("failed to get ls", K(ret), K(ls_id)); } else if (OB_FAIL(ObTabletMergeChecker::check_ls_state_in_major(*ls_handle.get_ls(), can_merge))) { LOG_WARN("failed to check ls can schedule medium", K(ret), K(ls_handle)); diff --git a/src/storage/ddl/ob_ddl_redo_log_writer.cpp b/src/storage/ddl/ob_ddl_redo_log_writer.cpp index bb8dc3200..42ab70707 100644 --- a/src/storage/ddl/ob_ddl_redo_log_writer.cpp +++ b/src/storage/ddl/ob_ddl_redo_log_writer.cpp @@ -91,7 +91,7 @@ int ObDDLCtrlSpeedItem::refresh() if (OB_ISNULL(log_service) || OB_ISNULL(archive_service)) { ret = OB_ERR_UNEXPECTED; LOG_WARN("error unexpected, nullptr found", K(ret), KP(log_service), KP(archive_service)); - } else if (OB_FAIL(MTL(ObLSService *)->get_ls(ls_id_, ls_handle, ObLSGetMod::STORAGE_MOD))) { + } else if (OB_FAIL(MTL(ObLSService *)->get_ls(ls_id_, ls_handle, ObLSGetMod::DDL_MOD))) { if (OB_LS_NOT_EXIST == ret) { // log stream may be removed during timer refresh task. ret = OB_SUCCESS; @@ -168,7 +168,7 @@ int ObDDLCtrlSpeedItem::check_cur_node_is_leader(bool &is_leader) if (OB_ISNULL(ls_svr)) { ret = OB_ERR_UNEXPECTED; LOG_WARN("ls_svr is nullptr", K(ret)); - } else if (OB_FAIL(ls_svr->get_ls(ls_id_, handle, ObLSGetMod::STORAGE_MOD))) { + } else if (OB_FAIL(ls_svr->get_ls(ls_id_, handle, ObLSGetMod::DDL_MOD))) { LOG_WARN("fail to get ls handle", K(ret), K_(ls_id)); } else if (OB_ISNULL(ls = handle.get_ls())) { ret = OB_ERR_UNEXPECTED; @@ -586,7 +586,7 @@ int ObDDLCtrlSpeedHandle::GetNeedRemoveItemsFn::operator() ( } else { MTL_SWITCH(speed_handle_key.tenant_id_) { ObLSHandle ls_handle; - if (OB_FAIL(MTL(ObLSService *)->get_ls(speed_handle_key.ls_id_, ls_handle, ObLSGetMod::STORAGE_MOD))) { + if (OB_FAIL(MTL(ObLSService *)->get_ls(speed_handle_key.ls_id_, ls_handle, ObLSGetMod::DDL_MOD))) { if (OB_LS_NOT_EXIST == ret) { erase = true; ret = OB_SUCCESS; diff --git a/src/storage/high_availability/ob_finish_transfer.cpp b/src/storage/high_availability/ob_finish_transfer.cpp index b9d766953..63eb48107 100644 --- a/src/storage/high_availability/ob_finish_transfer.cpp +++ b/src/storage/high_availability/ob_finish_transfer.cpp @@ -818,7 +818,7 @@ int ObTxFinishTransfer::get_ls_handle_( } else if (OB_ISNULL(ls_service = MTL_WITH_CHECK_TENANT(ObLSService *, tenant_id))) { ret = OB_ERR_UNEXPECTED; LOG_WARN("log stream service is NULL", K(ret), K(tenant_id)); - } else if (OB_FAIL(ls_service->get_ls(ls_id, ls_handle, ObLSGetMod::STORAGE_MOD))) { + } else if (OB_FAIL(ls_service->get_ls(ls_id, ls_handle, ObLSGetMod::HA_MOD))) { LOG_WARN("failed to get log stream", K(ret), K(tenant_id), K(ls_id)); } return ret; diff --git a/src/storage/high_availability/ob_storage_ha_dag.cpp b/src/storage/high_availability/ob_storage_ha_dag.cpp index e57159137..36481396d 100644 --- a/src/storage/high_availability/ob_storage_ha_dag.cpp +++ b/src/storage/high_availability/ob_storage_ha_dag.cpp @@ -436,7 +436,7 @@ int ObStorageHADagUtils::check_self_is_valid_member( } else if (OB_ISNULL(ls_service = MTL(ObLSService *))) { ret = OB_ERR_UNEXPECTED; LOG_WARN("ls service should not be NULL", K(ret), K(tenant_id), K(ls_id)); - } else if (OB_FAIL(ls_service->get_ls(ls_id, ls_handle, ObLSGetMod::STORAGE_MOD))) { + } else if (OB_FAIL(ls_service->get_ls(ls_id, ls_handle, ObLSGetMod::HA_MOD))) { LOG_WARN("failed to get ls", K(ret), K(ls_id)); } else if (OB_ISNULL(ls = ls_handle.get_ls())) { ret = OB_ERR_UNEXPECTED; diff --git a/src/storage/high_availability/ob_storage_ha_struct.cpp b/src/storage/high_availability/ob_storage_ha_struct.cpp index 21cf94ffe..a33068911 100644 --- a/src/storage/high_availability/ob_storage_ha_struct.cpp +++ b/src/storage/high_availability/ob_storage_ha_struct.cpp @@ -1093,7 +1093,7 @@ int ObMigrationUtils::get_ls_rebuild_seq(const uint64_t tenant_id, } else if (OB_ISNULL(ls_service = MTL_WITH_CHECK_TENANT(ObLSService *, tenant_id))) { ret = OB_ERR_UNEXPECTED; LOG_WARN("log stream service is NULL", K(ret)); - } else if (OB_FAIL(ls_service->get_ls(ls_id, handle, ObLSGetMod::STORAGE_MOD))) { + } else if (OB_FAIL(ls_service->get_ls(ls_id, handle, ObLSGetMod::HA_MOD))) { LOG_WARN("failed to get log stream", K(ret), K(ls_id)); } else if (OB_ISNULL(ls = handle.get_ls())) { ret = OB_ERR_UNEXPECTED; diff --git a/src/storage/high_availability/ob_storage_ha_utils.cpp b/src/storage/high_availability/ob_storage_ha_utils.cpp index e9a3dc6df..987a5aa4e 100644 --- a/src/storage/high_availability/ob_storage_ha_utils.cpp +++ b/src/storage/high_availability/ob_storage_ha_utils.cpp @@ -413,7 +413,7 @@ int ObStorageHAUtils::check_ls_is_leader( } else if (OB_ISNULL(ls_srv = MTL_WITH_CHECK_TENANT(ObLSService *, tenant_id))) { ret = OB_ERR_UNEXPECTED; LOG_WARN("log stream service is NULL", K(ret), K(tenant_id)); - } else if (OB_FAIL(ls_srv->get_ls(ls_id, ls_handle, ObLSGetMod::STORAGE_MOD))) { + } else if (OB_FAIL(ls_srv->get_ls(ls_id, ls_handle, ObLSGetMod::HA_MOD))) { LOG_WARN("failed to get log stream", K(ret), K(tenant_id), K(ls_id)); } else if (OB_ISNULL(ls = ls_handle.get_ls())) { ret = OB_ERR_UNEXPECTED; @@ -545,7 +545,7 @@ int ObTransferUtils::block_tx(const uint64_t tenant_id, const share::ObLSID &ls_ } else if (OB_ISNULL(ls_svr = (MTL(ObLSService *)))) { ret = OB_ERR_UNEXPECTED; LOG_WARN("ls service should not be NULL", K(ret), KP(ls_svr)); - } else if (OB_FAIL(ls_svr->get_ls(ls_id, ls_handle, ObLSGetMod::STORAGE_MOD))) { + } else if (OB_FAIL(ls_svr->get_ls(ls_id, ls_handle, ObLSGetMod::HA_MOD))) { LOG_WARN("ls_srv->get_ls() fail", K(ret), K(ls_id)); } else if (OB_ISNULL(ls = ls_handle.get_ls())) { ret = OB_ERR_UNEXPECTED; @@ -574,7 +574,7 @@ int ObTransferUtils::kill_tx(const uint64_t tenant_id, const share::ObLSID &ls_i } else if (OB_ISNULL(ls_svr = MTL(ObLSService*))) { ret = OB_ERR_UNEXPECTED; LOG_WARN("ls srv should not be NULL", K(ret), KP(ls_svr)); - } else if (OB_FAIL(ls_svr->get_ls(ls_id, ls_handle, ObLSGetMod::STORAGE_MOD))) { + } else if (OB_FAIL(ls_svr->get_ls(ls_id, ls_handle, ObLSGetMod::HA_MOD))) { LOG_WARN("ls_srv->get_ls() fail", K(ret), K(ls_id)); } else if (OB_ISNULL(ls = ls_handle.get_ls())) { ret = OB_ERR_UNEXPECTED; @@ -600,7 +600,7 @@ int ObTransferUtils::unblock_tx(const uint64_t tenant_id, const share::ObLSID &l } else if (OB_ISNULL(ls_srv = MTL(ObLSService*))) { ret = OB_ERR_UNEXPECTED; LOG_WARN("ls srv should not be NULL", K(ret), KP(ls_srv)); - } else if (OB_FAIL(ls_srv->get_ls(ls_id, ls_handle, ObLSGetMod::STORAGE_MOD))) { + } else if (OB_FAIL(ls_srv->get_ls(ls_id, ls_handle, ObLSGetMod::HA_MOD))) { LOG_WARN("ls_srv->get_ls() fail", K(ret), K(ls_id)); } else if (OB_ISNULL(ls = ls_handle.get_ls())) { ret = OB_ERR_UNEXPECTED; diff --git a/src/storage/high_availability/ob_transfer_handler.cpp b/src/storage/high_availability/ob_transfer_handler.cpp index 96f193dad..5588f64d3 100644 --- a/src/storage/high_availability/ob_transfer_handler.cpp +++ b/src/storage/high_availability/ob_transfer_handler.cpp @@ -1105,7 +1105,7 @@ int ObTransferHandler::do_trans_transfer_start_prepare_( LOG_WARN("failed to do transfer dest prepare", K(ret), K(task_info)); } else if (FALSE_IT(addr_info.src_addr_ = dest_ls_leader)) { // submit active tx redo log before block tablet write to optimise system interrupt time - } else if (OB_FAIL(MTL(ObLSService*)->get_ls(task_info.src_ls_id_, src_ls_handle, ObLSGetMod::STORAGE_MOD))) { + } else if (OB_FAIL(MTL(ObLSService*)->get_ls(task_info.src_ls_id_, src_ls_handle, ObLSGetMod::HA_MOD))) { LOG_WARN("failed to get ls", K(ret), K(task_info)); } else if (OB_FAIL(src_ls_handle.get_ls()->get_tx_svr()->traverse_trans_to_submit_redo_log(failed_tx_id))) { LOG_WARN("failed to submit tx log", K(ret), K(task_info)); @@ -1136,7 +1136,7 @@ int ObTransferHandler::wait_tablet_write_end_( if (OB_ISNULL(ls_srv = MTL(ObLSService*))) { ret = OB_ERR_UNEXPECTED; LOG_WARN("ls srv should not be NULL", K(ret), KP(ls_srv)); - } else if (OB_FAIL(ls_srv->get_ls(src_ls_id, ls_handle, ObLSGetMod::STORAGE_MOD))) { + } else if (OB_FAIL(ls_srv->get_ls(src_ls_id, ls_handle, ObLSGetMod::HA_MOD))) { LOG_WARN("ls_srv->get_ls() fail", K(ret), K(src_ls_id)); } else if (OB_ISNULL(ls = ls_handle.get_ls())) { ret = OB_ERR_UNEXPECTED; @@ -1705,7 +1705,7 @@ int ObTransferHandler::get_max_decided_scn_( if (OB_ISNULL(ls_service = MTL(ObLSService *))) { ret = OB_ERR_UNEXPECTED; STORAGE_LOG(WARN, "ls service should not be null", K(ret), KP(ls_service)); - } else if (OB_FAIL(ls_service->get_ls(ls_id, ls_handle, ObLSGetMod::STORAGE_MOD))) { + } else if (OB_FAIL(ls_service->get_ls(ls_id, ls_handle, ObLSGetMod::HA_MOD))) { LOG_WARN("fail to get log stream", KR(ret), K(ls_id)); } else if (OB_ISNULL(ls = ls_handle.get_ls())) { ret = OB_ERR_UNEXPECTED; @@ -2692,7 +2692,7 @@ int ObTransferHandler::do_move_tx_to_dest_ls_(const share::ObTransferTaskInfo &t int64_t tx_count = 0; int64_t buf_len = 0; int64_t collect_count = 0; - if (OB_FAIL(MTL(ObLSService*)->get_ls(task_info.src_ls_id_,src_ls_handle, ObLSGetMod::STORAGE_MOD))) { + if (OB_FAIL(MTL(ObLSService*)->get_ls(task_info.src_ls_id_,src_ls_handle, ObLSGetMod::HA_MOD))) { LOG_WARN("get ls failed", KR(ret), K(task_info)); } else if (OB_FAIL(src_ls_handle.get_ls()->collect_tx_ctx(task_info.dest_ls_id_, data_end_scn, diff --git a/src/storage/high_availability/ob_transfer_lock_utils.cpp b/src/storage/high_availability/ob_transfer_lock_utils.cpp index a30fa1a18..098c1b022 100644 --- a/src/storage/high_availability/ob_transfer_lock_utils.cpp +++ b/src/storage/high_availability/ob_transfer_lock_utils.cpp @@ -45,7 +45,7 @@ static int get_ls_handle(const uint64_t tenant_id, const share::ObLSID &ls_id, s } else if (OB_ISNULL(ls_service = MTL_WITH_CHECK_TENANT(ObLSService *, tenant_id))) { ret = OB_ERR_UNEXPECTED; LOG_WARN("log stream service is NULL", K(ret), K(tenant_id)); - } else if (OB_FAIL(ls_service->get_ls(ls_id, ls_handle, ObLSGetMod::STORAGE_MOD))) { + } else if (OB_FAIL(ls_service->get_ls(ls_id, ls_handle, ObLSGetMod::HA_MOD))) { LOG_WARN("failed to get log stream", K(ret), K(tenant_id), K(ls_id)); } return ret; diff --git a/src/storage/ls/ob_ls_get_mod.h b/src/storage/ls/ob_ls_get_mod.h index c488a6ee8..874e594f5 100644 --- a/src/storage/ls/ob_ls_get_mod.h +++ b/src/storage/ls/ob_ls_get_mod.h @@ -41,7 +41,8 @@ enum class ObLSGetMod : int DATA_MEMTABLE_MOD = 18, MULTI_VERSION_GARBAGE_COLLOECTOR_MOD = 19, MDS_TABLE_MOD = 20, - TOTAL_MAX_MOD = 21, + COMPACT_MODE = 21, + TOTAL_MAX_MOD = 22, }; } diff --git a/src/storage/ls/ob_ls_tx_service.cpp b/src/storage/ls/ob_ls_tx_service.cpp index 30f00737d..a18618fa0 100644 --- a/src/storage/ls/ob_ls_tx_service.cpp +++ b/src/storage/ls/ob_ls_tx_service.cpp @@ -270,7 +270,7 @@ int ObLSTxService::revert_store_ctx(storage::ObStoreCtx &store_ctx) const ObLSHandle ls_handle = store_ctx.mvcc_acc_ctx_.get_tx_table_guards().src_ls_handle_; if (!ls_handle.is_valid()) { TRANS_LOG(ERROR, "src tx guard is valid when src ls handle not valid", K(store_ctx)); - if (OB_TMP_FAIL(MTL(ObLSService*)->get_ls(src_tx_table_guard.get_ls_id(), ls_handle, ObLSGetMod::STORAGE_MOD))) { + if (OB_TMP_FAIL(MTL(ObLSService*)->get_ls(src_tx_table_guard.get_ls_id(), ls_handle, ObLSGetMod::TRANS_MOD))) { TRANS_LOG(ERROR, "get_ls failed", KR(tmp_ret), K(src_tx_table_guard)); } else if (OB_TMP_FAIL(ls_handle.get_ls()->get_tx_svr()->end_request_for_transfer())) { TRANS_LOG(ERROR, "end request for transfer", KR(tmp_ret), K(src_tx_table_guard)); diff --git a/src/storage/tablet/ob_tablet_finish_transfer_mds_helper.cpp b/src/storage/tablet/ob_tablet_finish_transfer_mds_helper.cpp index 5c1a65a4b..de8937a73 100644 --- a/src/storage/tablet/ob_tablet_finish_transfer_mds_helper.cpp +++ b/src/storage/tablet/ob_tablet_finish_transfer_mds_helper.cpp @@ -86,7 +86,7 @@ int ObTabletFinishTransferUtil::can_skip_check_transfer_tablets( if (OB_ISNULL(ls_svr = MTL(ObLSService *))) { ret = OB_ERR_UNEXPECTED; LOG_WARN("ls svr should not be NULL", K(ret), KP(ls_svr)); - } else if (OB_FAIL(ls_svr->get_ls(ls_id, ls_handle, ObLSGetMod::STORAGE_MOD))) { + } else if (OB_FAIL(ls_svr->get_ls(ls_id, ls_handle, ObLSGetMod::MDS_TABLE_MOD))) { LOG_WARN("failed to get ls", K(ret), K(ls_id)); } else if (OB_ISNULL(ls = ls_handle.get_ls())) { ret = OB_ERR_UNEXPECTED; @@ -354,7 +354,7 @@ int ObTabletFinishTransferOutHelper::on_register_success_( if (OB_ISNULL(ls_svr = MTL(ObLSService *))) { ret = OB_ERR_UNEXPECTED; LOG_WARN("ls svr should not be NULL", K(ret), KP(ls_svr)); - } else if (CLICK_FAIL(ls_svr->get_ls(src_ls_id, ls_handle, ObLSGetMod::STORAGE_MOD))) { + } else if (CLICK_FAIL(ls_svr->get_ls(src_ls_id, ls_handle, ObLSGetMod::MDS_TABLE_MOD))) { LOG_WARN("failed to get ls", K(ret), K(src_ls_id), K(tx_finish_transfer_out_info)); } else if (OB_ISNULL(ls = ls_handle.get_ls())) { ret = OB_ERR_UNEXPECTED; @@ -563,7 +563,7 @@ int ObTabletFinishTransferOutHelper::on_replay_success_( if (OB_ISNULL(ls_svr = MTL(ObLSService *))) { ret = OB_ERR_UNEXPECTED; LOG_WARN("ls svr should not be NULL", K(ret), KP(ls_svr)); - } else if (CLICK_FAIL(ls_svr->get_ls(tx_finish_transfer_out_info.src_ls_id_, ls_handle, ObLSGetMod::STORAGE_MOD))) { + } else if (CLICK_FAIL(ls_svr->get_ls(tx_finish_transfer_out_info.src_ls_id_, ls_handle, ObLSGetMod::MDS_TABLE_MOD))) { LOG_WARN("failed to get ls", K(ret), K(tx_finish_transfer_out_info), K(tx_finish_transfer_out_info)); } else if (OB_ISNULL(ls = ls_handle.get_ls())) { ret = OB_ERR_UNEXPECTED; @@ -718,7 +718,7 @@ int ObTabletFinishTransferInReplayExecutor::do_replay_(ObTabletHandle &tablet_ha } else if (OB_ISNULL(ls_svr = MTL(ObLSService *))) { ret = OB_ERR_UNEXPECTED; LOG_WARN("ls svr should not be NULL", K(ret), KP(ls_svr)); - } else if (OB_FAIL(ls_svr->get_ls(dest_ls_id_, ls_handle, ObLSGetMod::STORAGE_MOD))) { + } else if (OB_FAIL(ls_svr->get_ls(dest_ls_id_, ls_handle, ObLSGetMod::MDS_TABLE_MOD))) { LOG_WARN("failed to get ls", K(ret), K(dest_ls_id_), K(tablet_info_)); } else if (OB_ISNULL(ls = ls_handle.get_ls())) { ret = OB_ERR_UNEXPECTED; @@ -850,7 +850,7 @@ int ObTabletFinishTransferInReplayExecutor::try_make_dest_ls_rebuild_() } else if (OB_ISNULL(ls_svr = MTL(ObLSService *))) { ret = OB_ERR_UNEXPECTED; LOG_WARN("ls svr should not be NULL", K(ret), KP(ls_svr)); - } else if (OB_FAIL(ls_svr->get_ls(src_ls_id_, ls_handle, ObLSGetMod::STORAGE_MOD))) { + } else if (OB_FAIL(ls_svr->get_ls(src_ls_id_, ls_handle, ObLSGetMod::MDS_TABLE_MOD))) { LOG_WARN("failed to get ls", K(ret), K(src_ls_id_), K(tablet_info_)); if (OB_LS_NOT_EXIST == ret) { //overwrite ret @@ -989,7 +989,7 @@ int ObTabletFinishTransferInHelper::on_register_success_( if (OB_ISNULL(ls_svr = MTL(ObLSService *))) { ret = OB_ERR_UNEXPECTED; LOG_WARN("ls svr should not be NULL", K(ret), KP(ls_svr)); - } else if (CLICK_FAIL(ls_svr->get_ls(dest_ls_id, ls_handle, ObLSGetMod::STORAGE_MOD))) { + } else if (CLICK_FAIL(ls_svr->get_ls(dest_ls_id, ls_handle, ObLSGetMod::MDS_TABLE_MOD))) { LOG_WARN("failed to get ls", K(ret), K(dest_ls_id), K(tx_finish_transfer_in_info)); } else if (OB_ISNULL(ls = ls_handle.get_ls())) { ret = OB_ERR_UNEXPECTED; @@ -1232,7 +1232,7 @@ int ObTabletFinishTransferInHelper::on_replay_success_( if (OB_ISNULL(ls_svr = MTL(ObLSService *))) { ret = OB_ERR_UNEXPECTED; LOG_WARN("ls svr should not be NULL", K(ret), KP(ls_svr)); - } else if (CLICK_FAIL(ls_svr->get_ls(tx_finish_transfer_in_info.dest_ls_id_, ls_handle, ObLSGetMod::STORAGE_MOD))) { + } else if (CLICK_FAIL(ls_svr->get_ls(tx_finish_transfer_in_info.dest_ls_id_, ls_handle, ObLSGetMod::MDS_TABLE_MOD))) { LOG_WARN("failed to get ls", K(ret), K(tx_finish_transfer_in_info), K(tx_finish_transfer_in_info)); } else if (OB_ISNULL(ls = ls_handle.get_ls())) { ret = OB_ERR_UNEXPECTED; diff --git a/src/storage/tablet/ob_tablet_start_transfer_mds_helper.cpp b/src/storage/tablet/ob_tablet_start_transfer_mds_helper.cpp index 2de082eb0..8ddada5e9 100644 --- a/src/storage/tablet/ob_tablet_start_transfer_mds_helper.cpp +++ b/src/storage/tablet/ob_tablet_start_transfer_mds_helper.cpp @@ -300,7 +300,7 @@ int ObTabletStartTransferOutHelper::on_register_success_( } else if (OB_ISNULL(ls_service = MTL(ObLSService *))) { ret = OB_ERR_UNEXPECTED; LOG_WARN("ls service should not be null", K(ret), KP(ls_service)); - } else if (CLICK_FAIL(ls_service->get_ls(tx_start_transfer_out_info.src_ls_id_, ls_handle, ObLSGetMod::STORAGE_MOD))) { + } else if (CLICK_FAIL(ls_service->get_ls(tx_start_transfer_out_info.src_ls_id_, ls_handle, ObLSGetMod::MDS_TABLE_MOD))) { LOG_WARN("fail to get ls", KR(ret), K(tx_start_transfer_out_info)); } else if (OB_UNLIKELY(nullptr == (ls = ls_handle.get_ls()))) { ret = OB_ERR_UNEXPECTED; @@ -591,7 +591,7 @@ int ObTabletStartTransferOutCommonHelper::try_enable_dest_ls_clog_replay( } else if (OB_ISNULL(ls_srv = MTL(ObLSService*))) { ret = OB_ERR_UNEXPECTED; LOG_ERROR("ls srv should not be NULL", K(ret), KP(ls_srv)); - } else if (CLICK_FAIL(ls_srv->get_ls(dest_ls_id, dest_ls_handle, ObLSGetMod::STORAGE_MOD))) { + } else if (CLICK_FAIL(ls_srv->get_ls(dest_ls_id, dest_ls_handle, ObLSGetMod::MDS_TABLE_MOD))) { if (OB_LS_NOT_EXIST == ret) { LOG_INFO("ls not exist", KR(ret), K(dest_ls_id)); ret = OB_SUCCESS; @@ -749,7 +749,7 @@ int ObTabletStartTransferOutPrepareHelper::on_register( } else if (!tx_start_transfer_out_info.is_valid()) { ret = OB_ERR_UNEXPECTED; LOG_WARN("tx start transfer out info is unexpected", K(ret), K(tx_start_transfer_out_info)); - } else if (CLICK_FAIL(MTL(ObLSService *)->get_ls(tx_start_transfer_out_info.src_ls_id_, ls_handle, ObLSGetMod::STORAGE_MOD))) { + } else if (CLICK_FAIL(MTL(ObLSService *)->get_ls(tx_start_transfer_out_info.src_ls_id_, ls_handle, ObLSGetMod::MDS_TABLE_MOD))) { LOG_WARN("fail to get ls", KR(ret), K(tx_start_transfer_out_info)); } else if (OB_UNLIKELY(nullptr == (ls = ls_handle.get_ls()))) { ret = OB_ERR_UNEXPECTED; @@ -820,7 +820,7 @@ int ObTabletStartTransferOutV2Helper::on_register( } else if (!info.is_valid() || !info.data_end_scn_.is_valid()) { ret = OB_ERR_UNEXPECTED; LOG_WARN("tx start transfer out tx info is unexpected", KR(ret), K(info)); - } else if (OB_FAIL(MTL(ObLSService*)->get_ls(info.src_ls_id_, ls_handle, ObLSGetMod::STORAGE_MOD))) { + } else if (OB_FAIL(MTL(ObLSService*)->get_ls(info.src_ls_id_, ls_handle, ObLSGetMod::MDS_TABLE_MOD))) { LOG_WARN("fail to get ls", KR(ret), K(info)); } else if (OB_UNLIKELY(nullptr == (ls = ls_handle.get_ls()))) { ret = OB_ERR_UNEXPECTED; @@ -893,7 +893,7 @@ int ObTabletStartTransferOutV2Helper::on_replay(const char *buf, } else if (!info.is_valid() || !info.data_end_scn_.is_valid()) { ret = OB_ERR_UNEXPECTED; LOG_WARN("tx start transfer out tx info is unexpected", KR(ret), K(info)); - } else if (OB_FAIL(MTL(ObLSService*)->get_ls(info.src_ls_id_, ls_handle, ObLSGetMod::STORAGE_MOD))) { + } else if (OB_FAIL(MTL(ObLSService*)->get_ls(info.src_ls_id_, ls_handle, ObLSGetMod::MDS_TABLE_MOD))) { LOG_WARN("fail to get ls", KR(ret), K(info)); } else if (OB_UNLIKELY(nullptr == (ls = ls_handle.get_ls()))) { ret = OB_ERR_UNEXPECTED; @@ -1128,7 +1128,7 @@ int ObTabletStartTransferInHelper::check_transfer_dest_tablets_( } else if (OB_ISNULL(ls_service = MTL(ObLSService *))) { ret = OB_ERR_UNEXPECTED; LOG_WARN("ls service should not be null", K(ret), KP(ls_service)); - } else if (CLICK_FAIL(ls_service->get_ls(tx_start_transfer_in_info.dest_ls_id_, ls_handle, ObLSGetMod::STORAGE_MOD))) { + } else if (CLICK_FAIL(ls_service->get_ls(tx_start_transfer_in_info.dest_ls_id_, ls_handle, ObLSGetMod::MDS_TABLE_MOD))) { LOG_WARN("fail to get ls", KR(ret), K(tx_start_transfer_in_info)); } else if (OB_UNLIKELY(nullptr == (ls = ls_handle.get_ls()))) { ret = OB_ERR_UNEXPECTED; @@ -1239,7 +1239,7 @@ int ObTabletStartTransferInHelper::check_can_skip_replay_( } else if (OB_ISNULL(ls_service = MTL(ObLSService *))) { ret = OB_ERR_UNEXPECTED; LOG_WARN("ls service should not be null", K(ret), KP(ls_service)); - } else if (OB_FAIL(ls_service->get_ls(tx_start_transfer_in_info.dest_ls_id_, ls_handle, ObLSGetMod::STORAGE_MOD))) { + } else if (OB_FAIL(ls_service->get_ls(tx_start_transfer_in_info.dest_ls_id_, ls_handle, ObLSGetMod::MDS_TABLE_MOD))) { LOG_WARN("fail to get ls", KR(ret), K(tx_start_transfer_in_info)); } else if (OB_UNLIKELY(nullptr == (ls = ls_handle.get_ls()))) { ret = OB_ERR_UNEXPECTED; @@ -1293,7 +1293,7 @@ int ObTabletStartTransferInHelper::check_transfer_src_tablets_( } else if (OB_ISNULL(ls_srv = MTL(ObLSService*))) { ret = OB_ERR_UNEXPECTED; LOG_ERROR("ls srv should not be NULL", K(ret), KP(ls_srv)); - } else if (CLICK_FAIL(ls_srv->get_ls(tx_start_transfer_in_info.src_ls_id_, src_ls_handle, ObLSGetMod::STORAGE_MOD))) { + } else if (CLICK_FAIL(ls_srv->get_ls(tx_start_transfer_in_info.src_ls_id_, src_ls_handle, ObLSGetMod::MDS_TABLE_MOD))) { LOG_WARN("ls_srv->get_ls() fail", KR(ret), "src ls id", tx_start_transfer_in_info.src_ls_id_); if (OB_LS_NOT_EXIST == ret) { if (OB_SUCCESS != (tmp_ret = set_dest_ls_rebuild_(tx_start_transfer_in_info.dest_ls_id_, scn, for_replay))) { @@ -1411,7 +1411,7 @@ int ObTabletStartTransferInHelper::create_transfer_in_tablets_( } else if (OB_ISNULL(ls_srv = MTL(ObLSService*))) { ret = OB_ERR_UNEXPECTED; LOG_ERROR("ls srv should not be NULL", K(ret), KP(ls_srv)); - } else if (CLICK_FAIL(ls_srv->get_ls(tx_start_transfer_in_info.dest_ls_id_, dest_ls_handle, ObLSGetMod::STORAGE_MOD))) { + } else if (CLICK_FAIL(ls_srv->get_ls(tx_start_transfer_in_info.dest_ls_id_, dest_ls_handle, ObLSGetMod::MDS_TABLE_MOD))) { LOG_ERROR("ls_srv->get_ls() fail", KR(ret)); } else if (OB_ISNULL(dest_ls = dest_ls_handle.get_ls())) { ret = OB_ERR_UNEXPECTED; @@ -1836,7 +1836,7 @@ int ObTabletStartTransferInHelper::check_transfer_dest_ls_status_( } else if (OB_ISNULL(ls_service = MTL(ObLSService *))) { ret = OB_ERR_UNEXPECTED; LOG_WARN("ls service should not be null", K(ret), KP(ls_service)); - } else if (OB_FAIL(ls_service->get_ls(ls_id, ls_handle, ObLSGetMod::STORAGE_MOD))) { + } else if (OB_FAIL(ls_service->get_ls(ls_id, ls_handle, ObLSGetMod::MDS_TABLE_MOD))) { LOG_WARN("fail to get ls", KR(ret), K(ls_id)); } else if (OB_UNLIKELY(nullptr == (ls = ls_handle.get_ls()))) { ret = OB_ERR_UNEXPECTED; @@ -1871,7 +1871,7 @@ int ObTabletStartTransferInHelper::check_transfer_dest_ls_restore_status_( } else if (OB_ISNULL(ls_service = MTL(ObLSService *))) { ret = OB_ERR_UNEXPECTED; LOG_WARN("ls service should not be null", K(ret), KP(ls_service)); - } else if (OB_FAIL(ls_service->get_ls(ls_id, ls_handle, ObLSGetMod::STORAGE_MOD))) { + } else if (OB_FAIL(ls_service->get_ls(ls_id, ls_handle, ObLSGetMod::MDS_TABLE_MOD))) { LOG_WARN("fail to get ls", KR(ret), K(ls_id)); } else if (OB_UNLIKELY(nullptr == (ls = ls_handle.get_ls()))) { ret = OB_ERR_UNEXPECTED; diff --git a/src/storage/tablet/ob_tablet_transfer_tx_ctx.cpp b/src/storage/tablet/ob_tablet_transfer_tx_ctx.cpp index 49b6993da..f73d2639a 100644 --- a/src/storage/tablet/ob_tablet_transfer_tx_ctx.cpp +++ b/src/storage/tablet/ob_tablet_transfer_tx_ctx.cpp @@ -161,7 +161,7 @@ void ObTransferOutTxCtx::on_redo(const share::SCN &redo_scn) if (!is_valid()) { ret = OB_ERR_UNEXPECTED; LOG_WARN("transfer out tx ctx invalid state", KR(ret), K(tx_id), KP(this), KPC(this)); - } else if (OB_FAIL(MTL(ObLSService*)->get_ls(src_ls_id_, ls_handle, ObLSGetMod::STORAGE_MOD))) { + } else if (OB_FAIL(MTL(ObLSService*)->get_ls(src_ls_id_, ls_handle, ObLSGetMod::TABLET_MOD))) { LOG_WARN("failed to get ls", KR(ret), K(tx_id), KP(this)); } else if (OB_UNLIKELY(nullptr == (ls = ls_handle.get_ls()))) { ret = OB_ERR_UNEXPECTED; @@ -207,7 +207,7 @@ void ObTransferOutTxCtx::on_commit(const share::SCN &commit_version, const share if (!is_valid()) { ret = OB_ERR_UNEXPECTED; LOG_WARN("transfer out tx ctx invalid state", KR(ret), K(tx_id), KP(this), KPC(this)); - } else if (OB_FAIL(MTL(ObLSService*)->get_ls(src_ls_id_, ls_handle, ObLSGetMod::STORAGE_MOD))) { + } else if (OB_FAIL(MTL(ObLSService*)->get_ls(src_ls_id_, ls_handle, ObLSGetMod::TABLET_MOD))) { LOG_WARN("fail to get ls", KR(ret), K(writer_), KP(this)); } else if (OB_UNLIKELY(nullptr == (ls = ls_handle.get_ls()))) { ret = OB_ERR_UNEXPECTED; @@ -259,7 +259,7 @@ void ObTransferOutTxCtx::on_abort(const share::SCN &abort_scn) if (!src_ls_id_.is_valid()) { ret = OB_ERR_UNEXPECTED; LOG_WARN("transfer out tx ctx invalid state", KR(ret), K(tx_id), KPC(this)); - } else if (OB_FAIL(MTL(ObLSService*)->get_ls(src_ls_id_, ls_handle, ObLSGetMod::STORAGE_MOD))) { + } else if (OB_FAIL(MTL(ObLSService*)->get_ls(src_ls_id_, ls_handle, ObLSGetMod::TABLET_MOD))) { LOG_WARN("fail to get ls", KR(ret), K(tx_id), KP(this)); } else if (OB_UNLIKELY(nullptr == (ls = ls_handle.get_ls()))) { ret = OB_ERR_UNEXPECTED; @@ -304,7 +304,7 @@ int ObStartTransferMoveTxHelper::on_register(const char* buf, const int64_t len, } else if (!collect_tx_info.is_valid()) { ret = OB_INVALID_ARGUMENT; LOG_WARN("on register collect_tx_info is valid", KR(ret), K(collect_tx_info)); - } else if (OB_FAIL(MTL(ObLSService*)->get_ls(collect_tx_info.dest_ls_id_, ls_handle, ObLSGetMod::STORAGE_MOD))) { + } else if (OB_FAIL(MTL(ObLSService*)->get_ls(collect_tx_info.dest_ls_id_, ls_handle, ObLSGetMod::TABLET_MOD))) { LOG_WARN("get ls failed", KR(ret), K(transfer_move_tx_ctx)); } else if (OB_UNLIKELY(nullptr == (ls = ls_handle.get_ls()))) { ret = OB_ERR_UNEXPECTED; @@ -401,7 +401,7 @@ int ObStartTransferMoveTxHelper::on_replay(const char* buf, const int64_t len, c } else if (!transfer_move_tx_ctx.get_collect_tx_info().is_valid()) { ret = OB_INVALID_ARGUMENT; LOG_WARN("collect_tx_info is valid", KR(ret)); - } else if (OB_FAIL(MTL(ObLSService*)->get_ls(collect_tx_info.dest_ls_id_, ls_handle, ObLSGetMod::STORAGE_MOD))) { + } else if (OB_FAIL(MTL(ObLSService*)->get_ls(collect_tx_info.dest_ls_id_, ls_handle, ObLSGetMod::TABLET_MOD))) { LOG_WARN("get ls failed", KR(ret), K(collect_tx_info)); } else if (OB_UNLIKELY(nullptr == (ls = ls_handle.get_ls()))) { ret = OB_ERR_UNEXPECTED; @@ -469,7 +469,7 @@ void ObTransferMoveTxCtx::on_redo(const share::SCN &redo_scn) ret = OB_ERR_UNEXPECTED; LOG_WARN("TRANSFER collect_tx_info is invalid", KR(ret), K(collect_tx_info), K(op_scn_), K(writer_), KP(this)); } else if ((!op_scn_.is_valid() || op_scn_ < redo_scn) && FALSE_IT(op_scn_ = redo_scn)) { - } else if (OB_FAIL(MTL(ObLSService*)->get_ls(collect_tx_info.dest_ls_id_, ls_handle, ObLSGetMod::STORAGE_MOD))) { + } else if (OB_FAIL(MTL(ObLSService*)->get_ls(collect_tx_info.dest_ls_id_, ls_handle, ObLSGetMod::TABLET_MOD))) { LOG_WARN("get ls failed", KR(ret), K(writer_), K(collect_tx_info), KP(this)); } else if (OB_UNLIKELY(nullptr == (ls = ls_handle.get_ls()))) { ret = OB_ERR_UNEXPECTED; @@ -514,7 +514,7 @@ void ObTransferMoveTxCtx::on_commit(const share::SCN &commit_version, const shar if (!collect_tx_info.is_valid() || !op_scn_.is_valid()) { ret = OB_ERR_UNEXPECTED; LOG_WARN("TRANSFER collect_tx_info is invalid", KR(ret), K(collect_tx_info), K(op_scn_)); - } else if (OB_FAIL(MTL(ObLSService*)->get_ls(collect_tx_info.dest_ls_id_, ls_handle, ObLSGetMod::STORAGE_MOD))) { + } else if (OB_FAIL(MTL(ObLSService*)->get_ls(collect_tx_info.dest_ls_id_, ls_handle, ObLSGetMod::TABLET_MOD))) { LOG_WARN("get ls failed", KR(ret), K(collect_tx_info)); } else if (OB_UNLIKELY(nullptr == (ls = ls_handle.get_ls()))) { ret = OB_ERR_UNEXPECTED; @@ -559,7 +559,7 @@ void ObTransferMoveTxCtx::on_abort(const share::SCN &abort_scn) if (!collect_tx_info.is_valid()) { ret = OB_ERR_UNEXPECTED; LOG_WARN("TRANSFER collect_tx_info is invalid", KR(ret), K(collect_tx_info), K(op_scn_), K(abort_scn)); - } else if (OB_FAIL(MTL(ObLSService*)->get_ls(collect_tx_info.dest_ls_id_, ls_handle, ObLSGetMod::STORAGE_MOD))) { + } else if (OB_FAIL(MTL(ObLSService*)->get_ls(collect_tx_info.dest_ls_id_, ls_handle, ObLSGetMod::TABLET_MOD))) { LOG_WARN("get ls failed", KR(ret), K(collect_tx_info)); } else if (OB_UNLIKELY(nullptr == (ls = ls_handle.get_ls()))) { ret = OB_ERR_UNEXPECTED; @@ -611,7 +611,7 @@ int ObStartTransferDestPrepareHelper::on_register( } else if (!info.is_valid()) { ret = OB_INVALID_ARGUMENT; LOG_WARN("transfer_dest_prepare invalid param", KR(ret), K(info)); - } else if (OB_FAIL(MTL(ObLSService*)->get_ls(info.dest_ls_id_, ls_handle, ObLSGetMod::STORAGE_MOD))) { + } else if (OB_FAIL(MTL(ObLSService*)->get_ls(info.dest_ls_id_, ls_handle, ObLSGetMod::TABLET_MOD))) { LOG_WARN("get ls failed", KR(ret), K(info)); } else if (OB_UNLIKELY(nullptr == (ls = ls_handle.get_ls()))) { ret = OB_ERR_UNEXPECTED; @@ -642,7 +642,7 @@ int ObStartTransferDestPrepareHelper::on_replay( } else if (!info.is_valid()) { ret = OB_INVALID_ARGUMENT; LOG_WARN("transfer_dest_prepare invalid param", KR(ret), K(info)); - } else if (OB_FAIL(MTL(ObLSService*)->get_ls(info.dest_ls_id_, ls_handle, ObLSGetMod::STORAGE_MOD))) { + } else if (OB_FAIL(MTL(ObLSService*)->get_ls(info.dest_ls_id_, ls_handle, ObLSGetMod::TABLET_MOD))) { LOG_WARN("get ls failed", KR(ret), K(info)); } else if (OB_FAIL(ls_handle.get_ls()->get_transfer_status().update_status(tx_id, info.task_id_, scn, NotifyType::ON_REDO, ObTxDataSourceType::TRANSFER_DEST_PREPARE))) { @@ -697,7 +697,7 @@ void ObTransferDestPrepareTxCtx::on_redo(const share::SCN &redo_scn) if (!info.is_valid()) { ret = OB_ERR_UNEXPECTED; LOG_WARN("transfer dest prepare info is invalid", KR(ret), K(tx_id), KP(this), KPC(this)); - } else if (OB_FAIL(MTL(ObLSService*)->get_ls(info.dest_ls_id_, ls_handle, ObLSGetMod::STORAGE_MOD))) { + } else if (OB_FAIL(MTL(ObLSService*)->get_ls(info.dest_ls_id_, ls_handle, ObLSGetMod::TABLET_MOD))) { LOG_WARN("get ls failed", KR(ret), K(tx_id), K(transfer_dest_prepare_info_)); } else if ((!op_scn_.is_valid() || op_scn_ < redo_scn) && FALSE_IT(op_scn_ = redo_scn)) { } else if (OB_FAIL(ls_handle.get_ls()->get_transfer_status().update_status(tx_id, info.task_id_, redo_scn, @@ -727,7 +727,7 @@ void ObTransferDestPrepareTxCtx::on_commit(const share::SCN &commit_version, con if (!info.is_valid()) { ret = OB_ERR_UNEXPECTED; LOG_WARN("transfer dest prepare info is invalid", KR(ret), K(tx_id), KP(this), KPC(this)); - } else if (OB_FAIL(MTL(ObLSService*)->get_ls(info.dest_ls_id_, ls_handle, ObLSGetMod::STORAGE_MOD))) { + } else if (OB_FAIL(MTL(ObLSService*)->get_ls(info.dest_ls_id_, ls_handle, ObLSGetMod::TABLET_MOD))) { LOG_WARN("get ls failed", KR(ret), K(tx_id), K(transfer_dest_prepare_info_)); } else if (OB_FAIL(ls_handle.get_ls()->get_transfer_status().update_status(tx_id, info.task_id_, commit_scn, NotifyType::ON_COMMIT, ObTxDataSourceType::TRANSFER_DEST_PREPARE))) { @@ -755,7 +755,7 @@ void ObTransferDestPrepareTxCtx::on_abort(const share::SCN &abort_scn) if (!info.is_valid()) { ret = OB_ERR_UNEXPECTED; LOG_WARN("transfer dest prepare info is invalid", KR(ret), K(tx_id), KP(this), KPC(this)); - } else if (OB_FAIL(MTL(ObLSService*)->get_ls(transfer_dest_prepare_info_.dest_ls_id_, ls_handle, ObLSGetMod::STORAGE_MOD))) { + } else if (OB_FAIL(MTL(ObLSService*)->get_ls(transfer_dest_prepare_info_.dest_ls_id_, ls_handle, ObLSGetMod::TABLET_MOD))) { LOG_WARN("get ls failed", KR(ret), K(transfer_dest_prepare_info_), K(tx_id)); } else if (OB_FAIL(ls_handle.get_ls()->get_transfer_status().update_status(tx_id, info.task_id_, abort_scn, NotifyType::ON_ABORT, ObTxDataSourceType::TRANSFER_DEST_PREPARE))) { diff --git a/src/storage/tx/ob_trans_ctx_mgr_v4.cpp b/src/storage/tx/ob_trans_ctx_mgr_v4.cpp index 0375aa943..8695ead46 100644 --- a/src/storage/tx/ob_trans_ctx_mgr_v4.cpp +++ b/src/storage/tx/ob_trans_ctx_mgr_v4.cpp @@ -2682,7 +2682,7 @@ int ObLSTxCtxMgr::move_tx_op(const ObTransferMoveTxParam &move_tx_param, //only check wrs for register and redo phase if (move_tx_param.op_type_ != NotifyType::REGISTER_SUCC && move_tx_param.op_type_ != NotifyType::ON_REDO) { need_check_wrs = false; - } else if (OB_FAIL(MTL(ObLSService*)->get_ls(ls_id_, ls_handle, ObLSGetMod::STORAGE_MOD))) { + } else if (OB_FAIL(MTL(ObLSService*)->get_ls(ls_id_, ls_handle, ObLSGetMod::TRANS_MOD))) { TRANS_LOG(WARN, "get_ls failed", KR(ret), K(ls_id_)); } else { weak_read_ts = ls_handle.get_ls()->get_ls_wrs_handler()->get_ls_weak_read_ts(); diff --git a/src/storage/tx/ob_trans_part_ctx.cpp b/src/storage/tx/ob_trans_part_ctx.cpp index e3bfa7093..655bee340 100644 --- a/src/storage/tx/ob_trans_part_ctx.cpp +++ b/src/storage/tx/ob_trans_part_ctx.cpp @@ -10421,7 +10421,7 @@ int ObPartTransCtx::recover_ls_transfer_status_() ObLSHandle ls_handle; share::SCN op_scn; bool need_recover = false; - if (OB_FAIL(MTL(ObLSService*)->get_ls(ls_id_, ls_handle, ObLSGetMod::STORAGE_MOD))) { + if (OB_FAIL(MTL(ObLSService*)->get_ls(ls_id_, ls_handle, ObLSGetMod::TRANS_MOD))) { LOG_WARN("get ls failed", KR(ret), K(ls_id_)); } else { // recover mds type transfer_dest_prepare and move_tx_ctx diff --git a/src/storage/tx_storage/ob_empty_shell_task.cpp b/src/storage/tx_storage/ob_empty_shell_task.cpp index a3971c281..72ccfa02e 100644 --- a/src/storage/tx_storage/ob_empty_shell_task.cpp +++ b/src/storage/tx_storage/ob_empty_shell_task.cpp @@ -309,7 +309,7 @@ int ObTabletEmptyShellHandler::check_transfer_out_deleted_tablet_( } else if (OB_ISNULL(ls_service = MTL(ObLSService *))) { ret = OB_ERR_UNEXPECTED; STORAGE_LOG(WARN, "ls service should not be null", K(ret), KP(ls_service)); - } else if (OB_FAIL(ls_service->get_ls(user_data.transfer_ls_id_, ls_handle, ObLSGetMod::STORAGE_MOD))) { + } else if (OB_FAIL(ls_service->get_ls(user_data.transfer_ls_id_, ls_handle, ObLSGetMod::TABLET_MOD))) { if (OB_LS_NOT_EXIST == ret) { can = true; STORAGE_LOG(INFO, "transfer dest ls not exist, src tablet can become empty shell", K(ret), "ls_id", ls_->get_ls_id(), K(user_data)); diff --git a/src/storage/tx_table/ob_tx_data_memtable_mgr.cpp b/src/storage/tx_table/ob_tx_data_memtable_mgr.cpp index 7030e7d1d..f325233a2 100644 --- a/src/storage/tx_table/ob_tx_data_memtable_mgr.cpp +++ b/src/storage/tx_table/ob_tx_data_memtable_mgr.cpp @@ -75,7 +75,7 @@ int ObTxDataMemtableMgr::init(const common::ObTabletID &tablet_id, } else if (OB_UNLIKELY(!tablet_id.is_valid()) || OB_ISNULL(freezer) || OB_ISNULL(t3m)) { ret = OB_INVALID_ARGUMENT; STORAGE_LOG(WARN, "invalid arguments", K(ret), K(tablet_id), KP(freezer), KP(t3m)); - } else if (OB_FAIL(MTL(ObLSService*)->get_ls(ls_id, ls_handle, ObLSGetMod::STORAGE_MOD))){ + } else if (OB_FAIL(MTL(ObLSService*)->get_ls(ls_id, ls_handle, ObLSGetMod::TRANS_MOD))){ STORAGE_LOG(WARN, "Get ls from ls service failed.", KR(ret)); } else if (OB_ISNULL(tx_table = ls_handle.get_ls()->get_tx_table())) { ret = OB_ERR_UNEXPECTED;