From da9596b490a4ec4659b585b1622a7718ed591291 Mon Sep 17 00:00:00 2001
From: alex <alex>
Date: Sun, 23 May 2004 16:22:08 +0000
Subject: [PATCH] - mdt_obj_create() understands a request which is part of
cross-node mkdir() recovery and looks for given ino/generation first. if no
ino/generation are given then it simple recreates new object and returns
ino/generation back to MDS holding a name. leaked inode is subject to
rollback mechanism that is to be implemented yet - when mds_reint_create()
is asked to replay cross-node mkdir() it signals this to MDS holding dir
inode and sends ino/generation couple if possible
NOTE: now cross-node mkdir() survives failure on any MDS node: holding the
name and holding the inode
---
lustre/mds/handler.c | 31 +++++++++++++++++++++++++++++--
lustre/mds/mds_reint.c | 10 ++++++++++
2 files changed, 39 insertions(+), 2 deletions(-)
diff --git a/lustre/mds/handler.c b/lustre/mds/handler.c
index d42bbc4db2..b660778f4b 100644
--- a/lustre/mds/handler.c
+++ b/lustre/mds/handler.c
@@ -1195,11 +1195,11 @@ static int mdt_obj_create(struct ptlrpc_request *req)
struct lustre_handle lockh;
struct obd_run_ctxt saved;
ldlm_policy_data_t policy;
+ struct dentry *new = NULL;
struct dentry_params dp;
int mealen, flags = 0;
unsigned int tmpname;
struct obd_ucred uc;
- struct dentry *new;
struct mea *mea;
void *handle;
ENTRY;
@@ -1226,7 +1226,33 @@ static int mdt_obj_create(struct ptlrpc_request *req)
repbody = lustre_msg_buf(req->rq_repmsg, 0, sizeof(*repbody));
-
+ if (body->oa.o_flags & OBD_FL_RECREATE_OBJS) {
+ /* this is re-create request from MDS holding directory name.
+ * we have to lookup given ino/generation first. if it exists
+ * (good case) then there is nothing to do. if it does not
+ * then we have to recreate it */
+ struct ll_fid fid;
+ fid.id = body->oa.o_id;
+ fid.generation = body->oa.o_generation;
+ new = mds_fid2dentry(mds, &fid, NULL);
+ if (!IS_ERR(new) && new->d_inode) {
+ CWARN("mkdir() repairing is on its way: %lu/%lu\n",
+ (unsigned long) fid.id,
+ (unsigned long) fid.generation);
+ obdo_from_inode(&repbody->oa, new->d_inode,
+ FILTER_VALID_FLAGS);
+ repbody->oa.o_id = new->d_inode->i_ino;
+ repbody->oa.o_generation = new->d_inode->i_generation;
+ repbody->oa.o_valid |= OBD_MD_FLID | OBD_MD_FLGENER;
+ GOTO(cleanup2, rc = 0);
+ }
+ CWARN("hmm. for some reason dir %lu/%lu (or reply) got lost\n",
+ (unsigned long) fid.id, (unsigned long) fid.generation);
+ LASSERT(new->d_inode == NULL ||
+ new->d_inode->i_generation != fid.generation);
+ l_dput(new);
+ }
+
down(&parent_inode->i_sem);
handle = fsfilt_start(obd, parent_inode, FSFILT_OP_MKDIR, NULL);
LASSERT(!IS_ERR(handle));
@@ -1314,6 +1340,7 @@ cleanup:
ptlrpc_save_lock(req, &lockh, LCK_EX);
else
ldlm_lock_decref(&lockh, LCK_EX);
+cleanup2:
l_dput(new);
pop_ctxt(&saved, &obd->obd_ctxt, &uc);
RETURN(rc);
diff --git a/lustre/mds/mds_reint.c b/lustre/mds/mds_reint.c
index 24c249fc4b..976e87e474 100644
--- a/lustre/mds/mds_reint.c
+++ b/lustre/mds/mds_reint.c
@@ -664,6 +664,16 @@ static int mds_reint_create(struct mds_update_record *rec, int offset,
oa->o_mode = dir->i_mode;
CDEBUG(D_OTHER, "%s: create dir on MDS %u\n",
obd->obd_name, i);
+ if (lustre_msg_get_flags(req->rq_reqmsg) & MSG_REPLAY) {
+ CWARN("%s: replay dir creation %*s -> %u/%u\n",
+ obd->obd_name, rec->ur_namelen - 1,
+ rec->ur_name, (unsigned) rec->ur_fid2->id,
+ (unsigned) rec->ur_fid2->generation);
+ oa->o_id = rec->ur_fid2->id;
+ oa->o_generation = rec->ur_fid2->generation;
+ oa->o_flags |= OBD_FL_RECREATE_OBJS;
+ }
+
rc = obd_create(mds->mds_lmv_exp, oa, NULL, NULL);
LASSERT(rc == 0);
--
GitLab