RETURN(0);
}
-static void mgs_revoke_lock(struct obd_device *obd, char *fsname,
- struct lustre_handle *lockh)
+void mgs_revoke_lock(struct obd_device *obd, struct fs_db *fsdb)
{
- int lockrc;
+ struct lustre_handle lockh;
+ int lockrc;
+
+ LASSERT(fsdb->fsdb_name[0] != '\0');
+
+ if (cfs_test_and_set_bit(1, &fsdb->fsdb_revoking_lock) == 0) {
+ lockrc = mgs_get_cfg_lock(obd, fsdb->fsdb_name, &lockh);
+ /* clear the bit before lock put */
+ cfs_clear_bit(1, &fsdb->fsdb_revoking_lock);
- if (fsname[0]) {
- lockrc = mgs_get_cfg_lock(obd, fsname, lockh);
if (lockrc != ELDLM_OK)
- CERROR("lock error %d for fs %s\n", lockrc,
- fsname);
+ CERROR("lock error %d for fs %s\n",
+ lockrc, fsdb->fsdb_name);
else
- mgs_put_cfg_lock(lockh);
+ mgs_put_cfg_lock(&lockh);
}
}
static int mgs_handle_target_reg(struct ptlrpc_request *req)
{
struct obd_device *obd = req->rq_export->exp_obd;
- struct lustre_handle lockh;
struct mgs_target_info *mti, *rep_mti;
- int rc = 0, lockrc;
+ struct fs_db *fsdb;
+ int rc = 0;
ENTRY;
mgs_counter_incr(req->rq_export, LPROC_MGS_TARGET_REG);
GOTO(out_nolock, rc);
}
- /* Revoke the config lock to make sure nobody is reading. */
- /* Although actually I think it should be alright if
- someone was reading while we were updating the logs - if we
- revoke at the end they will just update from where they left off. */
- lockrc = mgs_get_cfg_lock(obd, mti->mti_fsname, &lockh);
- if (lockrc != ELDLM_OK) {
- LCONSOLE_ERROR_MSG(0x13d, "%s: Can't signal other nodes to "
- "update their configuration (%d). Updating "
- "local logs anyhow; you might have to "
- "manually restart other nodes to get the "
- "latest configuration.\n",
- obd->obd_name, lockrc);
- }
-
OBD_FAIL_TIMEOUT(OBD_FAIL_MGS_PAUSE_TARGET_REG, 10);
- /* Log writing contention is handled by the fsdb_sem */
-
if (mti->mti_flags & LDD_F_WRITECONF) {
if (mti->mti_flags & LDD_F_SV_TYPE_MDT &&
mti->mti_stripe_index == 0) {
mti->mti_flags &= ~LDD_F_UPGRADE14;
}
+ rc = mgs_find_or_make_fsdb(obd, mti->mti_fsname, &fsdb);
+ if (rc) {
+ CERROR("Can't get db for %s: %d\n", mti->mti_fsname, rc);
+ GOTO(out_nolock, rc);
+ }
+
+ /*
+ * Log writing contention is handled by the fsdb_sem.
+ *
+ * It should be alright if someone was reading while we were
+ * updating the logs - if we revoke at the end they will just update
+ * from where they left off.
+ */
+
/* COMPAT_146 */
if (mti->mti_flags & LDD_F_UPGRADE14) {
- rc = mgs_upgrade_sv_14(obd, mti);
+ rc = mgs_upgrade_sv_14(obd, mti, fsdb);
if (rc) {
CERROR("Can't upgrade from 1.4 (%d)\n", rc);
GOTO(out, rc);
/* create or update the target log
and update the client/mdt logs */
- rc = mgs_write_log_target(obd, mti);
+ rc = mgs_write_log_target(obd, mti, fsdb);
if (rc) {
CERROR("Failed to write %s log (%d)\n",
mti->mti_svname, rc);
}
out:
- /* done with log update */
- if (lockrc == ELDLM_OK)
- mgs_put_cfg_lock(&lockh);
+ mgs_revoke_lock(obd, fsdb);
+
out_nolock:
CDEBUG(D_MGS, "replying with %s, index=%d, rc=%d\n", mti->mti_svname,
mti->mti_stripe_index, rc);
{
struct obd_device *obd = req->rq_export->exp_obd;
struct mgs_send_param *msp, *rep_msp;
- struct lustre_handle lockh;
int rc;
struct lustre_cfg_bufs bufs;
struct lustre_cfg *lcfg;
RETURN(rc);
}
- /* request for update */
- mgs_revoke_lock(obd, fsname, &lockh);
-
lustre_cfg_free(lcfg);
rc = req_capsule_server_pack(&req->rq_pill);
struct obd_ioctl_data *data)
{
int rc;
- struct lustre_handle lockh;
struct lustre_cfg *lcfg = NULL;
struct llog_rec_hdr rec;
char *fsname = NULL;
GOTO(out_pool, rc);
}
- /* request for update */
- mgs_revoke_lock(obd, fsname, &lockh);
-
out_pool:
if (lcfg != NULL)
OBD_FREE(lcfg, data->ioc_plen1);
switch (cmd) {
case OBD_IOC_PARAM: {
- struct lustre_handle lockh;
struct lustre_cfg *lcfg;
struct llog_rec_hdr rec;
char fsname[MTI_NAME_MAXLEN];
CERROR("setparam err %d\n", rc);
GOTO(out_free, rc);
}
-
- /* Revoke lock so everyone updates. Should be alright if
- someone was already reading while we were updating the logs,
- so we don't really need to hold the lock while we're
- writing (above). */
- mgs_revoke_lock(obd, fsname, &lockh);
-
out_free:
OBD_FREE(lcfg, data->ioc_plen1);
RETURN(rc);
__u32 fsdb_flags;
__u32 fsdb_gen;
+ __u8 fsdb_revoking_lock; /* lock is being revoked */
+
/* in-memory copy of the srpc rules, guarded by fsdb_sem */
struct sptlrpc_rule_set fsdb_srpc_gen;
struct mgs_tgt_srpc_conf *fsdb_srpc_tgt;
int mgs_get_fsdb_srpc_from_llog(struct obd_device *obd, struct fs_db *fsdb);
int mgs_check_index(struct obd_device *obd, struct mgs_target_info *mti);
int mgs_check_failnid(struct obd_device *obd, struct mgs_target_info *mti);
-int mgs_write_log_target(struct obd_device *obd, struct mgs_target_info *mti);
-int mgs_upgrade_sv_14(struct obd_device *obd, struct mgs_target_info *mti);
+int mgs_write_log_target(struct obd_device *obd, struct mgs_target_info *mti,
+ struct fs_db *fsdb);
+int mgs_upgrade_sv_14(struct obd_device *obd, struct mgs_target_info *mti,
+ struct fs_db *fsdb);
int mgs_erase_log(struct obd_device *obd, char *name);
int mgs_erase_logs(struct obd_device *obd, char *fsname);
int mgs_setparam(struct obd_device *obd, struct lustre_cfg *lcfg, char *fsname);
int mgs_pool_cmd(struct obd_device *obd, enum lcfg_command_type cmd,
char *poolname, char *fsname, char *ostname);
+/* mgs_handler.c */
+void mgs_revoke_lock(struct obd_device *obd, struct fs_db *fsdb);
+
/* mgs_fs.c */
int mgs_client_add(struct obd_device *obd, struct obd_export *exp,
void *localdata);
}
int mgs_write_log_target(struct obd_device *obd,
- struct mgs_target_info *mti)
+ struct mgs_target_info *mti,
+ struct fs_db *fsdb)
{
- struct fs_db *fsdb;
int rc = -EINVAL;
char *buf, *params;
ENTRY;
}
}
- rc = mgs_find_or_make_fsdb(obd, mti->mti_fsname, &fsdb);
- if (rc) {
- CERROR("Can't get db for %s\n", mti->mti_fsname);
- RETURN(rc);
- }
-
cfs_down(&fsdb->fsdb_sem);
if (mti->mti_flags &
/* COMPAT_146 */
/* verify that we can handle the old config logs */
-int mgs_upgrade_sv_14(struct obd_device *obd, struct mgs_target_info *mti)
+int mgs_upgrade_sv_14(struct obd_device *obd, struct mgs_target_info *mti,
+ struct fs_db *fsdb)
{
- struct fs_db *fsdb;
int rc = 0;
ENTRY;
LCONSOLE_INFO("upgrading server %s from pre-1.6\n", mti->mti_svname);
server_mti_print("upgrade", mti);
- rc = mgs_find_or_make_fsdb(obd, mti->mti_fsname, &fsdb);
- if (rc)
- RETURN(rc);
-
if (fsdb->fsdb_flags & FSDB_LOG_EMPTY) {
LCONSOLE_ERROR_MSG(0x14a, "The old client log %s-client is "
"missing. Was tunefs.lustre successful?\n",
rc = mgs_write_log_param(obd, fsdb, mti, mti->mti_params);
cfs_up(&fsdb->fsdb_sem);
+ /*
+ * Revoke lock so everyone updates. Should be alright if
+ * someone was already reading while we were updating the logs,
+ * so we don't really need to hold the lock while we're
+ * writing (above).
+ */
+ mgs_revoke_lock(obd, fsdb);
out:
OBD_FREE_PTR(mti);
RETURN(rc);
name_destroy(&logname);
cfs_up(&fsdb->fsdb_sem);
+ /* request for update */
+ mgs_revoke_lock(obd, fsdb);
EXIT;
out: