fix extra medium info fuse bug

This commit is contained in:
yangqise7en
2023-10-12 10:40:08 +00:00
committed by ob-robot
parent 9f814a2db7
commit ba235676b3
6 changed files with 17 additions and 21 deletions

View File

@ -4791,12 +4791,9 @@ int ObTablet::check_medium_list() const
const ObTabletDumpedMediumInfo *dumped_list = nullptr;
if (OB_FAIL(ObTabletMdsData::load_medium_info_list(arena_allocator, mds_data_.medium_info_list_, dumped_list))) {
LOG_WARN("failed to load medium info list", K(ret), K(ls_id), K(tablet_id), K(mds_data_));
} else if (nullptr == dumped_list) {
// do nothing
LOG_INFO("skip check medium list for empty dumped medium info list", KR(ret), K(ls_id), K(tablet_id));
} else if (OB_FAIL(ObMediumListChecker::validate_medium_info_list(
mds_data_.extra_medium_info_,
dumped_list->medium_info_list_,
nullptr == dumped_list ? nullptr : &dumped_list->medium_info_list_,
last_major->get_snapshot_version()))) {
LOG_WARN("fail to validate medium info list", K(ret), K(ls_id), K(tablet_id), K(mds_data_), KPC(dumped_list), KPC(last_major));
}
@ -5750,7 +5747,7 @@ int ObTablet::validate_medium_info_list(
} else if (OB_ISNULL(medium_info_list)) {
ret = OB_ERR_UNEXPECTED;
LOG_WARN("medium info list is null", K(ret), K(ls_id), K(tablet_id), K(finish_medium_scn), KP(medium_info_list));
} else if (OB_FAIL(ObMediumListChecker::validate_medium_info_list(extra_info, medium_info_list->medium_info_list_, finish_medium_scn))) {
} else if (OB_FAIL(ObMediumListChecker::validate_medium_info_list(extra_info, &medium_info_list->medium_info_list_, finish_medium_scn))) {
LOG_WARN("failed to validate medium info list", KR(ret), K(ls_id), K(tablet_id), K(mds_data), K(finish_medium_scn));
}
return ret;