#include <lustre_fid.h>
#include "mdd_internal.h"
-static const char mdd_orphan_index_name[] = "PENDING";
+static const char mdd_orphan_index_name[] = MDT_ORPHAN_DIR;
static const char dotdot[] = "..";
enum {
LASSERT(mdd_write_locked(env, obj) != 0);
LASSERT(!(obj->mod_flags & ORPHAN_OBJ));
- dt_write_lock(env, mdd->mdd_orphans, MOR_TGT_ORPHAN);
+ dt_write_lock(env, mdd->mdd_orphans, DT_TGT_ORPHAN);
rc = mdd_orphan_insert_obj(env, mdd, obj, th);
if (rc)
if (rc)
return rc;
+ if (!mdd_object_exists(obj))
+ return -ENOENT;
+
rc = mdo_declare_ref_del(env, obj, th);
if (rc)
return rc;
- if (!lu_object_exists(&obj->mod_obj.mo_lu))
- return -ENOENT;
-
if (S_ISDIR(mdd_object_type(obj))) {
rc = mdo_declare_ref_del(env, obj, th);
if (rc)
struct mdd_device *mdd = mdo2mdd(&obj->mod_obj);
struct dt_object *dor = mdd->mdd_orphans;
struct dt_key *key;
- int rc;
+ int rc = 0;
ENTRY;
LASSERT(dor);
key = mdd_orphan_key_fill(env, mdo2fid(obj));
- dt_write_lock(env, mdd->mdd_orphans, MOR_TGT_ORPHAN);
+ dt_write_lock(env, mdd->mdd_orphans, DT_TGT_ORPHAN);
+
+ if (OBD_FAIL_CHECK(OBD_FAIL_MDS_ORPHAN_DELETE))
+ goto ref_del;
rc = dt_delete(env, mdd->mdd_orphans, key, th);
if (rc == -ENOENT) {
rc = dt_delete(env, mdd->mdd_orphans, key, th);
}
+ref_del:
if (!rc) {
/* lov objects will be destroyed by caller */
mdo_ref_del(env, obj, th);
{
struct thandle *th = NULL;
struct mdd_device *mdd = mdo2mdd(&obj->mod_obj);
+ bool orphan_exists = true;
int rc = 0;
ENTRY;
RETURN(rc);
}
+ mdd_write_lock(env, obj, DT_TGT_CHILD);
rc = mdd_orphan_declare_delete(env, obj, th);
- if (rc)
- GOTO(stop, rc);
-
- rc = mdo_declare_destroy(env, obj, th);
- if (rc)
- GOTO(stop, rc);
+ if (rc == -ENOENT)
+ orphan_exists = false;
+ else if (rc)
+ GOTO(unlock, rc);
+
+ if (orphan_exists) {
+ rc = mdo_declare_destroy(env, obj, th);
+ if (rc)
+ GOTO(unlock, rc);
+ }
rc = mdd_trans_start(env, mdd, th);
if (rc)
- GOTO(stop, rc);
+ GOTO(unlock, rc);
- mdd_write_lock(env, obj, MOR_TGT_CHILD);
if (likely(obj->mod_count == 0)) {
- dt_write_lock(env, mdd->mdd_orphans, MOR_TGT_ORPHAN);
+ dt_write_lock(env, mdd->mdd_orphans, DT_TGT_ORPHAN);
rc = dt_delete(env, mdd->mdd_orphans, key, th);
- if (rc == 0) {
+ if (rc == -ENOENT) {
+ key = mdd_orphan_key_fill_20(env, mdo2fid(obj));
+ rc = dt_delete(env, mdd->mdd_orphans, key, th);
+ }
+ if (rc) {
+ CERROR("%s: could not delete orphan "DFID": rc = %d\n",
+ mdd2obd_dev(mdd)->obd_name, PFID(mdo2fid(obj)),
+ rc);
+ } else if (orphan_exists) {
mdo_ref_del(env, obj, th);
if (S_ISDIR(mdd_object_type(obj))) {
mdo_ref_del(env, obj, th);
}
rc = mdo_destroy(env, obj, th);
} else {
- CERROR("%s: could not delete orphan "DFID": rc = %d\n",
- mdd2obd_dev(mdd)->obd_name, PFID(mdo2fid(obj)),
- rc);
+ CWARN("%s: orphan %s "DFID" doesn't exist\n",
+ mdd2obd_dev(mdd)->obd_name, (char *)key,
+ PFID(mdo2fid(obj)));
}
dt_write_unlock(env, mdd->mdd_orphans);
}
+unlock:
mdd_write_unlock(env, obj);
-stop:
rc = mdd_trans_stop(env, mdd, 0, th);
RETURN(rc);
if (mdo->mod_count == 0) {
CDEBUG(D_HA, "Found orphan "DFID", delete it\n", PFID(lf));
rc = mdd_orphan_destroy(env, mdo, key);
- if (rc) /* so replay-single.sh test_37 works */
+ if (rc) /* below message checked in replay-single.sh test_37 */
CERROR("%s: error unlinking orphan "DFID": rc = %d\n",
mdd2obd_dev(mdd)->obd_name, PFID(lf), rc);
} else {
- mdd_write_lock(env, mdo, MOR_TGT_CHILD);
+ mdd_write_lock(env, mdo, DT_TGT_CHILD);
if (likely(mdo->mod_count > 0)) {
CDEBUG(D_HA, "Found orphan "DFID" count %d, skip it\n",
PFID(lf), mdo->mod_count);