b=22658 More tolerant llog processing

Do not fail OST activation when a llog is not found.

i=Johann Lombardi
i=Mike Pershin

diff --git a/lustre/ChangeLog b/lustre/ChangeLog
index 0a03a71..e92cc9e 100644 (file)
--- a/lustre/ChangeLog
+++ b/lustre/ChangeLog
@@ -12,6 +12,11 @@ tbd        Oracle, Inc.
        * The async journal commit feature (bug 19128) and the cancel
          lock before replay feature (bug 16774) are disabled by default.
 
+Severity   : normal
+Bugzilla   : 22658
+Description: Do not fail OST activation when a llog is not found, just
+            issue an error message.
+
 Severity   : enhancement
 Bugzilla   : 15253
 Description: add conf-param -d option to remove permanent settings.

diff --git a/lustre/obdclass/llog_obd.c b/lustre/obdclass/llog_obd.c
index 6625465..6c53668 100644 (file)
--- a/lustre/obdclass/llog_obd.c
+++ b/lustre/obdclass/llog_obd.c
@@ -289,6 +289,10 @@ static int cat_cancel_cb(struct llog_handle *cathandle,
         if (rc) {
                 CERROR("Cannot find handle for log "LPX64"\n",
                        lir->lid_id.lgl_oid);
+                if (rc == -ENOENT) {
+                        index = rec->lrh_index;
+                        goto cat_cleanup;
+                }
                 RETURN(rc);
         }
 
@@ -302,6 +306,7 @@ static int cat_cancel_cb(struct llog_handle *cathandle,
                 index = loghandle->u.phd.phd_cookie.lgc_index;
                 llog_free_handle(loghandle);
 
+cat_cleanup:
                 LASSERT(index);
                 llog_cat_set_first_idx(cathandle, index);
                 rc = llog_cancel_rec(cathandle, index);