From 7e253000b0feb3fd7580d7f8991ee377973b862f Mon Sep 17 00:00:00 2001 From: Lai Siyao Date: Wed, 3 Oct 2012 12:11:05 +0800 Subject: [PATCH] LU-1749 llog: MDT should work if cancel llog failed with -ESTALE Cancel catlog may be stale, in this case MDT should continue to work. Signed-off-by: Lai Siyao Change-Id: Ib8cad1e2c935e73da0805875e3163f1a59edaeb5 Reviewed-on: http://review.whamcloud.com/3708 Tested-by: Hudson Tested-by: Maloo Reviewed-by: Alex Zhuravlev Reviewed-by: Oleg Drokin --- lustre/obdclass/llog_cat.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lustre/obdclass/llog_cat.c b/lustre/obdclass/llog_cat.c index 3af0c8d..cc065c1 100644 --- a/lustre/obdclass/llog_cat.c +++ b/lustre/obdclass/llog_cat.c @@ -830,10 +830,10 @@ int cat_cancel_cb(const struct lu_env *env, struct llog_handle *cathandle, rc = llog_cat_id2handle(env, cathandle, &loghandle, &lir->lid_id); if (rc) { - CERROR("%s: cannot find handle for llog "LPX64"\n", + CERROR("%s: cannot find handle for llog "LPX64"\n: %d", loghandle->lgh_ctxt->loc_obd->obd_name, - lir->lid_id.lgl_oid); - if (rc == -ENOENT) { + lir->lid_id.lgl_oid, rc); + if (rc == -ENOENT || rc == -ESTALE) { index = rec->lrh_index; goto cat_cleanup; } -- 1.8.3.1