From 452d2320d57375dbc010aa24e1c69ae95b76bfbc Mon Sep 17 00:00:00 2001 From: Alex Zhuravlev Date: Mon, 17 Oct 2022 12:31:56 -0700 Subject: [PATCH] LU-14098 obdclass: try to skip corrupted llog records if llog's header or record is found corrupted, then ignore the remaining records and try with the next one. Lustre-change: https://review.whamcloud.com/40754 Lustre-commit: 910eb97c1b43a44a9da2ae14c3b83e28ca6342fc Fixes: 186f083722 ("LU-11924 osp: combine llog cancel operations") Signed-off-by: Alex Zhuravlev Change-Id: If47ec1fc1e2eaf64be7ba08d3aa9c2b93903c0cf Reviewed-by: Andreas Dilger Reviewed-by: Mike Pershin Reviewed-on: https://review.whamcloud.com/c/ex/lustre-release/+/48893 Tested-by: jenkins Tested-by: Maloo --- lustre/obdclass/llog_cat.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/lustre/obdclass/llog_cat.c b/lustre/obdclass/llog_cat.c index feb825e..fef083f 100644 --- a/lustre/obdclass/llog_cat.c +++ b/lustre/obdclass/llog_cat.c @@ -788,8 +788,7 @@ int llog_cat_cancel_records(const struct lu_env *env, } if (failed) CERROR("%s: fail to cancel %d of %d llog-records: rc = %d\n", - cathandle->lgh_ctxt->loc_obd->obd_name, failed, count, - rc); + loghandle2name(cathandle), failed, count, rc); RETURN(rc); } EXPORT_SYMBOL(llog_cat_cancel_records); -- 1.8.3.1