LU-15886 lfsck: remove unreasonable assertions

Remove unreasonable assertions in LFSCK code:
* lfsck->li_obj_dir and lfsck->li_lmv may be NULL if object wan't
  initialized successfully.
* orphan objects under ldiskfs /lost+found may not exist.
* object may not be directory in lfsck_verify_lpf()->
  lfsck_verify_linkea().
* for corner case
  (leh->leh_reccount == 0 && leh->leh_overflow_time != 0),
  LASSERT(ldata->ld_leh->leh_reccount > 0) will be triggerred in
  lfsck_namespace_linkea_clear_overflow(), remove this assertion,
  and this corner case can be handled correctly in current lfsck
  code.

Signed-off-by: Lai Siyao <lai.siyao@whamcloud.com>
Change-Id: If114c7882a2c083e83fcfac5981eddfa526d1426
Reviewed-on: https://review.whamcloud.com/47447
Reviewed-by: Andreas Dilger <adilger@whamcloud.com>
Tested-by: jenkins <devops@whamcloud.com>
Tested-by: Maloo <maloo@whamcloud.com>
Reviewed-by: Hongchao Zhang <hongchao@whamcloud.com>
Reviewed-by: Oleg Drokin <green@whamcloud.com>

diff --git a/lustre/lfsck/lfsck_lib.c b/lustre/lfsck/lfsck_lib.c
index fdfab4a..7e36a18 100644 (file)
--- a/lustre/lfsck/lfsck_lib.c
+++ b/lustre/lfsck/lfsck_lib.c
@@ -1664,9 +1664,6 @@ void lfsck_instance_cleanup(const struct lu_env *env,
                lfsck->li_obj_oit = NULL;
        }
 
-       LASSERT(lfsck->li_obj_dir == NULL);
-       LASSERT(lfsck->li_lmv == NULL);
-
        list_for_each_entry_safe(llu, llu_next, &lfsck->li_list_lmv, llu_link) {
                llmv = &llu->llu_lmv;
 

diff --git a/lustre/lfsck/lfsck_namespace.c b/lustre/lfsck/lfsck_namespace.c
index 23c300a..df57d18 100644 (file)
--- a/lustre/lfsck/lfsck_namespace.c
+++ b/lustre/lfsck/lfsck_namespace.c
@@ -3494,10 +3494,6 @@ static int lfsck_namespace_linkea_clear_overflow(const struct lu_env *env,
        if (lfsck->li_bookmark_ram.lb_param & LPF_DRYRUN)
                GOTO(unlock, rc = 1);
 
-       /* If all known entries are in the linkEA, then the 'leh_reccount'
-        * should NOT be zero. */
-       LASSERT(ldata->ld_leh->leh_reccount > 0);
-
        lfsck_buf_init(&linkea_buf, ldata->ld_buf->lb_buf,
                       ldata->ld_leh->leh_len);
        rc = dt_xattr_set(env, obj, &linkea_buf, XATTR_NAME_LINK, 0, th);
@@ -6130,13 +6126,19 @@ static int lfsck_namespace_scan_local_lpf_one(const struct lu_env *env,
        int                              rc     = 0;
        __u8                             flags  = 0;
        bool                             exist  = false;
+
        ENTRY;
 
        child = lfsck_object_find_by_dev(env, dev, &ent->lde_fid);
        if (IS_ERR(child))
                RETURN(PTR_ERR(child));
 
-       LASSERT(dt_object_exists(child));
+       if (!dt_object_exists(child)) {
+               CDEBUG(D_LFSCK, "%s: lost+found/%s doesn't exist\n",
+                      lfsck_lfsck2name(lfsck), ent->lde_name);
+               GOTO(out, rc = -ENOENT);
+       }
+
        LASSERT(!dt_object_remote(child));
 
        idx = lfsck_sub_trace_file_fid2idx(&ent->lde_fid);
@@ -6893,9 +6895,14 @@ int lfsck_verify_linkea(const struct lu_env *env, struct lfsck_instance *lfsck,
        int                      rc;
        int                      fl     = LU_XATTR_CREATE;
        bool                     dirty  = false;
+
        ENTRY;
 
-       LASSERT(S_ISDIR(lfsck_object_type(obj)));
+       if (!dt_object_exists(obj))
+               RETURN(-ENOENT);
+
+       if (!S_ISDIR(lfsck_object_type(obj)))
+               RETURN(-ENOTDIR);
 
        rc = lfsck_links_read_with_rec(env, obj, &ldata);
        if (rc == -ENODATA) {