}
}
+static int lfsck_layout_trans_stop(const struct lu_env *env,
+ struct dt_device *dev,
+ struct thandle *handle, int result)
+{
+ int rc;
+
+ handle->th_result = result;
+ rc = dt_trans_stop(env, dev, handle);
+ if (rc > 0)
+ rc = 0;
+ else if (rc == 0)
+ rc = 1;
+
+ return rc;
+}
+
static int lfsck_layout_scan_orphan(const struct lu_env *env,
struct lfsck_component *com,
struct lfsck_tgt_desc *ltd)
return 0;
}
+/* For the MDT-object with dangling reference, we need to re-create
+ * the missed OST-object with the known FID/owner information. */
+static int lfsck_layout_recreate_ostobj(const struct lu_env *env,
+ struct lfsck_component *com,
+ struct lfsck_layout_req *llr,
+ struct lu_attr *la)
+{
+ struct lfsck_thread_info *info = lfsck_env_info(env);
+ struct filter_fid *pfid = &info->lti_new_pfid;
+ struct dt_allocation_hint *hint = &info->lti_hint;
+ struct dt_object *parent = llr->llr_parent->llo_obj;
+ struct dt_object *child = llr->llr_child;
+ struct dt_device *dev = lfsck_obj2dt_dev(child);
+ const struct lu_fid *tfid = lu_object_fid(&parent->do_lu);
+ struct thandle *handle;
+ struct lu_buf *buf;
+ struct lustre_handle lh = { 0 };
+ int rc;
+ ENTRY;
+
+ CDEBUG(D_LFSCK, "Repair dangling reference for: parent "DFID
+ ", child "DFID", OST-index %u, stripe-index %u, owner %u:%u\n",
+ PFID(lfsck_dto2fid(parent)), PFID(lfsck_dto2fid(child)),
+ llr->llr_ost_idx, llr->llr_lov_idx, la->la_uid, la->la_gid);
+
+ rc = lfsck_layout_lock(env, com, parent, &lh,
+ MDS_INODELOCK_LAYOUT | MDS_INODELOCK_XATTR);
+ if (rc != 0)
+ RETURN(rc);
+
+ handle = dt_trans_create(env, dev);
+ if (IS_ERR(handle))
+ GOTO(unlock1, rc = PTR_ERR(handle));
+
+ hint->dah_parent = NULL;
+ hint->dah_mode = 0;
+ pfid->ff_parent.f_seq = cpu_to_le64(tfid->f_seq);
+ pfid->ff_parent.f_oid = cpu_to_le32(tfid->f_oid);
+ pfid->ff_parent.f_ver = cpu_to_le32(llr->llr_lov_idx);
+ buf = lfsck_buf_get(env, pfid, sizeof(struct filter_fid));
+
+ rc = dt_declare_create(env, child, la, hint, NULL, handle);
+ if (rc != 0)
+ GOTO(stop, rc);
+
+ rc = dt_declare_xattr_set(env, child, buf, XATTR_NAME_FID,
+ LU_XATTR_CREATE, handle);
+ if (rc != 0)
+ GOTO(stop, rc);
+
+ rc = dt_trans_start(env, dev, handle);
+ if (rc != 0)
+ GOTO(stop, rc);
+
+ dt_read_lock(env, parent, 0);
+ if (unlikely(lu_object_is_dying(parent->do_lu.lo_header)))
+ GOTO(unlock2, rc = 1);
+
+ rc = dt_create(env, child, la, hint, NULL, handle);
+ if (rc != 0)
+ GOTO(unlock2, rc);
+
+ rc = dt_xattr_set(env, child, buf, XATTR_NAME_FID, LU_XATTR_CREATE,
+ handle, BYPASS_CAPA);
+
+ GOTO(unlock2, rc);
+
+unlock2:
+ dt_read_unlock(env, parent);
+
+stop:
+ rc = lfsck_layout_trans_stop(env, dev, handle, rc);
+
+unlock1:
+ lfsck_layout_unlock(&lh);
+
+ return rc;
+}
+
+static int lfsck_layout_assistant_handle_one(const struct lu_env *env,
+ struct lfsck_component *com,
+ struct lfsck_layout_req *llr)
+{
+ struct lfsck_layout *lo = com->lc_file_ram;
+ struct lfsck_thread_info *info = lfsck_env_info(env);
+ struct dt_object *parent = llr->llr_parent->llo_obj;
+ struct dt_object *child = llr->llr_child;
+ struct lu_attr *pla = &info->lti_la;
+ struct lu_attr *cla = &info->lti_la2;
+ struct lfsck_instance *lfsck = com->lc_lfsck;
+ struct lfsck_bookmark *bk = &lfsck->li_bookmark_ram;
+ enum lfsck_layout_inconsistency_type type = LLIT_NONE;
+ int rc;
+ ENTRY;
+
+ rc = dt_attr_get(env, parent, pla, BYPASS_CAPA);
+ if (rc != 0) {
+ if (lu_object_is_dying(parent->do_lu.lo_header))
+ RETURN(0);
+
+ GOTO(out, rc);
+ }
+
+ rc = dt_attr_get(env, child, cla, BYPASS_CAPA);
+ if (rc == -ENOENT) {
+ if (lu_object_is_dying(parent->do_lu.lo_header))
+ RETURN(0);
+
+ type = LLIT_DANGLING;
+ goto repair;
+ }
+
+ if (rc != 0)
+ GOTO(out, rc);
+
+ /* XXX: other inconsistency will be checked in other patches. */
+
+repair:
+ if (bk->lb_param & LPF_DRYRUN) {
+ if (type != LLIT_NONE)
+ GOTO(out, rc = 1);
+ else
+ GOTO(out, rc = 0);
+ }
+
+ switch (type) {
+ case LLIT_DANGLING:
+ memset(cla, 0, sizeof(*cla));
+ cla->la_uid = pla->la_uid;
+ cla->la_gid = pla->la_gid;
+ cla->la_mode = S_IFREG | 0666;
+ cla->la_valid = LA_TYPE | LA_MODE | LA_UID | LA_GID |
+ LA_ATIME | LA_MTIME | LA_CTIME;
+ rc = lfsck_layout_recreate_ostobj(env, com, llr, cla);
+ break;
+
+ /* XXX: other inconsistency will be fixed in other patches. */
+
+ case LLIT_UNMATCHED_PAIR:
+ break;
+ case LLIT_MULTIPLE_REFERENCED:
+ break;
+ case LLIT_INCONSISTENT_OWNER:
+ break;
+ default:
+ rc = 0;
+ break;
+ }
+
+ GOTO(out, rc);
+
+out:
+ down_write(&com->lc_sem);
+ if (rc < 0) {
+ /* If cannot touch the target server,
+ * mark the LFSCK as INCOMPLETE. */
+ if (rc == -ENOTCONN || rc == -ESHUTDOWN || rc == -ETIMEDOUT ||
+ rc == -EHOSTDOWN || rc == -EHOSTUNREACH) {
+ lo->ll_flags |= LF_INCOMPLETE;
+ lo->ll_objs_skipped++;
+ rc = 0;
+ } else {
+ lo->ll_objs_failed_phase1++;
+ }
+ } else if (rc > 0) {
+ LASSERTF(type > LLIT_NONE && type <= LLIT_MAX,
+ "unknown type = %d\n", type);
+
+ lo->ll_objs_repaired[type - 1]++;
+ }
+ up_write(&com->lc_sem);
+
+ return rc;
+}
+
static int lfsck_layout_assistant(void *args)
{
struct lfsck_thread_args *lta = args;
if (unlikely(llmd->llmd_exit))
GOTO(cleanup1, rc = llmd->llmd_post_result);
- /* XXX: To be extended in other patch.
- *
- * Compare the OST side attribute with local attribute,
- * and fix it if found inconsistency. */
-
- spin_lock(&llmd->llmd_lock);
llr = list_entry(llmd->llmd_req_list.next,
struct lfsck_layout_req,
llr_list);
+ /* Only the lfsck_layout_assistant thread itself can
+ * remove the "llr" from the head of the list, LFSCK
+ * engine thread only inserts other new "lld" at the
+ * end of the list. So it is safe to handle current
+ * "llr" without the spin_lock. */
+ rc = lfsck_layout_assistant_handle_one(env, com, llr);
+ spin_lock(&llmd->llmd_lock);
list_del_init(&llr->llr_list);
if (bk->lb_async_windows != 0 &&
llmd->llmd_prefetched >= bk->lb_async_windows)
wake_up_all(&mthread->t_ctl_waitq);
lfsck_layout_req_fini(env, llr);
+ if (rc < 0 && bk->lb_param & LPF_FAILOUT)
+ GOTO(cleanup1, rc);
}
/* Wakeup the master engine if it is waiting in checkpoint. */
cleanup1:
/* Cleanup the unfinished requests. */
spin_lock(&llmd->llmd_lock);
+ if (rc < 0)
+ llmd->llmd_assistant_status = rc;
+
while (!list_empty(&llmd->llmd_req_list)) {
llr = list_entry(llmd->llmd_req_list.next,
struct lfsck_layout_req,
__u16 gen;
ENTRY;
- buf = lfsck_buf_get(env, &info->lti_pfid,
+ buf = lfsck_buf_get(env, &info->lti_old_pfid,
sizeof(struct filter_fid_old));
count = le16_to_cpu(lmm->lmm_stripe_count);
gen = le16_to_cpu(lmm->lmm_layout_gen);
static const char dot[] = ".";
static const char dotdot[] = "..";
-static int osp_md_declare_object_create(const struct lu_env *env,
- struct dt_object *dt,
- struct lu_attr *attr,
- struct dt_allocation_hint *hint,
- struct dt_object_format *dof,
- struct thandle *th)
+int osp_md_declare_object_create(const struct lu_env *env,
+ struct dt_object *dt,
+ struct lu_attr *attr,
+ struct dt_allocation_hint *hint,
+ struct dt_object_format *dof,
+ struct thandle *th)
{
struct osp_thread_info *osi = osp_env_info(env);
struct update_request *update;
}
osi->osi_obdo.o_valid = 0;
- LASSERT(S_ISDIR(attr->la_mode));
obdo_from_la(&osi->osi_obdo, attr, attr->la_valid);
lustre_set_wire_obdo(NULL, &osi->osi_obdo, &osi->osi_obdo);
obdo_cpu_to_le(&osi->osi_obdo, &osi->osi_obdo);
return rc;
}
-static int osp_md_object_create(const struct lu_env *env, struct dt_object *dt,
- struct lu_attr *attr,
- struct dt_allocation_hint *hint,
- struct dt_object_format *dof,
- struct thandle *th)
+int osp_md_object_create(const struct lu_env *env, struct dt_object *dt,
+ struct lu_attr *attr, struct dt_allocation_hint *hint,
+ struct dt_object_format *dof, struct thandle *th)
{
struct osp_object *obj = dt2osp_obj(dt);
* if creation reaches here, it means the object has been created
* successfully */
dt->do_lu.lo_header->loh_attr |= LOHA_EXISTS | (attr->la_mode & S_IFMT);
- obj->opo_empty = 1;
+ if (S_ISDIR(attr->la_mode))
+ obj->opo_empty = 1;
return 0;
}
ALWAYS_EXCEPT="$ALWAYS_EXCEPT 2c"
[[ $(lustre_version_code ost1) -lt $(version_code 2.5.50) ]] &&
- ALWAYS_EXCEPT="$ALWAYS_EXCEPT 11 12 13"
+ ALWAYS_EXCEPT="$ALWAYS_EXCEPT 11 12 13 14"
build_test_filter
}
run_test 13 "LFSCK can repair crashed lmm_oi"
+test_14() {
+ echo "#####"
+ echo "The OST-object referenced by the MDT-object should be there;"
+ echo "otherwise, the LFSCK should re-create the missed OST-object."
+ echo "#####"
+
+ echo "stopall"
+ stopall > /dev/null
+ echo "formatall"
+ formatall > /dev/null
+ echo "setupall"
+ setupall > /dev/null
+
+ mkdir -p $DIR/$tdir
+ $LFS setstripe -c 1 -i 0 $DIR/$tdir
+
+ echo "Inject failure stub to simulate dangling referenced MDT-object"
+ #define OBD_FAIL_LFSCK_DANGLING 0x1610
+ do_facet ost1 $LCTL set_param fail_loc=0x1610
+ createmany -o $DIR/$tdir/f 64
+ do_facet ost1 $LCTL set_param fail_loc=0
+
+ echo "stopall to cleanup object cache"
+ stopall > /dev/null
+ echo "setupall"
+ setupall > /dev/null
+
+ echo "'ls' should fail because of dangling referenced MDT-object"
+ ls -ail $DIR/$tdir > /dev/null 2>&1 && error "(1) ls should fail."
+
+ echo "Trigger layout LFSCK to find out dangling reference and fix them"
+ $START_LAYOUT || error "(2) Fail to start LFSCK for layout!"
+
+ wait_update_facet $SINGLEMDS "$LCTL get_param -n \
+ mdd.${MDT_DEV}.lfsck_layout |
+ awk '/^status/ { print \\\$2 }'" "completed" 6 || return 3
+
+ local repaired=$($SHOW_LAYOUT |
+ awk '/^repaired_dangling/ { print $2 }')
+ [ $repaired -eq 32 ] ||
+ error "(4) Fail to repair dangling reference: $repaired"
+
+ echo "'ls' should success after layout LFSCK repairing"
+ ls -ail $DIR/$tdir > /dev/null || error "(5) ls should success."
+}
+run_test 14 "LFSCK can repair MDT-object with dangling reference"
+
$LCTL set_param debug=-lfsck > /dev/null || true
# restore MDS/OST size
git://git.whamcloud.com / fs / lustre-release.git / commitdiff