Whamcloud - gitweb
git://git.whamcloud.com
/
fs
/
lustre-release.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
LU-1267 lfsck: framework (1) for MDT-OST consistency
[fs/lustre-release.git]
/
lustre
/
lfsck
/
lfsck_namespace.c
diff --git
a/lustre/lfsck/lfsck_namespace.c
b/lustre/lfsck/lfsck_namespace.c
index
3cc043d
..
d1ba149
100644
(file)
--- a/
lustre/lfsck/lfsck_namespace.c
+++ b/
lustre/lfsck/lfsck_namespace.c
@@
-134,16
+134,15
@@
static int lfsck_namespace_load(const struct lu_env *env,
lfsck_namespace_le_to_cpu(ns,
(struct lfsck_namespace *)com->lc_file_disk);
if (ns->ln_magic != LFSCK_NAMESPACE_MAGIC) {
lfsck_namespace_le_to_cpu(ns,
(struct lfsck_namespace *)com->lc_file_disk);
if (ns->ln_magic != LFSCK_NAMESPACE_MAGIC) {
- CWARN("%.16s: invalid lfsck_namespace magic "
- "0x%x != 0x%x\n",
- lfsck_lfsck2name(com->lc_lfsck),
- 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);
rc = 1;
} else {
rc = 0;
}
} else if (rc != -ENODATA) {
rc = 1;
} else {
rc = 0;
}
} else if (rc != -ENODATA) {
- CERROR("%
.16s: fail to load lfsck_namespace,
expected = %d, "
+ CERROR("%
s: fail to load lfsck_namespace:
expected = %d, "
"rc = %d\n", lfsck_lfsck2name(com->lc_lfsck), len, rc);
if (rc >= 0)
rc = 1;
"rc = %d\n", lfsck_lfsck2name(com->lc_lfsck), len, rc);
if (rc >= 0)
rc = 1;
@@
-166,8
+165,8
@@
static int lfsck_namespace_store(const struct lu_env *env,
handle = dt_trans_create(env, lfsck->li_bottom);
if (IS_ERR(handle)) {
rc = PTR_ERR(handle);
handle = dt_trans_create(env, lfsck->li_bottom);
if (IS_ERR(handle)) {
rc = PTR_ERR(handle);
- CERROR("%
.16s: fail to create trans for storing
"
- "
lfsck_namespace: %d\n,
", lfsck_lfsck2name(lfsck), rc);
+ CERROR("%
s: fail to create trans for storing lfsck_namespace:
"
+ "
rc = %d\n
", lfsck_lfsck2name(lfsck), rc);
RETURN(rc);
}
RETURN(rc);
}
@@
-175,15
+174,15
@@
static int lfsck_namespace_store(const struct lu_env *env,
lfsck_buf_get(env, com->lc_file_disk, len),
XATTR_NAME_LFSCK_NAMESPACE, 0, handle);
if (rc != 0) {
lfsck_buf_get(env, com->lc_file_disk, len),
XATTR_NAME_LFSCK_NAMESPACE, 0, handle);
if (rc != 0) {
- CERROR("%
.16s: fail to declare trans for storing
"
- "
lfsck_namespace: %d\n,
", lfsck_lfsck2name(lfsck), rc);
+ CERROR("%
s: fail to declare trans for storing lfsck_namespace:
"
+ "
rc = %d\n
", lfsck_lfsck2name(lfsck), rc);
GOTO(out, rc);
}
rc = dt_trans_start_local(env, lfsck->li_bottom, handle);
if (rc != 0) {
GOTO(out, rc);
}
rc = dt_trans_start_local(env, lfsck->li_bottom, handle);
if (rc != 0) {
- CERROR("%
.16s: fail to start trans for storing
"
- "
lfsck_namespace: %d\n,
", lfsck_lfsck2name(lfsck), rc);
+ CERROR("%
s: fail to start trans for storing lfsck_namespace:
"
+ "
rc = %d\n
", lfsck_lfsck2name(lfsck), rc);
GOTO(out, rc);
}
GOTO(out, rc);
}
@@
-193,7
+192,7
@@
static int lfsck_namespace_store(const struct lu_env *env,
init ? LU_XATTR_CREATE : LU_XATTR_REPLACE,
handle, BYPASS_CAPA);
if (rc != 0)
init ? LU_XATTR_CREATE : LU_XATTR_REPLACE,
handle, BYPASS_CAPA);
if (rc != 0)
- CERROR("%
.16s: fail to store lfsck_namespace,
len = %d, "
+ CERROR("%
s: fail to store lfsck_namespace:
len = %d, "
"rc = %d\n", lfsck_lfsck2name(lfsck), len, rc);
GOTO(out, rc);
"rc = %d\n", lfsck_lfsck2name(lfsck), len, rc);
GOTO(out, rc);
@@
-206,7
+205,7
@@
out:
static int lfsck_namespace_init(const struct lu_env *env,
struct lfsck_component *com)
{
static int lfsck_namespace_init(const struct lu_env *env,
struct lfsck_component *com)
{
- struct lfsck_namespace *ns =
(struct lfsck_namespace *)
com->lc_file_ram;
+ struct lfsck_namespace *ns = com->lc_file_ram;
int rc;
memset(ns, 0, sizeof(*ns));
int rc;
memset(ns, 0, sizeof(*ns));
@@
-316,7
+315,7
@@
static int lfsck_namespace_update(const struct lu_env *env,
rc = dt_delete(env, obj, (const struct dt_key *)key, handle,
BYPASS_CAPA);
if (rc != 0) {
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",
+ CERROR("%s: fail to insert "DFID"
:
rc = %d\n",
lfsck_lfsck2name(com->lc_lfsck), PFID(fid), rc);
GOTO(out, rc);
}
lfsck_lfsck2name(com->lc_lfsck), PFID(fid), rc);
GOTO(out, rc);
}
@@
-473,8
+472,7
@@
static int lfsck_namespace_double_scan_one(const struct lu_env *env,
struct lu_fid *cfid = &info->lti_fid2;
struct lfsck_instance *lfsck = com->lc_lfsck;
struct lfsck_bookmark *bk = &lfsck->li_bookmark_ram;
struct lu_fid *cfid = &info->lti_fid2;
struct lfsck_instance *lfsck = com->lc_lfsck;
struct lfsck_bookmark *bk = &lfsck->li_bookmark_ram;
- struct lfsck_namespace *ns =
- (struct lfsck_namespace *)com->lc_file_ram;
+ struct lfsck_namespace *ns = com->lc_file_ram;
struct linkea_data ldata = { 0 };
struct thandle *handle = NULL;
bool locked = false;
struct linkea_data ldata = { 0 };
struct thandle *handle = NULL;
bool locked = false;
@@
-625,7
+623,7
@@
stop:
if (rc == 0 && !lfsck_is_dead_obj(child) &&
ldata.ld_leh != NULL &&
ldata.ld_leh->leh_reccount != la->la_nlink)
if (rc == 0 && !lfsck_is_dead_obj(child) &&
ldata.ld_leh != NULL &&
ldata.ld_leh->leh_reccount != la->la_nlink)
- CWARN("%
.16
s: the object "DFID" linkEA entry count %u "
+ 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);
"may not match its hardlink count %u\n",
lfsck_lfsck2name(lfsck), PFID(cfid),
ldata.ld_leh->leh_reccount, la->la_nlink);
@@
-650,8
+648,7
@@
static int lfsck_namespace_reset(const struct lu_env *env,
struct lfsck_component *com, bool init)
{
struct lfsck_instance *lfsck = com->lc_lfsck;
struct lfsck_component *com, bool init)
{
struct lfsck_instance *lfsck = com->lc_lfsck;
- struct lfsck_namespace *ns =
- (struct lfsck_namespace *)com->lc_file_ram;
+ struct lfsck_namespace *ns = com->lc_file_ram;
struct dt_object *root;
struct dt_object *dto;
int rc;
struct dt_object *root;
struct dt_object *dto;
int rc;
@@
-661,7
+658,10
@@
static int lfsck_namespace_reset(const struct lu_env *env,
if (IS_ERR(root))
RETURN(PTR_ERR(root));
if (IS_ERR(root))
RETURN(PTR_ERR(root));
- dt_try_as_dir(env, root);
+ if (unlikely(!dt_try_as_dir(env, root))) {
+ lu_object_put(env, &root->do_lu);
+ RETURN(-ENOTDIR);
+ }
down_write(&com->lc_sem);
if (init) {
down_write(&com->lc_sem);
if (init) {
@@
-710,7
+710,7
@@
static void
lfsck_namespace_fail(const struct lu_env *env, struct lfsck_component *com,
bool new_checked)
{
lfsck_namespace_fail(const struct lu_env *env, struct lfsck_component *com,
bool new_checked)
{
- struct lfsck_namespace *ns =
(struct lfsck_namespace *)
com->lc_file_ram;
+ struct lfsck_namespace *ns = com->lc_file_ram;
down_write(&com->lc_sem);
if (new_checked)
down_write(&com->lc_sem);
if (new_checked)
@@
-726,8
+726,7
@@
static int lfsck_namespace_checkpoint(const struct lu_env *env,
struct lfsck_component *com, bool init)
{
struct lfsck_instance *lfsck = com->lc_lfsck;
struct lfsck_component *com, bool init)
{
struct lfsck_instance *lfsck = com->lc_lfsck;
- struct lfsck_namespace *ns =
- (struct lfsck_namespace *)com->lc_file_ram;
+ struct lfsck_namespace *ns = com->lc_file_ram;
int rc;
if (com->lc_new_checked == 0 && !init)
int rc;
if (com->lc_new_checked == 0 && !init)
@@
-756,8
+755,7
@@
static int lfsck_namespace_prep(const struct lu_env *env,
struct lfsck_component *com)
{
struct lfsck_instance *lfsck = com->lc_lfsck;
struct lfsck_component *com)
{
struct lfsck_instance *lfsck = com->lc_lfsck;
- struct lfsck_namespace *ns =
- (struct lfsck_namespace *)com->lc_file_ram;
+ struct lfsck_namespace *ns = com->lc_file_ram;
struct lfsck_position *pos = &com->lc_pos_start;
if (ns->ln_status == LS_COMPLETED) {
struct lfsck_position *pos = &com->lc_pos_start;
if (ns->ln_status == LS_COMPLETED) {
@@
-843,11
+841,9
@@
static int lfsck_namespace_exec_dir(const struct lu_env *env,
struct lu_attr *la = &info->lti_la;
struct lfsck_instance *lfsck = com->lc_lfsck;
struct lfsck_bookmark *bk = &lfsck->li_bookmark_ram;
struct lu_attr *la = &info->lti_la;
struct lfsck_instance *lfsck = com->lc_lfsck;
struct lfsck_bookmark *bk = &lfsck->li_bookmark_ram;
- struct lfsck_namespace *ns =
- (struct lfsck_namespace *)com->lc_file_ram;
+ struct lfsck_namespace *ns = com->lc_file_ram;
struct linkea_data ldata = { 0 };
struct linkea_data ldata = { 0 };
- const struct lu_fid *pfid =
- lu_object_fid(&lfsck->li_obj_dir->do_lu);
+ const struct lu_fid *pfid = lfsck_dto2fid(lfsck->li_obj_dir);
const struct lu_fid *cfid = lfsck_dto2fid(obj);
const struct lu_name *cname;
struct thandle *handle = NULL;
const struct lu_fid *cfid = lfsck_dto2fid(obj);
const struct lu_name *cname;
struct thandle *handle = NULL;
@@
-1043,8
+1039,7
@@
static int lfsck_namespace_post(const struct lu_env *env,
int result, bool init)
{
struct lfsck_instance *lfsck = com->lc_lfsck;
int result, bool init)
{
struct lfsck_instance *lfsck = com->lc_lfsck;
- struct lfsck_namespace *ns =
- (struct lfsck_namespace *)com->lc_file_ram;
+ struct lfsck_namespace *ns = com->lc_file_ram;
int rc;
down_write(&com->lc_sem);
int rc;
down_write(&com->lc_sem);
@@
-1096,8
+1091,7
@@
lfsck_namespace_dump(const struct lu_env *env, struct lfsck_component *com,
{
struct lfsck_instance *lfsck = com->lc_lfsck;
struct lfsck_bookmark *bk = &lfsck->li_bookmark_ram;
{
struct lfsck_instance *lfsck = com->lc_lfsck;
struct lfsck_bookmark *bk = &lfsck->li_bookmark_ram;
- struct lfsck_namespace *ns =
- (struct lfsck_namespace *)com->lc_file_ram;
+ struct lfsck_namespace *ns = com->lc_file_ram;
int save = len;
int ret = -ENOSPC;
int rc;
int save = len;
int ret = -ENOSPC;
int rc;
@@
-1105,12
+1099,12
@@
lfsck_namespace_dump(const struct lu_env *env, struct lfsck_component *com,
down_read(&com->lc_sem);
rc = snprintf(buf, len,
"name: lfsck_namespace\n"
down_read(&com->lc_sem);
rc = snprintf(buf, len,
"name: lfsck_namespace\n"
- "magic:
0x%
x\n"
+ "magic:
%#
x\n"
"version: %d\n"
"status: %s\n",
ns->ln_magic,
bk->lb_version,
"version: %d\n"
"status: %s\n",
ns->ln_magic,
bk->lb_version,
- lfsck_status
_names[ns->ln_status]
);
+ lfsck_status
2names(ns->ln_status)
);
if (rc <= 0)
goto out;
if (rc <= 0)
goto out;
@@
-1230,7
+1224,7
@@
lfsck_namespace_dump(const struct lu_env *env, struct lfsck_component *com,
pos.lp_dir_cookie = 0;
} else {
pos.lp_dir_parent =
pos.lp_dir_cookie = 0;
} else {
pos.lp_dir_parent =
-
*lu_object_fid(&lfsck->li_obj_dir->do_lu
);
+
*lfsck_dto2fid(lfsck->li_obj_dir
);
}
} else {
fid_zero(&pos.lp_dir_parent);
}
} else {
fid_zero(&pos.lp_dir_parent);
@@
-1359,8
+1353,7
@@
static int lfsck_namespace_double_scan(const struct lu_env *env,
struct lfsck_instance *lfsck = com->lc_lfsck;
struct ptlrpc_thread *thread = &lfsck->li_thread;
struct lfsck_bookmark *bk = &lfsck->li_bookmark_ram;
struct lfsck_instance *lfsck = com->lc_lfsck;
struct ptlrpc_thread *thread = &lfsck->li_thread;
struct lfsck_bookmark *bk = &lfsck->li_bookmark_ram;
- struct lfsck_namespace *ns =
- (struct lfsck_namespace *)com->lc_file_ram;
+ struct lfsck_namespace *ns = com->lc_file_ram;
struct dt_object *obj = com->lc_obj;
const struct dt_it_ops *iops = &obj->do_index_ops->dio_it;
struct dt_object *target;
struct dt_object *obj = com->lc_obj;
const struct dt_it_ops *iops = &obj->do_index_ops->dio_it;
struct dt_object *target;
@@
-1371,9
+1364,10
@@
static int lfsck_namespace_double_scan(const struct lu_env *env,
__u8 flags = 0;
ENTRY;
__u8 flags = 0;
ENTRY;
- lfsck->li_new_scanned = 0;
- lfsck->li_time_last_checkpoint = cfs_time_current();
- lfsck->li_time_next_checkpoint = lfsck->li_time_last_checkpoint +
+ com->lc_new_checked = 0;
+ com->lc_new_scanned = 0;
+ com->lc_time_last_checkpoint = cfs_time_current();
+ com->lc_time_next_checkpoint = com->lc_time_last_checkpoint +
cfs_time_seconds(LFSCK_CHECKPOINT_INTERVAL);
di = iops->init(env, obj, 0, BYPASS_CAPA);
cfs_time_seconds(LFSCK_CHECKPOINT_INTERVAL);
di = iops->init(env, obj, 0, BYPASS_CAPA);
@@
-1429,8
+1423,8
@@
static int lfsck_namespace_double_scan(const struct lu_env *env,
lfsck_object_put(env, target);
checkpoint:
lfsck_object_put(env, target);
checkpoint:
- lfsck->li_new_scanned++;
com->lc_new_checked++;
com->lc_new_checked++;
+ com->lc_new_scanned++;
ns->ln_fid_latest_scanned_phase2 = fid;
if (rc > 0)
ns->ln_objs_repaired_phase2++;
ns->ln_fid_latest_scanned_phase2 = fid;
if (rc > 0)
ns->ln_objs_repaired_phase2++;
@@
-1448,13
+1442,13
@@
checkpoint:
if (rc < 0 && bk->lb_param & LPF_FAILOUT)
GOTO(put, rc);
if (rc < 0 && bk->lb_param & LPF_FAILOUT)
GOTO(put, rc);
- if (unlikely(cfs_time_beforeq(
lfsck->li
_time_next_checkpoint,
+ if (unlikely(cfs_time_beforeq(
com->lc
_time_next_checkpoint,
cfs_time_current())) &&
com->lc_new_checked != 0) {
down_write(&com->lc_sem);
ns->ln_run_time_phase2 +=
cfs_duration_sec(cfs_time_current() +
cfs_time_current())) &&
com->lc_new_checked != 0) {
down_write(&com->lc_sem);
ns->ln_run_time_phase2 +=
cfs_duration_sec(cfs_time_current() +
- HALF_SEC -
lfsck->li
_time_last_checkpoint);
+ HALF_SEC -
com->lc
_time_last_checkpoint);
ns->ln_time_last_checkpoint = cfs_time_current_sec();
ns->ln_objs_checked_phase2 += com->lc_new_checked;
com->lc_new_checked = 0;
ns->ln_time_last_checkpoint = cfs_time_current_sec();
ns->ln_objs_checked_phase2 += com->lc_new_checked;
com->lc_new_checked = 0;
@@
-1463,13
+1457,13
@@
checkpoint:
if (rc != 0)
GOTO(put, rc);
if (rc != 0)
GOTO(put, rc);
-
lfsck->li
_time_last_checkpoint = cfs_time_current();
-
lfsck->li
_time_next_checkpoint =
-
lfsck->li
_time_last_checkpoint +
+
com->lc
_time_last_checkpoint = cfs_time_current();
+
com->lc
_time_next_checkpoint =
+
com->lc
_time_last_checkpoint +
cfs_time_seconds(LFSCK_CHECKPOINT_INTERVAL);
}
cfs_time_seconds(LFSCK_CHECKPOINT_INTERVAL);
}
- lfsck_control_speed
(lfsck
);
+ lfsck_control_speed
_by_self(com
);
if (unlikely(!thread_is_running(thread)))
GOTO(put, rc = 0);
if (unlikely(!thread_is_running(thread)))
GOTO(put, rc = 0);
@@
-1495,8
+1489,7
@@
fini:
com->lc_journal = 0;
ns->ln_status = LS_COMPLETED;
if (!(bk->lb_param & LPF_DRYRUN))
com->lc_journal = 0;
ns->ln_status = LS_COMPLETED;
if (!(bk->lb_param & LPF_DRYRUN))
- ns->ln_flags &=
- ~(LF_SCANNED_ONCE | LF_INCONSISTENT | LF_UPGRADE);
+ ns->ln_flags &= ~(LF_SCANNED_ONCE | LF_INCONSISTENT);
ns->ln_time_last_complete = ns->ln_time_last_checkpoint;
ns->ln_success_count++;
} else if (rc == 0) {
ns->ln_time_last_complete = ns->ln_time_last_checkpoint;
ns->ln_success_count++;
} else if (rc == 0) {
@@
-1569,7
+1562,9
@@
int lfsck_namespace_setup(const struct lu_env *env,
if (IS_ERR(root))
GOTO(out, rc = PTR_ERR(root));
if (IS_ERR(root))
GOTO(out, rc = PTR_ERR(root));
- dt_try_as_dir(env, root);
+ if (unlikely(!dt_try_as_dir(env, root)))
+ GOTO(out, rc = -ENOTDIR);
+
obj = local_index_find_or_create(env, lfsck->li_los, root,
lfsck_namespace_name,
S_IFREG | S_IRUGO | S_IWUSR,
obj = local_index_find_or_create(env, lfsck->li_los, root,
lfsck_namespace_name,
S_IFREG | S_IRUGO | S_IWUSR,
@@
-1590,16
+1585,18
@@
int lfsck_namespace_setup(const struct lu_env *env,
if (rc != 0)
GOTO(out, rc);
if (rc != 0)
GOTO(out, rc);
- ns =
(struct lfsck_namespace *)
com->lc_file_ram;
+ ns = com->lc_file_ram;
switch (ns->ln_status) {
case LS_INIT:
case LS_COMPLETED:
case LS_FAILED:
case LS_STOPPED:
switch (ns->ln_status) {
case LS_INIT:
case LS_COMPLETED:
case LS_FAILED:
case LS_STOPPED:
+ spin_lock(&lfsck->li_lock);
cfs_list_add_tail(&com->lc_link, &lfsck->li_list_idle);
cfs_list_add_tail(&com->lc_link, &lfsck->li_list_idle);
+ spin_unlock(&lfsck->li_lock);
break;
default:
break;
default:
- CERROR("%s: unknown lfsck_namespace status: %u\n",
+ CERROR("%s: unknown lfsck_namespace status:
rc =
%u\n",
lfsck_lfsck2name(lfsck), ns->ln_status);
/* fall through */
case LS_SCANNING_PHASE1:
lfsck_lfsck2name(lfsck), ns->ln_status);
/* fall through */
case LS_SCANNING_PHASE1:
@@
-1611,8
+1608,10
@@
int lfsck_namespace_setup(const struct lu_env *env,
/* fall through */
case LS_PAUSED:
case LS_CRASHED:
/* fall through */
case LS_PAUSED:
case LS_CRASHED:
+ spin_lock(&lfsck->li_lock);
cfs_list_add_tail(&com->lc_link, &lfsck->li_list_scan);
cfs_list_add_tail(&com->lc_link_dir, &lfsck->li_list_dir);
cfs_list_add_tail(&com->lc_link, &lfsck->li_list_scan);
cfs_list_add_tail(&com->lc_link_dir, &lfsck->li_list_dir);
+ spin_unlock(&lfsck->li_lock);
break;
}
break;
}
git://git.whamcloud.com / fs / lustre-release.git / blobdiff