X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Fmgs%2Fmgs_nids.c;h=6141a0093783c3a11fe7c3a5f3a8e71b8694f94b;hb=c52d48bf7838c8d9a886a8865017e150e294d91c;hp=d62f6001a9783a26fd1c66edb7db6ed58b2ee4d9;hpb=aa37f159e721723c3a719592c4d75df4c774b46c;p=fs%2Flustre-release.git diff --git a/lustre/mgs/mgs_nids.c b/lustre/mgs/mgs_nids.c index d62f600..6141a00 100644 --- a/lustre/mgs/mgs_nids.c +++ b/lustre/mgs/mgs_nids.c @@ -49,7 +49,6 @@ #include #include -#include #include #include "mgs_internal.h" @@ -230,79 +229,94 @@ static int nidtbl_update_version(const struct lu_env *env, struct mgs_device *mgs, struct mgs_nidtbl *tbl) { - struct lvfs_run_ctxt saved; - struct file *file = NULL; - char filename[sizeof(MGS_NIDTBL_DIR) + 9]; - u64 version; - loff_t off = 0; - int rc; - struct obd_device *obd = tbl->mn_fsdb->fsdb_obd; + struct dt_object *fsdb; + struct thandle *th; + u64 version; + struct lu_buf buf = { + .lb_buf = &version, + .lb_len = sizeof(version) + }; + loff_t off = 0; + int rc; ENTRY; - LASSERT(cfs_mutex_is_locked(&tbl->mn_lock)); - LASSERT(sizeof(filename) < 32); - - sprintf(filename, "%s/%s", - MGS_NIDTBL_DIR, tbl->mn_fsdb->fsdb_name); - - push_ctxt(&saved, &obd->obd_lvfs_ctxt, NULL); - - file = l_filp_open(filename, O_RDWR|O_CREAT, 0660); - if (!IS_ERR(file)) { - version = cpu_to_le64(tbl->mn_version); - rc = lustre_fwrite(file, &version, sizeof(version), &off); - if (rc == sizeof(version)) - rc = 0; - filp_close(file, 0); - fsfilt_sync(obd, obd->u.mgs.mgs_sb); - } else { - rc = PTR_ERR(file); - } + LASSERT(cfs_mutex_is_locked(&tbl->mn_lock)); - pop_ctxt(&saved, &obd->obd_lvfs_ctxt, NULL); - RETURN(rc); + fsdb = local_file_find_or_create(env, mgs->mgs_los, mgs->mgs_nidtbl_dir, + tbl->mn_fsdb->fsdb_name, + S_IFREG | S_IRUGO | S_IWUSR); + if (IS_ERR(fsdb)) + RETURN(PTR_ERR(fsdb)); + + th = dt_trans_create(env, mgs->mgs_bottom); + if (IS_ERR(th)) + GOTO(out_put, rc = PTR_ERR(th)); + + th->th_sync = 1; /* update table synchronously */ + rc = dt_declare_record_write(env, fsdb, buf.lb_len, off, th); + if (rc) + GOTO(out, rc); + + rc = dt_trans_start_local(env, mgs->mgs_bottom, th); + if (rc) + GOTO(out, rc); + + version = cpu_to_le64(tbl->mn_version); + rc = dt_record_write(env, fsdb, &buf, &off, th); + +out: + dt_trans_stop(env, mgs->mgs_bottom, th); +out_put: + lu_object_put(env, &fsdb->do_lu); + RETURN(rc); } #define MGS_NIDTBL_VERSION_INIT 2 static int nidtbl_read_version(const struct lu_env *env, - struct mgs_device *mgs, struct mgs_nidtbl *tbl) + struct mgs_device *mgs, struct mgs_nidtbl *tbl, + u64 *version) { - struct lvfs_run_ctxt saved; - struct file *file = NULL; - char filename[sizeof(MGS_NIDTBL_DIR) + 9]; - u64 version; + struct dt_object *fsdb; + struct lu_fid fid; + u64 tmpver; + struct lu_buf buf = { + .lb_buf = &tmpver, + .lb_len = sizeof(tmpver) + }; loff_t off = 0; int rc; - struct obd_device *obd = tbl->mn_fsdb->fsdb_obd; ENTRY; LASSERT(cfs_mutex_is_locked(&tbl->mn_lock)); - LASSERT(sizeof(filename) < 32); - - sprintf(filename, "%s/%s", - MGS_NIDTBL_DIR, tbl->mn_fsdb->fsdb_name); - - push_ctxt(&saved, &obd->obd_lvfs_ctxt, NULL); - - file = l_filp_open(filename, O_RDONLY, 0); - if (!IS_ERR(file)) { - rc = lustre_fread(file, &version, sizeof(version), &off); - if (rc == sizeof(version)) - rc = cpu_to_le64(version); - else if (rc == 0) - rc = MGS_NIDTBL_VERSION_INIT; - else - CERROR("read version file %s error %d\n", filename, rc); - filp_close(file, 0); - } else { - rc = PTR_ERR(file); - if (rc == -ENOENT) - rc = MGS_NIDTBL_VERSION_INIT; - } - pop_ctxt(&saved, &obd->obd_lvfs_ctxt, NULL); - RETURN(rc); + LASSERT(mgs->mgs_nidtbl_dir); + rc = dt_lookup_dir(env, mgs->mgs_nidtbl_dir, tbl->mn_fsdb->fsdb_name, + &fid); + if (rc == -ENOENT) { + *version = MGS_NIDTBL_VERSION_INIT; + RETURN(0); + } else if (rc < 0) { + RETURN(rc); + } + + fsdb = dt_locate_at(env, mgs->mgs_bottom, &fid, + &mgs->mgs_dt_dev.dd_lu_dev); + if (IS_ERR(fsdb)) + RETURN(PTR_ERR(fsdb)); + + rc = dt_read(env, fsdb, &buf, &off); + if (rc == buf.lb_len) { + *version = le64_to_cpu(tmpver); + rc = 0; + } else if (rc == 0) { + *version = MGS_NIDTBL_VERSION_INIT; + } else { + CERROR("%s: read version file %s error %d\n", + mgs->mgs_obd->obd_name, tbl->mn_fsdb->fsdb_name, rc); + } + lu_object_put(env, &fsdb->do_lu); + RETURN(rc); } static int mgs_nidtbl_write(const struct lu_env *env, struct fs_db *fsdb, @@ -378,17 +392,23 @@ static void mgs_nidtbl_fini_fs(struct fs_db *fsdb) static int mgs_nidtbl_init_fs(const struct lu_env *env, struct fs_db *fsdb) { struct mgs_nidtbl *tbl = &fsdb->fsdb_nidtbl; + int rc; CFS_INIT_LIST_HEAD(&tbl->mn_targets); cfs_mutex_init(&tbl->mn_lock); tbl->mn_nr_targets = 0; tbl->mn_fsdb = fsdb; cfs_mutex_lock(&tbl->mn_lock); - tbl->mn_version = nidtbl_read_version(env, fsdb->fsdb_mgs, tbl); + rc = nidtbl_read_version(env, fsdb->fsdb_mgs, tbl, &tbl->mn_version); cfs_mutex_unlock(&tbl->mn_lock); - CDEBUG(D_MGS, "IR: current version is %llu\n", tbl->mn_version); - - return 0; + if (rc < 0) + CERROR("%s: IR: failed to read current version, rc = %d\n", + fsdb->fsdb_mgs->mgs_obd->obd_name, rc); + else + CDEBUG(D_MGS, "IR: current version is %llu\n", + tbl->mn_version); + + return rc; } /* --------- Imperative Recovery relies on nidtbl stuff ------- */ @@ -464,7 +484,6 @@ int mgs_ir_init_fs(const struct lu_env *env, struct mgs_device *mgs, CFS_INIT_LIST_HEAD(&fsdb->fsdb_clients); /* start notify thread */ - fsdb->fsdb_obd = mgs->mgs_obd; fsdb->fsdb_mgs = mgs; cfs_atomic_set(&fsdb->fsdb_notify_phase, 0); cfs_waitq_init(&fsdb->fsdb_notify_waitq); @@ -671,15 +690,13 @@ int mgs_get_ir_logs(struct ptlrpc_request *req) ptlrpc_free_bulk(desc); out: - if (pages) { - for (i = 0; i < nrpages; i++) { - if (pages[i] == NULL) - break; - cfs_free_page(pages[i]); - } - OBD_FREE(pages, sizeof(*pages) * nrpages); - } - return rc; + for (i = 0; i < nrpages; i++) { + if (pages[i] == NULL) + break; + cfs_free_page(pages[i]); + } + OBD_FREE(pages, sizeof(*pages) * nrpages); + return rc; } static int lprocfs_ir_set_state(struct fs_db *fsdb, const char *buf)