From 42f1e479c98a2af7642891087997710244f23189 Mon Sep 17 00:00:00 2001 From: godyangfight Date: Mon, 26 Aug 2024 03:20:05 +0000 Subject: [PATCH] Fix change member list get tablet status using wrong timeout --- src/storage/high_availability/ob_ls_member_list_service.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/storage/high_availability/ob_ls_member_list_service.cpp b/src/storage/high_availability/ob_ls_member_list_service.cpp index 63508e2af..0a76e95ba 100644 --- a/src/storage/high_availability/ob_ls_member_list_service.cpp +++ b/src/storage/high_availability/ob_ls_member_list_service.cpp @@ -179,6 +179,7 @@ int ObLSMemberListService::get_max_tablet_transfer_scn(share::SCN &transfer_scn) ObHALSTabletIDIterator iter(ls_->get_ls_id(), need_initial_state, need_sorted_tablet_id); share::SCN max_transfer_scn = share::SCN::min_scn(); static const int64_t LOCK_TIMEOUT = 100_ms; // 100ms + const int64_t timeout = 0; if (OB_UNLIKELY(!is_inited_)) { ret = OB_NOT_INIT; STORAGE_LOG(WARN, "not inited", K(ret), K_(is_inited)); @@ -206,7 +207,7 @@ int ObLSMemberListService::get_max_tablet_transfer_scn(share::SCN &transfer_scn) } else if (OB_FALSE_IT(key.tablet_id_ = tablet_id)) { } else if (OB_FAIL(t3m->get_tablet(priority, key, tablet_handle))) { STORAGE_LOG(WARN, "failed to get tablet", K(ret), K(key)); - } else if (OB_FAIL(tablet_handle.get_obj()->get_tablet_status(share::SCN::max_scn(), mds_data))) { + } else if (OB_FAIL(tablet_handle.get_obj()->get_tablet_status(share::SCN::max_scn(), mds_data, timeout))) { if (OB_EMPTY_RESULT == ret) { STORAGE_LOG(INFO, "committed tablet_status does not exist", K(ret), K(key)); ret = OB_SUCCESS;