From: Emoly Liu <emoly.liu@intel.com>
Date: Wed, 5 Dec 2012 06:43:56 +0000 (+0800)
Subject: LU-1749 llog: MDT should work if cancel llog failed (-ESTALE)
X-Git-Tag: 2.1.4-RC1~18
X-Git-Url: https://git.whamcloud.com/?a=commitdiff_plain;h=cc1be0a1c8b6c2d72f28b16c2696bb35254c4996;p=fs%2Flustre-release.git

LU-1749 llog: MDT should work if cancel llog failed (-ESTALE)

Cancel catlog may be stale, in this case MDT should continue to work.

port of b2_3 patch e5d5cd20169b476cdb4fe4857d64aef4bf03d497

Signed-off-by: Lai Siyao <laisiyao@whamcloud.com>
Signed-off-by: Liu Ying <emoly.liu@intel.com>
Change-Id: I85d571a953b2a34d51d586595e271933a016b04f
Reviewed-on: http://review.whamcloud.com/4742
Tested-by: Hudson
Tested-by: Maloo <whamcloud.maloo@gmail.com>
Reviewed-by: wangdi <di.wang@intel.com>
Reviewed-by: Oleg Drokin <green@whamcloud.com>
---

diff --git a/lustre/obdclass/llog_obd.c b/lustre/obdclass/llog_obd.c
index 17c440d..f83a050 100644
--- a/lustre/obdclass/llog_obd.c
+++ b/lustre/obdclass/llog_obd.c
@@ -314,9 +314,9 @@ static int cat_cancel_cb(struct llog_handle *cathandle,
 
         rc = llog_cat_id2handle(cathandle, &loghandle, &lir->lid_id);
         if (rc) {
-                CERROR("Cannot find handle for log "LPX64"\n",
-                       lir->lid_id.lgl_oid);
-                if (rc == -ENOENT) {
+                CERROR("Cannot find handle for log "LPX64": %d\n",
+                       lir->lid_id.lgl_oid, rc);
+                if (rc == -ENOENT || rc == -ESTALE) {
                         index = rec->lrh_index;
                         goto cat_cleanup;
                 }