struct lfsck_instance *lfsck)
{
struct lfsck_thread_info *info = lfsck_env_info(env);
- const struct dt_it_ops *iops =
- &lfsck->li_obj_dir->do_index_ops->dio_it;
+ struct dt_object *dir = lfsck->li_obj_dir;
+ const struct dt_it_ops *iops = &dir->do_index_ops->dio_it;
struct dt_it *di = lfsck->li_di_dir;
- struct lu_dirent *ent = &info->lti_ent;
+ struct lu_dirent *ent =
+ (struct lu_dirent *)info->lti_key;
struct lu_fid *fid = &info->lti_fid;
struct lfsck_bookmark *bk = &lfsck->li_bookmark_ram;
struct ptlrpc_thread *thread = &lfsck->li_thread;
lfsck->li_args_dir);
lfsck_unpack_ent(ent, &lfsck->li_cookie_dir);
if (rc != 0) {
+ CDEBUG(D_LFSCK, "%s: scan dir failed at rec(), "
+ "parent "DFID", cookie "LPX64": rc = %d\n",
+ lfsck_lfsck2name(lfsck),
+ PFID(lfsck_dto2fid(dir)),
+ lfsck->li_cookie_dir, rc);
lfsck_fail(env, lfsck, true);
if (bk->lb_param & LPF_FAILOUT)
RETURN(rc);
if (child == NULL) {
goto checkpoint;
} else if (IS_ERR(child)) {
+ CDEBUG(D_LFSCK, "%s: scan dir failed at find target, "
+ "parent "DFID", child %.*s "DFID": rc = %d\n",
+ lfsck_lfsck2name(lfsck),
+ PFID(lfsck_dto2fid(dir)),
+ ent->lde_namelen, ent->lde_name,
+ PFID(&ent->lde_fid), rc);
lfsck_fail(env, lfsck, true);
if (bk->lb_param & LPF_FAILOUT)
RETURN(PTR_ERR(child));
/* Rate control. */
lfsck_control_speed(lfsck);
- if (unlikely(!thread_is_running(thread)))
+ if (unlikely(!thread_is_running(thread))) {
+ CDEBUG(D_LFSCK, "%s: scan dir exit for engine stop, "
+ "parent "DFID", cookie "LPX64"\n",
+ lfsck_lfsck2name(lfsck),
+ PFID(lfsck_dto2fid(dir)),
+ lfsck->li_cookie_dir);
RETURN(0);
+ }
if (OBD_FAIL_CHECK(OBD_FAIL_LFSCK_FATAL2)) {
spin_lock(&lfsck->li_lock);
lfsck->li_new_scanned++;
rc = iops->rec(env, di, (struct dt_rec *)fid, 0);
if (rc != 0) {
+ CDEBUG(D_LFSCK, "%s: OIT scan failed at rec(): "
+ "rc = %d\n", lfsck_lfsck2name(lfsck), rc);
lfsck_fail(env, lfsck, true);
if (rc < 0 && bk->lb_param & LPF_FAILOUT)
RETURN(rc);
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);
if (target == NULL) {
goto checkpoint;
} else if (IS_ERR(target)) {
+ CDEBUG(D_LFSCK, "%s: OIT scan failed at find target "
+ DFID", cookie "LPU64": rc = %d\n",
+ lfsck_lfsck2name(lfsck), PFID(fid),
+ iops->store(env, di), rc);
lfsck_fail(env, lfsck, true);
if (bk->lb_param & LPF_FAILOUT)
RETURN(PTR_ERR(target));
/* XXX: Currently, skip remote object, the consistency for
* remote object will be processed in LFSCK phase III. */
if (dt_object_exists(target) && !dt_object_remote(target)) {
- if (update_lma)
+ if (update_lma) {
rc = lfsck_update_lma(env, lfsck, target);
+ if (rc != 0)
+ CDEBUG(D_LFSCK, "%s: fail to update "
+ "LMA for "DFID": rc = %d\n",
+ lfsck_lfsck2name(lfsck),
+ PFID(lfsck_dto2fid(target)), rc);
+ }
if (rc == 0)
rc = lfsck_exec_oit(env, lfsck, target);
}
else if (likely(rc == 0))
lfsck->li_current_oit_processed = 0;
- if (unlikely(!thread_is_running(thread)))
+ if (unlikely(!thread_is_running(thread))) {
+ CDEBUG(D_LFSCK, "%s: OIT scan exit for engine stop, "
+ "cookie "LPU64"\n", lfsck_lfsck2name(lfsck),
+ iops->store(env, di));
RETURN(0);
+ }
} while (rc == 0 || lfsck->li_di_dir != NULL);
RETURN(rc);
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;
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",
- lfsck_lfsck2name(lfsck), rc);
+ CDEBUG(D_LFSCK, "%s: master engine fail to init iteration: "
+ "rc = %d\n", lfsck_lfsck2name(lfsck), rc);
GOTO(fini_args, rc);
}
GOTO(fini_oit, rc);
CDEBUG(D_LFSCK, "LFSCK entry: oit_flags = %#x, dir_flags = %#x, "
- "oit_cookie = "LPU64", dir_cookie = "LPU64", parent = "DFID
+ "oit_cookie = "LPU64", dir_cookie = "LPX64", parent = "DFID
", pid = %d\n", lfsck->li_args_oit, lfsck->li_args_dir,
lfsck->li_pos_current.lp_oit_cookie,
lfsck->li_pos_current.lp_dir_cookie,
spin_unlock(&lfsck->li_lock);
wake_up_all(&thread->t_ctl_waitq);
- if (!cfs_list_empty(&lfsck->li_list_scan) ||
- cfs_list_empty(&lfsck->li_list_double_scan))
+ 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 (!list_empty(&lfsck->li_list_scan) ||
+ list_empty(&lfsck->li_list_double_scan))
rc = lfsck_master_oit_engine(env, lfsck);
else
rc = 1;
CDEBUG(D_LFSCK, "LFSCK exit: oit_flags = %#x, dir_flags = %#x, "
- "oit_cookie = "LPU64", dir_cookie = "LPU64", parent = "DFID
+ "oit_cookie = "LPU64", dir_cookie = "LPX64", parent = "DFID
", pid = %d, rc = %d\n", lfsck->li_args_oit, lfsck->li_args_dir,
lfsck->li_pos_current.lp_oit_cookie,
lfsck->li_pos_current.lp_dir_cookie,
lfsck_di_oit_put(env, lfsck);
oit_iops->fini(env, oit_di);
if (rc == 1) {
- if (!cfs_list_empty(&lfsck->li_list_double_scan))
+ if (!list_empty(&lfsck->li_list_double_scan))
rc = lfsck_double_scan(env, lfsck);
else
rc = 0;
git://git.whamcloud.com / fs / lustre-release.git / blobdiff