From e80c2780d3a9ed7a8d42a6db619e0ed734226faf Mon Sep 17 00:00:00 2001 From: oceanoverflow Date: Wed, 30 Oct 2024 11:47:35 +0000 Subject: [PATCH] move errsim point to different position --- .../high_availability/ob_storage_ha_reader.cpp | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/src/storage/high_availability/ob_storage_ha_reader.cpp b/src/storage/high_availability/ob_storage_ha_reader.cpp index 2612bd0a8..875764e61 100644 --- a/src/storage/high_availability/ob_storage_ha_reader.cpp +++ b/src/storage/high_availability/ob_storage_ha_reader.cpp @@ -1420,12 +1420,6 @@ int ObCopyTabletInfoRestoreReader::fetch_tablet_info(obrpc::ObCopyTabletInfo &ta const common::ObTabletID &tablet_id = tablet_id_array_.at(tablet_id_index_); tablet_info.tablet_id_ = tablet_id; tablet_info.version_ = 0; // for restore this is invalid -#ifdef ERRSIM - if (!tablet_id.is_ls_inner_tablet() && tablet_id_array_.count() > 10 && 5 == tablet_id_index_) { - ret = OB_E(EventTable::EN_RESTORE_FETCH_TABLET_INFO) OB_SUCCESS; - LOG_WARN("errsim restore fetch tablet info", K(ret), K(tablet_id), K_(tablet_id_index), K(tablet_id_array_.count()), K(tablet_id_array_)); - } -#endif if (OB_FAIL(ret)) { // do nothing } else if (OB_FAIL(restore_base_info_->get_restore_data_dest_id(*GCTX.sql_proxy_, MTL_ID(), dest_id))) { @@ -3859,6 +3853,13 @@ int ObCopyLSViewInfoRestoreReader::get_next_tablet_info( } } +#ifdef ERRSIM + if (OB_SUCC(ret)) { + ret = OB_E(EventTable::EN_RESTORE_FETCH_TABLET_INFO) OB_SUCCESS; + LOG_WARN("errsim restore fetch tablet info", K(ret)); + } +#endif + if (OB_SUCC(ret)) { tablet_info.data_size_ = 0; tablet_info.status_ = ObCopyTabletStatus::TABLET_EXIST;