From 053306019171183c2537c53b39b7bb76a1ad3db0 Mon Sep 17 00:00:00 2001 From: godyangfight Date: Fri, 18 Aug 2023 11:17:41 +0000 Subject: [PATCH] Fix migration and transfer some cases. --- .../ob_tablet_start_transfer_mds_helper.cpp | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) 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 05480036ad..c765f621de 100644 --- a/src/storage/tablet/ob_tablet_start_transfer_mds_helper.cpp +++ b/src/storage/tablet/ob_tablet_start_transfer_mds_helper.cpp @@ -716,15 +716,6 @@ int ObTabletStartTransferInHelper::on_register_success_( const int64_t start_ts = ObTimeUtil::current_time(); LOG_INFO("[TRANSFER] start tx start transfer in on_register_success_", K(tx_start_transfer_in_info)); -#ifdef ERRSIM - SERVER_EVENT_ADD("transfer", "tx_start_transfer_in", - "stage", "on_register_success", - "tenant_id", MTL_ID(), - "src_ls_id", tx_start_transfer_in_info.src_ls_id_.id(), - "dest_ls_id", tx_start_transfer_in_info.dest_ls_id_.id(), - "start_scn", tx_start_transfer_in_info.start_scn_); -#endif - if (!tx_start_transfer_in_info.is_valid()) { ret = OB_INVALID_ARGUMENT; LOG_WARN("on register success get invalid argument", K(ret), K(tx_start_transfer_in_info)); @@ -741,6 +732,14 @@ int ObTabletStartTransferInHelper::on_register_success_( } else { LOG_INFO("[TRANSFER] finish tx start transfer in on_register_success_", K(tx_start_transfer_in_info), "cost_ts", ObTimeUtil::current_time() - start_ts); +#ifdef ERRSIM + SERVER_EVENT_ADD("transfer", "tx_start_transfer_in", + "stage", "on_register_success", + "tenant_id", MTL_ID(), + "src_ls_id", tx_start_transfer_in_info.src_ls_id_.id(), + "dest_ls_id", tx_start_transfer_in_info.dest_ls_id_.id(), + "start_scn", tx_start_transfer_in_info.start_scn_); +#endif } return ret; }