LU-4917 lfsck: dump layout lfsck correctly

[fs/lustre-release.git] / lustre / lfsck / lfsck_engine.c

diff --git a/lustre/lfsck/lfsck_engine.c b/lustre/lfsck/lfsck_engine.c
index e55c04f..e31faf3 100644 (file)
--- a/lustre/lfsck/lfsck_engine.c
+++ b/lustre/lfsck/lfsck_engine.c
@@ -306,6 +306,12 @@ static int lfsck_master_oit_engine(const struct lu_env *env,
                                ostid_to_fid(fid, oi, idx);
                                update_lma = true;
                        }
+               } else if (!fid_is_norm(fid) && !fid_is_igif(fid) &&
+                          !fid_is_last_id(fid) && !fid_is_root(fid) &&
+                          !fid_seq_is_dot(fid_seq(fid))) {
+                       /* If the FID/object is only used locally and invisible
+                        * to external nodes, then LFSCK will not handle it. */
+                       goto checkpoint;
                }
 
                target = lfsck_object_find(env, lfsck, fid);
@@ -361,38 +367,34 @@ checkpoint:
 
 int lfsck_master_engine(void *args)
 {
-       struct lu_env            env;
-       struct lfsck_instance   *lfsck    = (struct lfsck_instance *)args;
-       struct ptlrpc_thread    *thread   = &lfsck->li_thread;
-       struct dt_object        *oit_obj  = lfsck->li_obj_oit;
-       const struct dt_it_ops  *oit_iops = &oit_obj->do_index_ops->dio_it;
-       struct dt_it            *oit_di;
-       int                      rc;
+       struct lfsck_thread_args *lta      = args;
+       struct lu_env            *env      = &lta->lta_env;
+       struct lfsck_instance    *lfsck    = lta->lta_lfsck;
+       struct ptlrpc_thread     *thread   = &lfsck->li_thread;
+       struct dt_object         *oit_obj  = lfsck->li_obj_oit;
+       const struct dt_it_ops   *oit_iops = &oit_obj->do_index_ops->dio_it;
+       struct dt_it             *oit_di;
+       struct l_wait_info        lwi      = { 0 };
+       int                       rc;
        ENTRY;
 
-       rc = lu_env_init(&env, LCT_MD_THREAD | LCT_DT_THREAD);
-       if (rc != 0) {
-               CERROR("%s: LFSCK, fail to init env, rc = %d\n",
-                      lfsck_lfsck2name(lfsck), rc);
-               GOTO(noenv, rc);
-       }
-
-       oit_di = oit_iops->init(&env, oit_obj, lfsck->li_args_oit, BYPASS_CAPA);
+       oit_di = oit_iops->init(env, oit_obj, lfsck->li_args_oit, BYPASS_CAPA);
        if (IS_ERR(oit_di)) {
                rc = PTR_ERR(oit_di);
-               CERROR("%s: LFSCK, fail to init iteration, rc = %d\n",
+               CERROR("%s: LFSCK, fail to init iteration: rc = %d\n",
                       lfsck_lfsck2name(lfsck), rc);
-               GOTO(fini_env, rc);
+
+               GOTO(fini_args, rc);
        }
 
        spin_lock(&lfsck->li_lock);
        lfsck->li_di_oit = oit_di;
        spin_unlock(&lfsck->li_lock);
-       rc = lfsck_prep(&env, lfsck);
+       rc = lfsck_prep(env, lfsck, lta->lta_lsp);
        if (rc != 0)
                GOTO(fini_oit, rc);
 
-       CDEBUG(D_LFSCK, "LFSCK entry: oit_flags = 0x%x, dir_flags = 0x%x, "
+       CDEBUG(D_LFSCK, "LFSCK entry: oit_flags = %#x, dir_flags = %#x, "
               "oit_cookie = "LPU64", dir_cookie = "LPU64", parent = "DFID
               ", pid = %d\n", lfsck->li_args_oit, lfsck->li_args_dir,
               lfsck->li_pos_current.lp_oit_cookie,
@@ -405,13 +407,20 @@ int lfsck_master_engine(void *args)
        spin_unlock(&lfsck->li_lock);
        wake_up_all(&thread->t_ctl_waitq);
 
+       l_wait_event(thread->t_ctl_waitq,
+                    lfsck->li_start_unplug ||
+                    !thread_is_running(thread),
+                    &lwi);
+       if (!thread_is_running(thread))
+               GOTO(fini_oit, rc = 0);
+
        if (!cfs_list_empty(&lfsck->li_list_scan) ||
            cfs_list_empty(&lfsck->li_list_double_scan))
-               rc = lfsck_master_oit_engine(&env, lfsck);
+               rc = lfsck_master_oit_engine(env, lfsck);
        else
                rc = 1;
 
-       CDEBUG(D_LFSCK, "LFSCK exit: oit_flags = 0x%x, dir_flags = 0x%x, "
+       CDEBUG(D_LFSCK, "LFSCK exit: oit_flags = %#x, dir_flags = %#x, "
               "oit_cookie = "LPU64", dir_cookie = "LPU64", parent = "DFID
               ", pid = %d, rc = %d\n", lfsck->li_args_oit, lfsck->li_args_dir,
               lfsck->li_pos_current.lp_oit_cookie,
@@ -420,29 +429,30 @@ int lfsck_master_engine(void *args)
               current_pid(), rc);
 
        if (!OBD_FAIL_CHECK(OBD_FAIL_LFSCK_CRASH))
-               rc = lfsck_post(&env, lfsck, rc);
+               rc = lfsck_post(env, lfsck, rc);
+
        if (lfsck->li_di_dir != NULL)
-               lfsck_close_dir(&env, lfsck);
+               lfsck_close_dir(env, lfsck);
 
 fini_oit:
-       lfsck_di_oit_put(&env, lfsck);
-       oit_iops->fini(&env, oit_di);
+       lfsck_di_oit_put(env, lfsck);
+       oit_iops->fini(env, oit_di);
        if (rc == 1) {
                if (!cfs_list_empty(&lfsck->li_list_double_scan))
-                       rc = lfsck_double_scan(&env, lfsck);
+                       rc = lfsck_double_scan(env, lfsck);
                else
                        rc = 0;
+       } else {
+               lfsck_quit(env, lfsck);
        }
 
        /* XXX: Purge the pinned objects in the future. */
 
-fini_env:
-       lu_env_fini(&env);
-
-noenv:
+fini_args:
        spin_lock(&lfsck->li_lock);
        thread_set_flags(thread, SVC_STOPPED);
-       wake_up_all(&thread->t_ctl_waitq);
        spin_unlock(&lfsck->li_lock);
+       wake_up_all(&thread->t_ctl_waitq);
+       lfsck_thread_args_fini(lta);
        return rc;
 }