char *key = mdd_env_info(env)->mti_key;
LASSERT(key);
- snprintf(key, sizeof(mdd_env_info(env)->mti_key),
- DFID_NOBRACE, PFID(lf));
+ if (!(MTI_KEEP_KEY & mdd_env_info(env)->mti_flags))
+ snprintf(key, sizeof(mdd_env_info(env)->mti_key),
+ DFID_NOBRACE, PFID(lf));
return (struct dt_key *)key;
}
char *key = mdd_env_info(env)->mti_key;
LASSERT(key);
- snprintf(key, sizeof(mdd_env_info(env)->mti_key),
- ORPHAN_FILE_NAME_FORMAT_20,
- fid_seq(lf), fid_oid(lf), fid_ver(lf), ORPH_OP_UNLINK);
+ if (!(MTI_KEEP_KEY & mdd_env_info(env)->mti_flags))
+ snprintf(key, sizeof(mdd_env_info(env)->mti_key),
+ ORPHAN_FILE_NAME_FORMAT_20,
+ fid_seq(lf), fid_oid(lf), fid_ver(lf),
+ ORPH_OP_UNLINK);
return (struct dt_key *)key;
}
struct thandle *th = NULL;
struct mdd_device *mdd = mdo2mdd(&obj->mod_obj);
bool orphan_exists = true;
- int rc = 0;
+ int rc = 0, rc1 = 0;
ENTRY;
th = mdd_trans_create(env, mdd);
if (likely(obj->mod_count == 0)) {
dt_write_lock(env, mdd->mdd_orphans, DT_TGT_ORPHAN);
rc = dt_delete(env, mdd->mdd_orphans, key, th);
- if (rc == -ENOENT) {
- key = mdd_orphan_key_fill_20(env, mdd_object_fid(obj));
- rc = dt_delete(env, mdd->mdd_orphans, key, th);
- }
- if (rc) {
- CERROR("%s: could not delete orphan "DFID": rc = %d\n",
- mdd_obj_dev_name(obj),
- PFID(mdd_object_fid(obj)), rc);
- } else if (orphan_exists) {
+ /* We should remove object even dt_delete failed */
+ if (orphan_exists) {
mdo_ref_del(env, obj, th);
if (S_ISDIR(mdd_object_type(obj))) {
mdo_ref_del(env, obj, th);
dt_ref_del(env, mdd->mdd_orphans, th);
}
- rc = mdo_destroy(env, obj, th);
- } else {
- CWARN("%s: orphan %s "DFID" doesn't exist\n",
- mdd_obj_dev_name(obj), (char *)key,
- PFID(mdd_object_fid(obj)));
+ rc1 = mdo_destroy(env, obj, th);
}
dt_write_unlock(env, mdd->mdd_orphans);
}
unlock:
mdd_write_unlock(env, obj);
+ mdd_trans_stop(env, mdd, 0, th);
- rc = mdd_trans_stop(env, mdd, 0, th);
-
- RETURN(rc);
+ RETURN(rc ? rc : rc1);
}
/**
struct lu_fid fid;
int key_sz = 0;
int rc;
- __u64 cookie;
ENTRY;
iops = &dor->do_index_ops->dio_it;
GOTO(out_put, rc = -EIO);
}
+ mdd_env_info(env)->mti_flags |= MTI_KEEP_KEY;
do {
if (thread->mgt_abort)
break;
}
/* kill orphan object */
- cookie = iops->store(env, it);
iops->put(env, it);
rc = mdd_orphan_key_test_and_delete(env, mdd, &fid,
(struct dt_key *)ent->lde_name);
-
/* after index delete reset iterator */
if (rc == 0)
rc = iops->get(env, it, (const void *)"");
- else
- rc = iops->load(env, it, cookie);
next:
rc = iops->next(env, it);
} while (rc == 0);
}
run_test 141 "do not lose locks on MGS restart"
+test_142() {
+ [ $MDS1_VERSION -lt $(version_code 2.11.56) ] &&
+ skip "Need MDS version at least 2.11.56"
+
+ #define OBD_FAIL_MDS_ORPHAN_DELETE 0x165
+ do_facet mds1 $LCTL set_param fail_loc=0x165
+ $MULTIOP $DIR/$tfile Ouc || error "multiop failed"
+
+ stop mds1
+ start mds1 $(mdsdevname 1) $MDS_MOUNT_OPTS
+
+ wait_update_facet mds1 "pgrep orph_.*-MDD | wc -l" "0" ||
+ error "MDD orphan cleanup thread not quit"
+}
+run_test 142 "orphan name stub can be cleaned up in startup"
+
+test_143() {
+ [ $(lustre_version_code $SINGLEMDS) -lt $(version_code 2.13.00) ] &&
+ skip "Need MDS version at least 2.13.00"
+ [ $PARALLEL == "yes" ] && skip "skip parallel run"
+
+ local mntpt=$(facet_mntpt $SINGLEMDS)
+ stop mds1
+ mount_fstype $SINGLEMDS || error "mount as fstype $SINGLEMDS failed"
+ do_facet $SINGLEMDS touch $mntpt/PENDING/$tfile
+ unmount_fstype $SINGLEMDS
+ start mds1 $(mdsdevname 1) $MDS_MOUNT_OPTS || error "mds1 start fail"
+
+ wait_recovery_complete $SINGLEMDS || error "MDS recovery not done"
+ wait_update_facet mds1 "pgrep orph_.*-MDD | wc -l" "0" ||
+ error "MDD orphan cleanup thread not quit"
+}
+run_test 143 "orphan cleanup thread shouldn't be blocked even delete failed"
+
complete $SECONDS
check_and_cleanup_lustre
exit_status