/* These exports are cleaned up by mds_disconnect(), so they
* need to be set up like real exports as mds_connect() does.
*/
- CDEBUG(D_HA, "RCVRNG CLIENT uuid: %s idx: %d lr: "LPU64
- " srv lr: "LPU64"\n", mcd->mcd_uuid, cl_idx,
- last_transno, le64_to_cpu(msd->msd_last_transno));
+ CDEBUG(D_HA|D_WARNING,"RCVRNG CLIENT uuid: %s idx: %d lr: "LPU64
+ " srv lr: "LPU64" lx: "LPU64"\n", mcd->mcd_uuid, cl_idx,
+ last_transno, le64_to_cpu(msd->msd_last_transno),
+ mcd->mcd_last_xid);
exp = class_new_export(obd);
if (exp == NULL)
if (last_transno > mds->mds_last_transno)
mds->mds_last_transno = last_transno;
}
-
+ if (mcd)
+ OBD_FREE(mcd, sizeof(*mcd));
obd->obd_last_committed = mds->mds_last_transno;
if (obd->obd_recoverable_clients) {
CWARN("RECOVERY: service %s, %d recoverable clients, "
obd->obd_recoverable_clients, mds->mds_last_transno);
obd->obd_next_recovery_transno = obd->obd_last_committed + 1;
target_start_recovery_thread(obd, mds_handle);
+ obd->obd_recovery_start = LTIME_S(CURRENT_TIME);
}
-
- if (mcd)
- OBD_FREE(mcd, sizeof(*mcd));
mds->mds_mount_count = mount_count + 1;
msd->msd_mount_count = cpu_to_le64(mds->mds_mount_count);
/* save it, so mount count and last_transno is current */
rc = mds_update_server_data(obd, 1);
+ if (rc)
+ GOTO(err_client, rc);
- RETURN(rc);
+ RETURN(0);
err_client:
class_disconnect_exports(obd, 0);
" be preserved.\n", obd->obd_name);
class_disconnect_exports(obd, flags); /* cleans up client info too */
+ target_cleanup_recovery(obd);
mds_server_free_data(mds);
push_ctxt(&saved, &obd->obd_lvfs_ctxt, NULL);
{
struct mds_obd *mds = &exp->exp_obd->u.mds;
struct inode *parent_inode = mds->mds_objects_dir->d_inode;
- unsigned int tmpname = ll_insecure_random_int();
struct file *filp;
struct dentry *dchild;
struct lvfs_run_ctxt saved;
int rc = 0, err, namelen;
ENTRY;
+ push_ctxt(&saved, &exp->exp_obd->obd_lvfs_ctxt, NULL);
+ down(&parent_inode->i_sem);
if (oa->o_id) {
- push_ctxt(&saved, &exp->exp_obd->obd_lvfs_ctxt, NULL);
-
namelen = ll_fid2str(fidname, oa->o_id, oa->o_generation);
-
- down(&parent_inode->i_sem);
+
dchild = lookup_one_len(fidname, mds->mds_objects_dir, namelen);
- if (IS_ERR(dchild)) {
- up(&parent_inode->i_sem);
+ if (IS_ERR(dchild))
GOTO(out_pop, rc = PTR_ERR(dchild));
- }
+
if (dchild->d_inode == NULL) {
struct dentry_params dp;
struct inode *inode;
-
+
+ CWARN("creating log with ID "LPU64"\n", oa->o_id);
+
dchild->d_fsdata = (void *) &dp;
dp.p_ptr = NULL;
dp.p_inum = oa->o_id;
if (rc) {
CDEBUG(D_INODE, "err during create: %d\n", rc);
dput(dchild);
- up(&parent_inode->i_sem);
GOTO(out_pop, rc);
}
inode = dchild->d_inode;
GOTO(out_pop, rc);
}
- push_ctxt(&saved, &exp->exp_obd->obd_lvfs_ctxt, NULL);
-
- sprintf(fidname, "OBJECTS/%u", tmpname);
+ sprintf(fidname, "OBJECTS/%u.%u",ll_insecure_random_int(),current->pid);
filp = filp_open(fidname, O_CREAT | O_EXCL, 0644);
if (IS_ERR(filp)) {
rc = PTR_ERR(filp);
if (rc == -EEXIST) {
- CERROR("impossible object name collision %u\n",
- tmpname);
+ CERROR("impossible object name collision %s\n",
+ fidname);
LBUG();
}
- CERROR("error creating tmp object %u: rc %d\n", tmpname, rc);
+ CERROR("error creating tmp object %s: rc %d\n", fidname, rc);
GOTO(out_pop, rc);
}
oa->o_id = filp->f_dentry->d_inode->i_ino;
oa->o_generation = filp->f_dentry->d_inode->i_generation;
namelen = ll_fid2str(fidname, oa->o_id, oa->o_generation);
+ CWARN("created log anonymous "LPU64"/%u\n", oa->o_id, oa->o_generation);
- down(&parent_inode->i_sem);
dchild = lookup_one_len(fidname, mds->mds_objects_dir, namelen);
if (IS_ERR(dchild)) {
if (!err) {
oa->o_gr = FILTER_GROUP_FIRST_MDS + mds->mds_num;
oa->o_valid |= OBD_MD_FLID | OBD_MD_FLGENER | OBD_MD_FLGROUP;
- }
- else if (!rc)
+ } else if (!rc)
rc = err;
out_dput:
dput(dchild);
out_close:
- up(&parent_inode->i_sem);
err = filp_close(filp, 0);
if (err) {
- CERROR("closing tmpfile %u: rc %d\n", tmpname, rc);
+ CERROR("closing tmpfile %s: rc %d\n", fidname, rc);
if (!rc)
rc = err;
}
out_pop:
+ up(&parent_inode->i_sem);
pop_ctxt(&saved, &exp->exp_obd->obd_lvfs_ctxt, NULL);
RETURN(rc);
}
down(&parent_inode->i_sem);
de = lookup_one_len(fidname, mds->mds_objects_dir, namelen);
- if (de == NULL || de->d_inode == NULL) {
- CERROR("destroying non-existent object "LPU64" %s\n",
- oa->o_id, fidname);
- GOTO(out_dput, rc = IS_ERR(de) ? PTR_ERR(de) : -ENOENT);
+ if (IS_ERR(de) || de->d_inode == NULL) {
+ rc = IS_ERR(de) ? PTR_ERR(de) : -ENOENT;
+ CERROR("destroying non-existent object "LPU64" %s: rc %d\n",
+ oa->o_id, fidname, rc);
+ GOTO(out_dput, rc);
}
-
/* Stripe count is 1 here since this is some MDS specific stuff
that is unlinked, not spanned across multiple OSTs */
handle = fsfilt_start_log(obd, mds->mds_objects_dir->d_inode,