lfsck_namespace_le_to_cpu(ns,
(struct lfsck_namespace *)com->lc_file_disk);
if (ns->ln_magic != LFSCK_NAMESPACE_MAGIC) {
- CWARN("%s: invalid lfsck_namespace magic %#x != %#x\n",
- lfsck_lfsck2name(com->lc_lfsck), ns->ln_magic,
- LFSCK_NAMESPACE_MAGIC);
+ CDEBUG(D_LFSCK, "%s: invalid lfsck_namespace magic "
+ "%#x != %#x\n", lfsck_lfsck2name(com->lc_lfsck),
+ ns->ln_magic, LFSCK_NAMESPACE_MAGIC);
rc = 1;
} else {
rc = 0;
}
} else if (rc != -ENODATA) {
- CERROR("%s: fail to load lfsck_namespace: expected = %d, "
- "rc = %d\n", lfsck_lfsck2name(com->lc_lfsck), len, rc);
+ CDEBUG(D_LFSCK, "%s: fail to load lfsck_namespace, "
+ "expected = %d: rc = %d\n",
+ lfsck_lfsck2name(com->lc_lfsck), len, rc);
if (rc >= 0)
rc = 1;
}
lfsck_namespace_cpu_to_le((struct lfsck_namespace *)com->lc_file_disk,
(struct lfsck_namespace *)com->lc_file_ram);
handle = dt_trans_create(env, lfsck->li_bottom);
- if (IS_ERR(handle)) {
- rc = PTR_ERR(handle);
- CERROR("%s: fail to create trans for storing lfsck_namespace: "
- "rc = %d\n", lfsck_lfsck2name(lfsck), rc);
- RETURN(rc);
- }
+ if (IS_ERR(handle))
+ GOTO(log, rc = PTR_ERR(handle));
rc = dt_declare_xattr_set(env, obj,
lfsck_buf_get(env, com->lc_file_disk, len),
XATTR_NAME_LFSCK_NAMESPACE, 0, handle);
- if (rc != 0) {
- CERROR("%s: fail to declare trans for storing lfsck_namespace: "
- "rc = %d\n", lfsck_lfsck2name(lfsck), rc);
+ if (rc != 0)
GOTO(out, rc);
- }
rc = dt_trans_start_local(env, lfsck->li_bottom, handle);
- if (rc != 0) {
- CERROR("%s: fail to start trans for storing lfsck_namespace: "
- "rc = %d\n", lfsck_lfsck2name(lfsck), rc);
+ if (rc != 0)
GOTO(out, rc);
- }
rc = dt_xattr_set(env, obj,
lfsck_buf_get(env, com->lc_file_disk, len),
XATTR_NAME_LFSCK_NAMESPACE,
init ? LU_XATTR_CREATE : LU_XATTR_REPLACE,
handle, BYPASS_CAPA);
- if (rc != 0)
- CERROR("%s: fail to store lfsck_namespace: len = %d, "
- "rc = %d\n", lfsck_lfsck2name(lfsck), len, rc);
GOTO(out, rc);
out:
dt_trans_stop(env, lfsck->li_bottom, handle);
+
+log:
+ if (rc != 0)
+ CDEBUG(D_LFSCK, "%s: fail to store lfsck_namespace: rc = %d\n",
+ lfsck_lfsck2name(lfsck), rc);
return rc;
}
if (exist) {
rc = dt_delete(env, obj, (const struct dt_key *)key, handle,
BYPASS_CAPA);
- if (rc != 0) {
- CERROR("%s: fail to insert "DFID": rc = %d\n",
- lfsck_lfsck2name(com->lc_lfsck), PFID(fid), rc);
+ if (rc != 0)
GOTO(out, rc);
- }
}
rc = dt_insert(env, obj, (const struct dt_rec *)&flags,
if (bk->lb_param & LPF_DRYRUN)
RETURN(1);
- CDEBUG(D_LFSCK, "Remove linkEA: "DFID"[%.*s], "DFID"\n",
- PFID(lfsck_dto2fid(child)), cname->ln_namelen, cname->ln_name,
- PFID(pfid));
+ CDEBUG(D_LFSCK, "%s: namespace LFSCK remove invalid linkEA "
+ "for the object: "DFID", parent "DFID", name %.*s\n",
+ lfsck_lfsck2name(lfsck), PFID(lfsck_dto2fid(child)),
+ PFID(pfid), cname->ln_namelen, cname->ln_name);
+
linkea_del_buf(&ldata, cname);
update = true;
}
if (rc == 0 && !lfsck_is_dead_obj(child) &&
ldata.ld_leh != NULL &&
ldata.ld_leh->leh_reccount != la->la_nlink)
- CWARN("%s: the object "DFID" linkEA entry count %u "
- "may not match its hardlink count %u\n",
- lfsck_lfsck2name(lfsck), PFID(cfid),
- ldata.ld_leh->leh_reccount, la->la_nlink);
+ CDEBUG(D_LFSCK, "%s: the object "DFID" linkEA entry "
+ "count %u may not match its hardlink count %u\n",
+ lfsck_lfsck2name(lfsck), PFID(cfid),
+ ldata.ld_leh->leh_reccount, la->la_nlink);
dt_write_unlock(env, child);
}
root = dt_locate(env, lfsck->li_bottom, &lfsck->li_local_root_fid);
if (IS_ERR(root))
- RETURN(PTR_ERR(root));
+ GOTO(log, rc = PTR_ERR(root));
- if (unlikely(!dt_try_as_dir(env, root))) {
- lu_object_put(env, &root->do_lu);
- RETURN(-ENOTDIR);
- }
+ if (unlikely(!dt_try_as_dir(env, root)))
+ GOTO(put, rc = -ENOTDIR);
down_write(&com->lc_sem);
if (init) {
out:
up_write(&com->lc_sem);
+
+put:
lu_object_put(env, &root->do_lu);
+log:
+ CDEBUG(D_LFSCK, "%s: namespace LFSCK reset: rc = %d\n",
+ lfsck_lfsck2name(lfsck), rc);
return rc;
}
if (new_checked)
com->lc_new_checked++;
ns->ln_items_failed++;
- if (lfsck_pos_is_zero(&ns->ln_pos_first_inconsistent))
+ if (lfsck_pos_is_zero(&ns->ln_pos_first_inconsistent)) {
lfsck_pos_fill(env, com->lc_lfsck,
&ns->ln_pos_first_inconsistent, false);
+
+ CDEBUG(D_LFSCK, "%s: namespace LFSCK hit first non-repaired "
+ "inconsistency at the pos ["LPU64", "DFID", "LPX64"]\n",
+ lfsck_lfsck2name(com->lc_lfsck),
+ ns->ln_pos_first_inconsistent.lp_oit_cookie,
+ PFID(&ns->ln_pos_first_inconsistent.lp_dir_parent),
+ ns->ln_pos_first_inconsistent.lp_dir_cookie);
+ }
up_write(&com->lc_sem);
}
return 0;
down_write(&com->lc_sem);
-
if (init) {
ns->ln_pos_latest_start = lfsck->li_pos_current;
} else {
}
rc = lfsck_namespace_store(env, com, false);
-
up_write(&com->lc_sem);
+
+ CDEBUG(D_LFSCK, "%s: namespace LFSCK checkpoint at the pos ["LPU64
+ ", "DFID", "LPX64"]: rc = %d\n", lfsck_lfsck2name(lfsck),
+ lfsck->li_pos_current.lp_oit_cookie,
+ PFID(&lfsck->li_pos_current.lp_dir_parent),
+ lfsck->li_pos_current.lp_dir_cookie, rc);
+
return rc;
}
int rc;
rc = lfsck_namespace_reset(env, com, false);
- if (rc != 0)
+ if (rc == 0)
+ rc = lfsck_set_param(env, lfsck, lsp->lsp_start, true);
+
+ if (rc != 0) {
+ CDEBUG(D_LFSCK, "%s: namespace LFSCK prep failed: "
+ "rc = %d\n", lfsck_lfsck2name(lfsck), rc);
+
return rc;
+ }
}
down_write(&com->lc_sem);
-
ns->ln_time_latest_start = cfs_time_current_sec();
spin_lock(&lfsck->li_lock);
}
}
spin_unlock(&lfsck->li_lock);
-
up_write(&com->lc_sem);
+
+ CDEBUG(D_LFSCK, "%s: namespace LFSCK prep done, start pos ["LPU64", "
+ DFID", "LPX64"]\n", lfsck_lfsck2name(lfsck), pos->lp_oit_cookie,
+ PFID(&pos->lp_dir_parent), pos->lp_dir_cookie);
+
return 0;
}
bool locked = false;
bool remove;
bool newdata;
+ bool log = false;
int count = 0;
int rc;
ENTRY;
if (ent->lde_name[0] == '.' &&
(ent->lde_namelen == 1 ||
(ent->lde_namelen == 2 && ent->lde_name[1] == '.') ||
- fid_is_dot_lustre(&ent->lde_fid)))
+ fid_seq_is_dot_lustre(fid_seq(&ent->lde_fid))))
GOTO(out, rc = 0);
if (!(bk->lb_param & LPF_DRYRUN) &&
nodata:
if (bk->lb_param & LPF_DRYRUN) {
ns->ln_linkea_repaired++;
+ log = true;
repaired = true;
goto record;
}
count = ldata.ld_leh->leh_reccount;
ns->ln_linkea_repaired++;
+ log = true;
repaired = true;
} else {
GOTO(stop, rc);
dt_trans_stop(env, lfsck->li_next, handle);
handle = NULL;
+
+ if (log)
+ CDEBUG(D_LFSCK, "%s: namespace LFSCK repaired "
+ "linkEA for the object: "DFID", parent "
+ DFID", name %.*s\n",
+ lfsck_lfsck2name(lfsck), PFID(cfid), PFID(pfid),
+ ent->lde_namelen, ent->lde_name);
}
ns->ln_mlinked_checked++;
out:
if (rc < 0) {
+ CDEBUG(D_LFSCK, "%s: namespace LFSCK exec_dir failed, "
+ "parent "DFID", child name %.*s, child FID "DFID
+ ": rc = %d\n", lfsck_lfsck2name(lfsck), PFID(pfid),
+ ent->lde_namelen, ent->lde_name, PFID(cfid), rc);
+
ns->ln_items_failed++;
if (lfsck_pos_is_zero(&ns->ln_pos_first_inconsistent))
lfsck_pos_fill(env, lfsck,
int rc;
down_write(&com->lc_sem);
-
spin_lock(&lfsck->li_lock);
if (!init)
ns->ln_pos_last_checkpoint = lfsck->li_pos_current;
}
rc = lfsck_namespace_store(env, com, false);
-
up_write(&com->lc_sem);
+
+ CDEBUG(D_LFSCK, "%s: namespace LFSCK post done: rc = %d\n",
+ lfsck_lfsck2name(lfsck), rc);
+
return rc;
}
static int
lfsck_namespace_dump(const struct lu_env *env, struct lfsck_component *com,
- char *buf, int len)
+ struct seq_file *m)
{
struct lfsck_instance *lfsck = com->lc_lfsck;
struct lfsck_bookmark *bk = &lfsck->li_bookmark_ram;
struct lfsck_namespace *ns = com->lc_file_ram;
- int save = len;
- int ret = -ENOSPC;
int rc;
down_read(&com->lc_sem);
- rc = snprintf(buf, len,
- "name: lfsck_namespace\n"
- "magic: %#x\n"
- "version: %d\n"
- "status: %s\n",
- ns->ln_magic,
- bk->lb_version,
- lfsck_status2names(ns->ln_status));
- if (rc <= 0)
- goto out;
-
- buf += rc;
- len -= rc;
- rc = lfsck_bits_dump(&buf, &len, ns->ln_flags, lfsck_flags_names,
- "flags");
+ seq_printf(m, "name: lfsck_namespace\n"
+ "magic: %#x\n"
+ "version: %d\n"
+ "status: %s\n",
+ ns->ln_magic,
+ bk->lb_version,
+ lfsck_status2names(ns->ln_status));
+
+ rc = lfsck_bits_dump(m, ns->ln_flags, lfsck_flags_names, "flags");
if (rc < 0)
goto out;
- rc = lfsck_bits_dump(&buf, &len, bk->lb_param, lfsck_param_names,
- "param");
+ rc = lfsck_bits_dump(m, bk->lb_param, lfsck_param_names, "param");
if (rc < 0)
goto out;
- rc = lfsck_time_dump(&buf, &len, ns->ln_time_last_complete,
+ rc = lfsck_time_dump(m, ns->ln_time_last_complete,
"time_since_last_completed");
if (rc < 0)
goto out;
- rc = lfsck_time_dump(&buf, &len, ns->ln_time_latest_start,
+ rc = lfsck_time_dump(m, ns->ln_time_latest_start,
"time_since_latest_start");
if (rc < 0)
goto out;
- rc = lfsck_time_dump(&buf, &len, ns->ln_time_last_checkpoint,
+ rc = lfsck_time_dump(m, ns->ln_time_last_checkpoint,
"time_since_last_checkpoint");
if (rc < 0)
goto out;
- rc = lfsck_pos_dump(&buf, &len, &ns->ln_pos_latest_start,
+ rc = lfsck_pos_dump(m, &ns->ln_pos_latest_start,
"latest_start_position");
if (rc < 0)
goto out;
- rc = lfsck_pos_dump(&buf, &len, &ns->ln_pos_last_checkpoint,
+ rc = lfsck_pos_dump(m, &ns->ln_pos_last_checkpoint,
"last_checkpoint_position");
if (rc < 0)
goto out;
- rc = lfsck_pos_dump(&buf, &len, &ns->ln_pos_first_inconsistent,
+ rc = lfsck_pos_dump(m, &ns->ln_pos_first_inconsistent,
"first_failure_position");
if (rc < 0)
goto out;
do_div(new_checked, duration);
if (rtime != 0)
do_div(speed, rtime);
- rc = snprintf(buf, len,
- "checked_phase1: "LPU64"\n"
+ seq_printf(m, "checked_phase1: "LPU64"\n"
"checked_phase2: "LPU64"\n"
"updated_phase1: "LPU64"\n"
"updated_phase2: "LPU64"\n"
"failed_phase1: "LPU64"\n"
"failed_phase2: "LPU64"\n"
- "dirs: "LPU64"\n"
- "M-linked: "LPU64"\n"
+ "directories: "LPU64"\n"
+ "multi_linked_files: "LPU64"\n"
"dirent_repaired: "LPU64"\n"
"linkea_repaired: "LPU64"\n"
"nlinks_repaired: "LPU64"\n"
"run_time_phase2: %u seconds\n"
"average_speed_phase1: "LPU64" items/sec\n"
"average_speed_phase2: N/A\n"
- "real-time_speed_phase1: "LPU64" items/sec\n"
- "real-time_speed_phase2: N/A\n",
+ "real_time_speed_phase1: "LPU64" items/sec\n"
+ "real_time_speed_phase2: N/A\n",
checked,
ns->ln_objs_checked_phase2,
ns->ln_items_repaired,
ns->ln_run_time_phase2,
speed,
new_checked);
- if (rc <= 0)
- goto out;
-
- buf += rc;
- len -= rc;
LASSERT(lfsck->li_di_oit != NULL);
pos.lp_dir_cookie = 0;
}
spin_unlock(&lfsck->li_lock);
- rc = lfsck_pos_dump(&buf, &len, &pos, "current_position");
- if (rc <= 0)
- goto out;
+ lfsck_pos_dump(m, &pos, "current_position");
} else if (ns->ln_status == LS_SCANNING_PHASE2) {
cfs_duration_t duration = cfs_time_current() -
lfsck->li_time_last_checkpoint;
do_div(speed1, ns->ln_run_time_phase1);
if (rtime != 0)
do_div(speed2, rtime);
- rc = snprintf(buf, len,
- "checked_phase1: "LPU64"\n"
+ seq_printf(m, "checked_phase1: "LPU64"\n"
"checked_phase2: "LPU64"\n"
"updated_phase1: "LPU64"\n"
"updated_phase2: "LPU64"\n"
"failed_phase1: "LPU64"\n"
"failed_phase2: "LPU64"\n"
- "dirs: "LPU64"\n"
- "M-linked: "LPU64"\n"
+ "directories: "LPU64"\n"
+ "multi_linked_files: "LPU64"\n"
"dirent_repaired: "LPU64"\n"
"linkea_repaired: "LPU64"\n"
"nlinks_repaired: "LPU64"\n"
"run_time_phase2: %u seconds\n"
"average_speed_phase1: "LPU64" items/sec\n"
"average_speed_phase2: "LPU64" objs/sec\n"
- "real-time_speed_phase1: N/A\n"
- "real-time_speed_phase2: "LPU64" objs/sec\n"
+ "real_time_speed_phase1: N/A\n"
+ "real_time_speed_phase2: "LPU64" objs/sec\n"
"current_position: "DFID"\n",
ns->ln_items_checked,
checked,
speed2,
new_checked,
PFID(&ns->ln_fid_latest_scanned_phase2));
- if (rc <= 0)
- goto out;
-
- buf += rc;
- len -= rc;
} else {
__u64 speed1 = ns->ln_items_checked;
__u64 speed2 = ns->ln_objs_checked_phase2;
do_div(speed1, ns->ln_run_time_phase1);
if (ns->ln_run_time_phase2 != 0)
do_div(speed2, ns->ln_run_time_phase2);
- rc = snprintf(buf, len,
- "checked_phase1: "LPU64"\n"
+ seq_printf(m, "checked_phase1: "LPU64"\n"
"checked_phase2: "LPU64"\n"
"updated_phase1: "LPU64"\n"
"updated_phase2: "LPU64"\n"
"failed_phase1: "LPU64"\n"
"failed_phase2: "LPU64"\n"
- "dirs: "LPU64"\n"
- "M-linked: "LPU64"\n"
+ "directories: "LPU64"\n"
+ "multi_linked_files: "LPU64"\n"
"dirent_repaired: "LPU64"\n"
"linkea_repaired: "LPU64"\n"
"nlinks_repaired: "LPU64"\n"
"run_time_phase2: %u seconds\n"
"average_speed_phase1: "LPU64" items/sec\n"
"average_speed_phase2: "LPU64" objs/sec\n"
- "real-time_speed_phase1: N/A\n"
- "real-time_speed_phase2: N/A\n"
+ "real_time_speed_phase1: N/A\n"
+ "real_time_speed_phase2: N/A\n"
"current_position: N/A\n",
ns->ln_items_checked,
ns->ln_objs_checked_phase2,
ns->ln_run_time_phase2,
speed1,
speed2);
- if (rc <= 0)
- goto out;
-
- buf += rc;
- len -= rc;
}
- ret = save - len;
-
out:
up_read(&com->lc_sem);
- return ret;
+ return 0;
}
static int lfsck_namespace_double_scan_main(void *args)
__u8 flags = 0;
ENTRY;
+ CDEBUG(D_LFSCK, "%s: namespace LFSCK phase2 scan start\n",
+ lfsck_lfsck2name(lfsck));
+
com->lc_new_checked = 0;
com->lc_new_scanned = 0;
com->lc_time_last_checkpoint = cfs_time_current();
ns->ln_status = LS_FAILED;
}
+ CDEBUG(D_LFSCK, "%s: namespace LFSCK phase2 scan finished, status %d: "
+ "rc = %d\n", lfsck_lfsck2name(lfsck), ns->ln_status, rc);
+
rc = lfsck_namespace_store(env, com, false);
up_write(&com->lc_sem);
if (atomic_dec_and_test(&lfsck->li_double_scan_count))
struct lfsck_instance *lfsck = com->lc_lfsck;
struct lfsck_namespace *ns = com->lc_file_ram;
struct lfsck_thread_args *lta;
- long rc;
+ struct task_struct *task;
+ int rc;
ENTRY;
if (unlikely(ns->ln_status != LS_SCANNING_PHASE2))
lta = lfsck_thread_args_init(lfsck, com, NULL);
if (IS_ERR(lta))
- RETURN(PTR_ERR(lta));
+ GOTO(out, rc = PTR_ERR(lta));
atomic_inc(&lfsck->li_double_scan_count);
- rc = PTR_ERR(kthread_run(lfsck_namespace_double_scan_main, lta,
- "lfsck_namespace"));
- if (IS_ERR_VALUE(rc)) {
- CERROR("%s: cannot start LFSCK namespace thread: rc = %ld\n",
- lfsck_lfsck2name(lfsck), rc);
+ task = kthread_run(lfsck_namespace_double_scan_main, lta,
+ "lfsck_namespace");
+ if (IS_ERR(task)) {
atomic_dec(&lfsck->li_double_scan_count);
lfsck_thread_args_fini(lta);
- } else {
- rc = 0;
+ GOTO(out, rc = PTR_ERR(task));
}
- RETURN(rc);
+ RETURN(0);
+
+out:
+ CERROR("%s: cannot start LFSCK namespace thread: rc = %d\n",
+ lfsck_lfsck2name(lfsck), rc);
+ return rc;
}
static int lfsck_namespace_in_notify(const struct lu_env *env,
init_rwsem(&com->lc_sem);
atomic_set(&com->lc_ref, 1);
com->lc_lfsck = lfsck;
- com->lc_type = LT_NAMESPACE;
+ com->lc_type = LFSCK_TYPE_NAMESPACE;
com->lc_ops = &lfsck_namespace_ops;
com->lc_file_size = sizeof(struct lfsck_namespace);
OBD_ALLOC(com->lc_file_ram, com->lc_file_size);
spin_unlock(&lfsck->li_lock);
break;
default:
- CERROR("%s: unknown lfsck_namespace status: rc = %u\n",
+ CERROR("%s: unknown lfsck_namespace status %d\n",
lfsck_lfsck2name(lfsck), ns->ln_status);
/* fall through */
case LS_SCANNING_PHASE1:
out:
if (root != NULL && !IS_ERR(root))
lu_object_put(env, &root->do_lu);
- if (rc != 0)
+ if (rc != 0) {
lfsck_component_cleanup(env, com);
+ CERROR("%s: fail to init namespace LFSCK component: rc = %d\n",
+ lfsck_lfsck2name(lfsck), rc);
+ }
return rc;
}
git://git.whamcloud.com / fs / lustre-release.git / blobdiff