* GPL HEADER END
*/
/*
- * Copyright (c) 2012, 2013, Intel Corporation.
+ * Copyright (c) 2013, 2014, Intel Corporation.
*/
/*
* lustre/lfsck/lfsck_engine.c
{
struct lfsck_thread_info *info = lfsck_env_info(env);
struct lfsck_bookmark *bk = &lfsck->li_bookmark_ram;
- struct dt_device *dt = lfsck->li_bottom;
+ struct dt_device *dev = lfsck_obj2dev(obj);
struct lustre_mdt_attrs *lma = &info->lti_lma;
struct lu_buf *buf;
struct thandle *th;
}
lustre_lma_swab(lma);
- th = dt_trans_create(env, dt);
+ th = dt_trans_create(env, dev);
if (IS_ERR(th))
RETURN(PTR_ERR(th));
if (rc != 0)
GOTO(stop, rc);
- rc = dt_trans_start(env, dt, th);
+ rc = dt_trans_start_local(env, dev, th);
if (rc != 0)
GOTO(stop, rc);
GOTO(stop, rc);
stop:
- dt_trans_stop(env, dt, th);
+ dt_trans_stop(env, dev, th);
return rc;
}
struct lfsck_thread_info *info = lfsck_env_info(env);
struct lu_fid *fid = &info->lti_fid;
struct lu_seq_range *range = &info->lti_range;
- struct dt_device *dev = lfsck->li_bottom;
- struct seq_server_site *ss = lu_site2seq(dev->dd_lu_dev.ld_site);
- __u32 idx = lfsck_dev_idx(dev);
+ struct seq_server_site *ss = lfsck_dev_site(lfsck);
+ __u32 idx = lfsck_dev_idx(lfsck);
int depth = 0;
int rc = 0;
return 1;
if (obj == NULL) {
- obj = lfsck_object_find(env, lfsck, fid);
+ obj = lfsck_object_find_bottom(env, lfsck, fid);
if (IS_ERR(obj))
return PTR_ERR(obj);
RETURN(-ENOMEM);
}
- /* Find the object against the bottom device. */
- obj = lfsck_object_find_by_dev(env, lfsck->li_bottom,
- lfsck_dto2fid(obj));
- if (IS_ERR(obj)) {
- OBD_FREE_LARGE(lslr, sizeof(*lslr) * stripes);
- OBD_FREE_PTR(llmv);
-
- RETURN(PTR_ERR(obj));
- }
-
llmv->ll_stripes_allocated = stripes;
llmv->ll_hash_type = LMV_HASH_TYPE_UNKNOWN;
llmv->ll_lslr = lslr;
- lfsck->li_obj_dir = obj;
} else {
llmv->ll_lmv_slave = 1;
- lfsck->li_obj_dir = lfsck_object_get(obj);
}
+ lfsck->li_obj_dir = lfsck_object_get(obj);
llmv->ll_lmv = *lmv;
atomic_set(&llmv->ll_ref, 1);
lfsck->li_lmv = llmv;
GOTO(out, rc = 0);
/* Find the directory for namespace-based traverse. */
- obj = lfsck_object_find(env, lfsck, &pos->lp_dir_parent);
+ obj = lfsck_object_find_bottom(env, lfsck, &pos->lp_dir_parent);
if (IS_ERR(obj))
RETURN(PTR_ERR(obj));
ENTRY;
do {
- if (OBD_FAIL_CHECK(OBD_FAIL_LFSCK_DELAY2) &&
- cfs_fail_val > 0) {
- struct l_wait_info lwi;
-
- lwi = LWI_TIMEOUT(cfs_time_seconds(cfs_fail_val),
- NULL, NULL);
- l_wait_event(thread->t_ctl_waitq,
- !thread_is_running(thread),
- &lwi);
-
- 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 (CFS_FAIL_TIMEOUT(OBD_FAIL_LFSCK_DELAY2, cfs_fail_val) &&
+ 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);
}
lfsck->li_new_scanned++;
strcmp(ent->lde_name, dotdot) != 0)
goto checkpoint;
+ /* skip dot entry. */
+ if (ent->lde_namelen == 1 && ent->lde_name[0] == '.')
+ goto checkpoint;
+
/* The type in the @ent structure may has been overwritten,
* so we need to pass the @type parameter independently. */
rc = lfsck_exec_dir(env, lfsck, ent, type);
struct lu_fid *fid = &info->lti_fid;
struct lfsck_bookmark *bk = &lfsck->li_bookmark_ram;
struct ptlrpc_thread *thread = &lfsck->li_thread;
- struct dt_device *dev = lfsck->li_bottom;
- struct seq_server_site *ss = lu_site2seq(dev->dd_lu_dev.ld_site);
- __u32 idx = lfsck_dev_idx(dev);
+ struct seq_server_site *ss = lfsck_dev_site(lfsck);
+ __u32 idx = lfsck_dev_idx(lfsck);
int rc;
ENTRY;
if (unlikely(lfsck->li_oit_over))
RETURN(1);
- if (OBD_FAIL_CHECK(OBD_FAIL_LFSCK_DELAY1) &&
- cfs_fail_val > 0) {
- struct l_wait_info lwi;
-
- lwi = LWI_TIMEOUT(cfs_time_seconds(cfs_fail_val),
- NULL, NULL);
- l_wait_event(thread->t_ctl_waitq,
- !thread_is_running(thread),
- &lwi);
+ if (CFS_FAIL_TIMEOUT(OBD_FAIL_LFSCK_DELAY1, cfs_fail_val) &&
+ 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));
- 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);
- }
+ RETURN(0);
}
if (OBD_FAIL_CHECK(OBD_FAIL_LFSCK_CRASH))
goto checkpoint;
}
+ if (unlikely(!fid_is_sane(fid))) {
+ CDEBUG(D_LFSCK, "%s: OIT scan find invalid FID "DFID
+ ", skip it\n",
+ lfsck_lfsck2name(lfsck), PFID(fid));
+ goto checkpoint;
+ }
+
if (fid_is_idif(fid)) {
__u32 idx1 = fid_idif_ost_idx(fid);
}
}
- target = lfsck_object_find(env, lfsck, fid);
+ target = lfsck_object_find_bottom(env, lfsck, fid);
if (IS_ERR(target)) {
CDEBUG(D_LFSCK, "%s: OIT scan failed at find target "
DFID", cookie "LPU64": rc = %d\n",
else
rc = 1;
+ lfsck_pos_fill(env, lfsck, &lfsck->li_pos_checkpoint, false);
CDEBUG(D_LFSCK, "LFSCK exit: oit_flags = %#x, dir_flags = %#x, "
"oit_cookie = "LPU64", dir_cookie = "LPX64", parent = "DFID
", pid = %d, rc = %d\n", lfsck->li_args_oit, lfsck->li_args_dir,
lad->lad_touch_gen++;
memset(lr, 0, sizeof(*lr));
- lr->lr_index = lfsck_dev_idx(lfsck->li_bottom);
lr->lr_event = LE_QUERY;
lr->lr_active = com->lc_type;
laia->laia_com = com;
if (set == NULL)
RETURN(-ENOMEM);
- lr->lr_index = lfsck_dev_idx(lfsck->li_bottom);
+ lr->lr_index = lfsck_dev_idx(lfsck);
lr->lr_active = com->lc_type;
laia->laia_com = com;
laia->laia_lr = lr;
laia->laia_ltd = ltd;
ltd->ltd_layout_done = 0;
+ ltd->ltd_synced_failures = 0;
rc = lfsck_async_request(env, ltd->ltd_exp, lr, set,
lfsck_async_interpret_common,
laia, LFSCK_NOTIFY);
*gen = lad->lad_touch_gen;
list_move_tail(list, &lad->lad_mdt_list);
- if (ltd->ltd_namespace_failed)
+ if (ltd->ltd_synced_failures)
continue;
atomic_inc(<d->ltd_ref);
/* Wake up the main engine thread only when the list
* is empty or half of the prefetched items have been
* handled to avoid too frequent thread schedule. */
- if (lad->lad_prefetched == 0 ||
- (bk->lb_async_windows != 0 &&
- bk->lb_async_windows / 2 ==
- lad->lad_prefetched))
+ if (lad->lad_prefetched <= (bk->lb_async_windows / 2))
wakeup = true;
spin_unlock(&lad->lad_lock);
if (wakeup)
lr->lr_event = LE_PHASE1_DONE;
lr->lr_status = lad->lad_post_result;
rc = lfsck_assistant_notify_others(env, com, lr);
- if (rc != 0)
- CDEBUG(D_LFSCK, "%s: LFSCK assistant failed to "
- "notify others for %s post: rc = %d\n",
- lfsck_lfsck2name(lfsck),
- lad->lad_name, rc);
+
+ CDEBUG(D_LFSCK, "%s: LFSCK assistant notified "
+ "others for %s post: rc = %d\n",
+ lfsck_lfsck2name(lfsck),
+ lad->lad_name, rc);
/* Wakeup the master engine to go ahead. */
wake_up_all(&mthread->t_ctl_waitq);
git://git.whamcloud.com / fs / lustre-release.git / blobdiff