/* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*-
* vim:expandtab:shiftwidth=8:tabstop=8:
*
- * lustre/mgc/mgc_request.c
- * Lustre Management Client
+ * GPL HEADER START
*
- * Copyright (C) 2006 Cluster File Systems, Inc.
- * Author: Nathan Rutman <nathan@clusterfs.com>
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * This file is part of Lustre, http://www.lustre.org
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 only,
+ * as published by the Free Software Foundation.
*
- * Lustre is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License version 2 for more details (a copy is included
+ * in the LICENSE file that accompanied this code).
*
- * Lustre is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * You should have received a copy of the GNU General Public License
+ * version 2 along with this program; If not, see
+ * http://www.sun.com/software/products/lustre/docs/GPLv2.pdf
*
- * You should have received a copy of the GNU General Public License
- * along with Lustre; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
*
+ * GPL HEADER END
+ */
+/*
+ * Copyright 2008 Sun Microsystems, Inc. All rights reserved
+ * Use is subject to license terms.
+ */
+/*
+ * This file is part of Lustre, http://www.lustre.org/
+ * Lustre is a trademark of Sun Microsystems, Inc.
+ *
+ * lustre/mgc/mgc_request.c
+ *
+ * Author: Nathan Rutman <nathan@clusterfs.com>
*/
#ifndef EXPORT_SYMTAB
int mgc_fsname2resid(char *fsname, struct ldlm_res_id *res_id)
{
/* fsname is at most 8 chars long, maybe contain "-".
- * e.g. "lustre", "CFS-000" */
+ * e.g. "lustre", "SUN-000" */
return mgc_name2resid(fsname, strlen(fsname), res_id);
}
EXPORT_SYMBOL(mgc_fsname2resid);
int len;
/* logname consists of "fsname-nodetype".
- * e.g. "lustre-MDT0001", "CFS-000-client" */
+ * e.g. "lustre-MDT0001", "SUN-000-client" */
name_end = strrchr(logname, '-');
LASSERT(name_end);
len = name_end - logname;
/********************** config llog list **********************/
static CFS_LIST_HEAD(config_llog_list);
-static spinlock_t config_list_lock = SPIN_LOCK_UNLOCKED;
+static cfs_spinlock_t config_list_lock = CFS_SPIN_LOCK_UNLOCKED;
/* Take a reference to a config log */
static int config_log_get(struct config_llog_data *cld)
ENTRY;
if (cld->cld_stopping)
RETURN(1);
- atomic_inc(&cld->cld_refcount);
+ cfs_atomic_inc(&cld->cld_refcount);
CDEBUG(D_INFO, "log %s refs %d\n", cld->cld_logname,
- atomic_read(&cld->cld_refcount));
+ cfs_atomic_read(&cld->cld_refcount));
RETURN(0);
}
static void config_log_put(struct config_llog_data *cld)
{
ENTRY;
+
CDEBUG(D_INFO, "log %s refs %d\n", cld->cld_logname,
- atomic_read(&cld->cld_refcount));
- if (atomic_dec_and_test(&cld->cld_refcount)) {
+ cfs_atomic_read(&cld->cld_refcount));
+ LASSERT(cfs_atomic_read(&cld->cld_refcount) > 0);
+
+ /* spinlock to make sure no item with 0 refcount in the list */
+ cfs_spin_lock(&config_list_lock);
+ if (unlikely(cfs_atomic_dec_and_test(&cld->cld_refcount))) {
+ cfs_list_del(&cld->cld_list_chain);
+ cfs_spin_unlock(&config_list_lock);
+
CDEBUG(D_MGC, "dropping config log %s\n", cld->cld_logname);
+
+ if (cld->cld_sptlrpc)
+ config_log_put(cld->cld_sptlrpc);
+ if (cld->cld_is_sptlrpc)
+ sptlrpc_conf_log_stop(cld->cld_logname);
+
class_export_put(cld->cld_mgcexp);
- spin_lock(&config_list_lock);
- list_del(&cld->cld_list_chain);
- spin_unlock(&config_list_lock);
OBD_FREE(cld->cld_logname, strlen(cld->cld_logname) + 1);
if (cld->cld_cfg.cfg_instance != NULL)
OBD_FREE(cld->cld_cfg.cfg_instance,
strlen(cld->cld_cfg.cfg_instance) + 1);
OBD_FREE(cld, sizeof(*cld));
+ } else {
+ cfs_spin_unlock(&config_list_lock);
}
+
EXIT;
}
/* Find a config log by name */
-static struct config_llog_data *config_log_find(char *logname,
- struct config_llog_instance *cfg)
+static
+struct config_llog_data *config_log_find(char *logname,
+ struct config_llog_instance *cfg)
{
- struct list_head *tmp;
struct config_llog_data *cld;
char *logid = logname;
int match_instance = 0;
RETURN(ERR_PTR(-EINVAL));
}
- spin_lock(&config_list_lock);
- list_for_each(tmp, &config_llog_list) {
- cld = list_entry(tmp, struct config_llog_data, cld_list_chain);
+ cfs_spin_lock(&config_list_lock);
+ cfs_list_for_each_entry(cld, &config_llog_list, cld_list_chain) {
if (match_instance && cld->cld_cfg.cfg_instance &&
strcmp(logid, cld->cld_cfg.cfg_instance) == 0)
goto out_found;
strcmp(logid, cld->cld_logname) == 0)
goto out_found;
}
- spin_unlock(&config_list_lock);
+ cfs_spin_unlock(&config_list_lock);
CDEBUG(D_CONFIG, "can't get log %s\n", logid);
RETURN(ERR_PTR(-ENOENT));
out_found:
- atomic_inc(&cld->cld_refcount);
- spin_unlock(&config_list_lock);
+ cfs_atomic_inc(&cld->cld_refcount);
+ cfs_spin_unlock(&config_list_lock);
+ LASSERT(cld->cld_stopping == 0 || cld->cld_is_sptlrpc == 0);
RETURN(cld);
}
-/* Add this log to our list of active logs.
- We have one active log per "mount" - client instance or servername.
- Each instance may be at a different point in the log. */
-static int config_log_add(char *logname, struct config_llog_instance *cfg,
- struct super_block *sb)
+static
+struct config_llog_data *do_config_log_add(struct obd_device *obd,
+ char *logname,
+ unsigned int is_sptlrpc,
+ struct config_llog_instance *cfg,
+ struct super_block *sb)
{
struct config_llog_data *cld;
- struct lustre_sb_info *lsi = s2lsi(sb);
- int rc;
+ int rc;
ENTRY;
- CDEBUG(D_MGC, "adding config log %s:%s\n", logname, cfg->cfg_instance);
+ CDEBUG(D_MGC, "do adding config log %s:%s\n", logname,
+ cfg ? cfg->cfg_instance : "NULL");
OBD_ALLOC(cld, sizeof(*cld));
if (!cld)
- RETURN(-ENOMEM);
+ RETURN(ERR_PTR(-ENOMEM));
OBD_ALLOC(cld->cld_logname, strlen(logname) + 1);
if (!cld->cld_logname) {
OBD_FREE(cld, sizeof(*cld));
- RETURN(-ENOMEM);
+ RETURN(ERR_PTR(-ENOMEM));
}
strcpy(cld->cld_logname, logname);
- cld->cld_cfg = *cfg;
+ if (cfg)
+ cld->cld_cfg = *cfg;
cld->cld_cfg.cfg_last_idx = 0;
cld->cld_cfg.cfg_flags = 0;
cld->cld_cfg.cfg_sb = sb;
- atomic_set(&cld->cld_refcount, 1);
+ cld->cld_is_sptlrpc = is_sptlrpc;
+ cfs_atomic_set(&cld->cld_refcount, 1);
/* Keep the mgc around until we are done */
- cld->cld_mgcexp = class_export_get(lsi->lsi_mgc->obd_self_export);
+ cld->cld_mgcexp = class_export_get(obd->obd_self_export);
- if (cfg->cfg_instance != NULL) {
+ if (cfg && cfg->cfg_instance != NULL) {
OBD_ALLOC(cld->cld_cfg.cfg_instance,
strlen(cfg->cfg_instance) + 1);
strcpy(cld->cld_cfg.cfg_instance, cfg->cfg_instance);
}
+
+ if (is_sptlrpc) {
+ sptlrpc_conf_log_start(logname);
+ cld->cld_cfg.cfg_obdname = obd->obd_name;
+ }
+
rc = mgc_logname2resid(logname, &cld->cld_resid);
- spin_lock(&config_list_lock);
- list_add(&cld->cld_list_chain, &config_llog_list);
- spin_unlock(&config_list_lock);
-
+
+ cfs_spin_lock(&config_list_lock);
+ cfs_list_add(&cld->cld_list_chain, &config_llog_list);
+ cfs_spin_unlock(&config_list_lock);
+
if (rc) {
config_log_put(cld);
- RETURN(rc);
+ RETURN(ERR_PTR(rc));
}
- RETURN(rc);
+ if (is_sptlrpc) {
+ rc = mgc_process_log(obd, cld);
+ if (rc)
+ CERROR("failed processing sptlrpc log: %d\n", rc);
+ }
+
+ RETURN(cld);
+}
+
+/**
+ * Add this log to our list of active logs.
+ * We have one active log per "mount" - client instance or servername.
+ * Each instance may be at a different point in the log.
+ */
+static int config_log_add(struct obd_device *obd, char *logname,
+ struct config_llog_instance *cfg,
+ struct super_block *sb)
+{
+ struct config_llog_data *cld, *sptlrpc_cld;
+ char seclogname[20];
+ char *ptr;
+ ENTRY;
+
+ CDEBUG(D_MGC, "adding config log %s:%s\n", logname, cfg->cfg_instance);
+
+ /*
+ * for each regular log, the depended sptlrpc log name is
+ * <fsname>-sptlrpc. multiple regular logs may share one sptlrpc log.
+ */
+ ptr = strrchr(logname, '-');
+ if (ptr == NULL || ptr - logname > 8) {
+ CERROR("logname %s is too long\n", logname);
+ RETURN(-EINVAL);
+ }
+
+ memcpy(seclogname, logname, ptr - logname);
+ strcpy(seclogname + (ptr - logname), "-sptlrpc");
+
+ sptlrpc_cld = config_log_find(seclogname, NULL);
+ if (IS_ERR(sptlrpc_cld)) {
+ sptlrpc_cld = do_config_log_add(obd, seclogname, 1, NULL, NULL);
+ if (IS_ERR(sptlrpc_cld)) {
+ CERROR("can't create sptlrpc log: %s\n", seclogname);
+ RETURN(PTR_ERR(sptlrpc_cld));
+ }
+ }
+
+ cld = do_config_log_add(obd, logname, 0, cfg, sb);
+ if (IS_ERR(cld)) {
+ CERROR("can't create log: %s\n", logname);
+ config_log_put(sptlrpc_cld);
+ RETURN(PTR_ERR(cld));
+ }
+
+ cld->cld_sptlrpc = sptlrpc_cld;
+
+ RETURN(0);
}
+CFS_DECLARE_MUTEX(llog_process_lock);
+
/* Stop watching for updates on this log. */
static int config_log_end(char *logname, struct config_llog_instance *cfg)
{
- struct config_llog_data *cld;
+ struct config_llog_data *cld, *cld_sptlrpc = NULL;
int rc = 0;
ENTRY;
cld = config_log_find(logname, cfg);
if (IS_ERR(cld))
RETURN(PTR_ERR(cld));
- /* drop the ref from the find */
- config_log_put(cld);
+
+ cfs_down(&llog_process_lock);
+ /*
+ * if cld_stopping is set, it means we didn't start the log thus
+ * not owning the start ref. this can happen after previous umount:
+ * the cld still hanging there waiting for lock cancel, and we
+ * remount again but failed in the middle and call log_end without
+ * calling start_log.
+ */
+ if (unlikely(cld->cld_stopping)) {
+ cfs_up(&llog_process_lock);
+ /* drop the ref from the find */
+ config_log_put(cld);
+ RETURN(rc);
+ }
cld->cld_stopping = 1;
+ cfs_up(&llog_process_lock);
+
+ cfs_spin_lock(&config_list_lock);
+ cld_sptlrpc = cld->cld_sptlrpc;
+ cld->cld_sptlrpc = NULL;
+ cfs_spin_unlock(&config_list_lock);
+
+ if (cld_sptlrpc)
+ config_log_put(cld_sptlrpc);
+
+ /* drop the ref from the find */
+ config_log_put(cld);
/* drop the start ref */
config_log_put(cld);
+
CDEBUG(D_MGC, "end config log %s (%d)\n", logname ? logname : "client",
rc);
RETURN(rc);
static int rq_state = 0;
static cfs_waitq_t rq_waitq;
-static int mgc_process_log(struct obd_device *mgc,
- struct config_llog_data *cld);
static int mgc_requeue_add(struct config_llog_data *cld, int later);
+static void do_requeue(struct config_llog_data *cld)
+{
+ LASSERT(cfs_atomic_read(&cld->cld_refcount) > 0);
+
+ /* Do not run mgc_process_log on a disconnected export or an
+ export which is being disconnected. Take the client
+ semaphore to make the check non-racy. */
+ cfs_down_read(&cld->cld_mgcexp->exp_obd->u.cli.cl_sem);
+ if (cld->cld_mgcexp->exp_obd->u.cli.cl_conn_count != 0) {
+ CDEBUG(D_MGC, "updating log %s\n", cld->cld_logname);
+ mgc_process_log(cld->cld_mgcexp->exp_obd, cld);
+ } else {
+ CDEBUG(D_MGC, "disconnecting, won't update log %s\n",
+ cld->cld_logname);
+ }
+ cfs_up_read(&cld->cld_mgcexp->exp_obd->u.cli.cl_sem);
+
+ /* Whether we enqueued again or not in mgc_process_log, we're done
+ * with the ref from the old enqueue */
+ config_log_put(cld);
+}
+
static int mgc_requeue_thread(void *data)
{
struct l_wait_info lwi_now, lwi_later;
- struct config_llog_data *cld, *n;
+ struct config_llog_data *cld, *cld_next, *cld_prev;
char name[] = "ll_cfg_requeue";
int rc = 0;
ENTRY;
- ptlrpc_daemonize(name);
-
+ cfs_daemonize(name);
+
CDEBUG(D_MGC, "Starting requeue thread\n");
- lwi_later = LWI_TIMEOUT(60 * HZ, NULL, NULL);
+ lwi_later = LWI_TIMEOUT(60 * CFS_HZ, NULL, NULL);
l_wait_event(rq_waitq, rq_state & (RQ_NOW | RQ_STOP), &lwi_later);
/* Keep trying failed locks periodically */
- spin_lock(&config_list_lock);
+ cfs_spin_lock(&config_list_lock);
while (rq_state & (RQ_NOW | RQ_LATER)) {
/* Any new or requeued lostlocks will change the state */
- rq_state &= ~(RQ_NOW | RQ_LATER);
- spin_unlock(&config_list_lock);
+ rq_state &= ~(RQ_NOW | RQ_LATER);
+ cfs_spin_unlock(&config_list_lock);
- /* Always wait a few seconds to allow the server who
+ /* Always wait a few seconds to allow the server who
caused the lock revocation to finish its setup, plus some
random so everyone doesn't try to reconnect at once. */
- lwi_now = LWI_TIMEOUT(3 * HZ + (ll_rand() & 0xff) * (HZ / 100),
+ lwi_now = LWI_TIMEOUT(3 * CFS_HZ + (ll_rand() & 0xff) * \
+ (CFS_HZ / 100),
NULL, NULL);
l_wait_event(rq_waitq, rq_state & RQ_STOP, &lwi_now);
-
- spin_lock(&config_list_lock);
- list_for_each_entry_safe(cld, n, &config_llog_list,
- cld_list_chain) {
- spin_unlock(&config_list_lock);
+
+ /*
+ * iterate & processing through the list. for each cld, process
+ * its depending sptlrpc cld firstly (if any) and then itself.
+ *
+ * it's guaranteed any item in the list must have
+ * reference > 0; and if cld_lostlock is set, at
+ * least one reference is taken by the previous enqueue.
+ *
+ * Note: releasing a cld might lead to itself and its depended
+ * sptlrpc cld be unlinked from the list. to safely iterate
+ * we need to take a reference on next cld before processing.
+ */
+ cld_prev = NULL;
+
+ cfs_spin_lock(&config_list_lock);
+ cfs_list_for_each_entry_safe(cld, cld_next, &config_llog_list,
+ cld_list_chain) {
+ if (cld->cld_list_chain.next != &config_llog_list)
+ cfs_atomic_inc(&cld_next->cld_refcount);
+
if (cld->cld_lostlock) {
- CDEBUG(D_MGC, "updating log %s\n",
- cld->cld_logname);
+ if (cld->cld_sptlrpc &&
+ cld->cld_sptlrpc->cld_lostlock) {
+ cld->cld_sptlrpc->cld_lostlock = 0;
+
+ cfs_spin_unlock(&config_list_lock);
+ do_requeue(cld->cld_sptlrpc);
+ cfs_spin_lock(&config_list_lock);
+ LASSERT(cld->cld_lostlock);
+ }
+
cld->cld_lostlock = 0;
- rc = mgc_process_log(cld->cld_mgcexp->exp_obd,
- cld);
- /* Whether we enqueued again or not in
- mgc_process_log, we're done with the ref
- from the old enqueue */
- config_log_put(cld);
+
+ cfs_spin_unlock(&config_list_lock);
+ do_requeue(cld);
+ cfs_spin_lock(&config_list_lock);
+ }
+
+
+ if (cld_prev) {
+ cfs_spin_unlock(&config_list_lock);
+ config_log_put(cld_prev);
+ cfs_spin_lock(&config_list_lock);
}
- spin_lock(&config_list_lock);
+
+ cld_prev = cld_next;
}
- spin_unlock(&config_list_lock);
-
+ cfs_spin_unlock(&config_list_lock);
+
/* Wait a bit to see if anyone else needs a requeue */
l_wait_event(rq_waitq, rq_state & (RQ_NOW | RQ_STOP),
&lwi_later);
- spin_lock(&config_list_lock);
+ cfs_spin_lock(&config_list_lock);
}
/* spinlock and while guarantee RQ_NOW and RQ_LATER are not set */
rq_state &= ~RQ_RUNNING;
- spin_unlock(&config_list_lock);
-
+ cfs_spin_unlock(&config_list_lock);
+
CDEBUG(D_MGC, "Ending requeue thread\n");
RETURN(rc);
}
{
int rc = 0;
- CDEBUG(D_INFO, "log %s: requeue (l=%d r=%d sp=%d st=%x)\n",
- cld->cld_logname, later, atomic_read(&cld->cld_refcount),
+ CDEBUG(D_INFO, "log %s: requeue (l=%d r=%d sp=%d st=%x)\n",
+ cld->cld_logname, later, cfs_atomic_read(&cld->cld_refcount),
cld->cld_stopping, rq_state);
+ LASSERT(cfs_atomic_read(&cld->cld_refcount) > 0);
/* Hold lock for rq_state */
- spin_lock(&config_list_lock);
- cld->cld_lostlock = 1;
+ cfs_spin_lock(&config_list_lock);
if (cld->cld_stopping || (rq_state & RQ_STOP)) {
- spin_unlock(&config_list_lock);
+ cld->cld_lostlock = 0;
+ cfs_spin_unlock(&config_list_lock);
config_log_put(cld);
RETURN(0);
}
+ cld->cld_lostlock = 1;
+
if (!(rq_state & RQ_RUNNING)) {
LASSERT(rq_state == 0);
rq_state = RQ_RUNNING | (later ? RQ_LATER : RQ_NOW);
- spin_unlock(&config_list_lock);
+ cfs_spin_unlock(&config_list_lock);
rc = cfs_kernel_thread(mgc_requeue_thread, 0,
CLONE_VM | CLONE_FILES);
if (rc < 0) {
}
} else {
rq_state |= later ? RQ_LATER : RQ_NOW;
- spin_unlock(&config_list_lock);
+ cfs_spin_unlock(&config_list_lock);
cfs_waitq_signal(&rq_waitq);
}
LASSERT(lsi->lsi_srv_mnt == mnt);
/* The mgc fs exclusion sem. Only one fs can be setup at a time. */
- down(&cli->cl_mgc_sem);
+ cfs_down(&cli->cl_mgc_sem);
- cleanup_group_info();
+ cfs_cleanup_group_info();
obd->obd_fsops = fsfilt_get_ops(MT_STR(lsi->lsi_ldd));
if (IS_ERR(obd->obd_fsops)) {
- up(&cli->cl_mgc_sem);
+ cfs_up(&cli->cl_mgc_sem);
CERROR("No fstype %s rc=%ld\n", MT_STR(lsi->lsi_ldd),
PTR_ERR(obd->obd_fsops));
RETURN(PTR_ERR(obd->obd_fsops));
obd->obd_lvfs_ctxt.fs = get_ds();
push_ctxt(&saved, &obd->obd_lvfs_ctxt, NULL);
- dentry = lookup_one_len(MOUNT_CONFIGS_DIR, current->fs->pwd,
+ dentry = lookup_one_len(MOUNT_CONFIGS_DIR, cfs_fs_pwd(current->fs),
strlen(MOUNT_CONFIGS_DIR));
pop_ctxt(&saved, &obd->obd_lvfs_ctxt, NULL);
if (IS_ERR(dentry)) {
/* We take an obd ref to insure that we can't get to mgc_cleanup
without calling mgc_fs_cleanup first. */
- class_incref(obd);
+ class_incref(obd, "mgc_fs", obd);
label = fsfilt_get_label(obd, mnt->mnt_sb);
if (label)
fsfilt_put_ops(obd->obd_fsops);
obd->obd_fsops = NULL;
cli->cl_mgc_vfsmnt = NULL;
- up(&cli->cl_mgc_sem);
+ cfs_up(&cli->cl_mgc_sem);
RETURN(err);
}
l_dput(cli->cl_mgc_configs_dir);
cli->cl_mgc_configs_dir = NULL;
pop_ctxt(&saved, &obd->obd_lvfs_ctxt, NULL);
- class_decref(obd);
+ class_decref(obd, "mgc_fs", obd);
}
cli->cl_mgc_vfsmnt = NULL;
if (obd->obd_fsops)
fsfilt_put_ops(obd->obd_fsops);
- up(&cli->cl_mgc_sem);
+ cfs_up(&cli->cl_mgc_sem);
RETURN(rc);
}
-static atomic_t mgc_count = ATOMIC_INIT(0);
+static cfs_atomic_t mgc_count = CFS_ATOMIC_INIT(0);
static int mgc_precleanup(struct obd_device *obd, enum obd_cleanup_stage stage)
{
int rc = 0;
case OBD_CLEANUP_EARLY:
break;
case OBD_CLEANUP_EXPORTS:
- if (atomic_dec_and_test(&mgc_count)) {
- /* Kick the requeue waitq - cld's should all be
+ if (cfs_atomic_dec_and_test(&mgc_count)) {
+ /* Kick the requeue waitq - cld's should all be
stopping */
- spin_lock(&config_list_lock);
+ cfs_spin_lock(&config_list_lock);
rq_state |= RQ_STOP;
- spin_unlock(&config_list_lock);
+ cfs_spin_unlock(&config_list_lock);
cfs_waitq_signal(&rq_waitq);
}
- break;
- case OBD_CLEANUP_SELF_EXP:
rc = obd_llog_finish(obd, 0);
if (rc != 0)
CERROR("failed to cleanup llogging subsystems\n");
break;
- case OBD_CLEANUP_OBD:
- break;
}
RETURN(rc);
}
if (rc)
GOTO(err_decref, rc);
- rc = obd_llog_init(obd, OBD_LLOG_GROUP, obd, 0, NULL, NULL);
+ rc = obd_llog_init(obd, &obd->obd_olg, obd, NULL);
if (rc) {
CERROR("failed to setup llogging subsystems\n");
GOTO(err_cleanup, rc);
lprocfs_mgc_init_vars(&lvars);
lprocfs_obd_setup(obd, lvars.obd_vars);
+ sptlrpc_lprocfs_cliobd_attach(obd);
- spin_lock(&config_list_lock);
- atomic_inc(&mgc_count);
- if (atomic_read(&mgc_count) == 1) {
+ cfs_spin_lock(&config_list_lock);
+ cfs_atomic_inc(&mgc_count);
+ if (cfs_atomic_read(&mgc_count) == 1) {
rq_state &= ~RQ_STOP;
cfs_waitq_init(&rq_waitq);
}
- spin_unlock(&config_list_lock);
-
+ cfs_spin_unlock(&config_list_lock);
+
RETURN(rc);
err_cleanup:
}
/* Are we done with this log? */
if (cld->cld_stopping) {
- CDEBUG(D_MGC, "log %s: stopping, won't requeue\n",
+ CDEBUG(D_MGC, "log %s: stopping, won't requeue\n",
cld->cld_logname);
- config_log_put(cld);
+ config_log_put(cld);
break;
}
/* Make sure not to re-enqueue when the mgc is stopping
!lock->l_conn_export->exp_obd->u.cli.cl_conn_count) {
CDEBUG(D_MGC, "log %s: disconnecting, won't requeue\n",
cld->cld_logname);
- config_log_put(cld);
+ config_log_put(cld);
break;
}
/* Did we fail to get the lock? */
- if (lock->l_req_mode != lock->l_granted_mode) {
+ if (lock->l_req_mode != lock->l_granted_mode &&
+ !cld->cld_is_sptlrpc) {
CDEBUG(D_MGC, "log %s: original grant failed, will "
"requeue later\n", cld->cld_logname);
/* Try to re-enqueue later */
RETURN(rc);
}
+/* Not sure where this should go... */
+#define MGC_ENQUEUE_LIMIT 50
+#define MGC_TARGET_REG_LIMIT 10
+#define MGC_SEND_PARAM_LIMIT 10
+
/* Send parameter to MGS*/
static int mgc_set_mgs_param(struct obd_export *exp,
struct mgs_send_param *msp)
{
struct ptlrpc_request *req;
struct mgs_send_param *req_msp, *rep_msp;
- int size[] = { sizeof(struct ptlrpc_body), sizeof(*req_msp) };
- int rep_size[] = { sizeof(struct ptlrpc_body), sizeof(*msp) };
int rc;
ENTRY;
- req = ptlrpc_prep_req(class_exp2cliimp(exp), LUSTRE_MGS_VERSION,
- MGS_SET_INFO, 2, size, NULL);
+ req = ptlrpc_request_alloc_pack(class_exp2cliimp(exp),
+ &RQF_MGS_SET_INFO, LUSTRE_MGS_VERSION,
+ MGS_SET_INFO);
if (!req)
RETURN(-ENOMEM);
- req_msp = lustre_msg_buf(req->rq_reqmsg, REQ_REC_OFF, sizeof(*req_msp));
- if (!req_msp)
+ req_msp = req_capsule_client_get(&req->rq_pill, &RMF_MGS_SEND_PARAM);
+ if (!req_msp) {
+ ptlrpc_req_finished(req);
RETURN(-ENOMEM);
+ }
memcpy(req_msp, msp, sizeof(*req_msp));
- ptlrpc_req_set_repsize(req, 2, rep_size);
+ ptlrpc_request_set_replen(req);
+
+ /* Limit how long we will wait for the enqueue to complete */
+ req->rq_delay_limit = MGC_SEND_PARAM_LIMIT;
rc = ptlrpc_queue_wait(req);
if (!rc) {
- rep_msp = lustre_swab_repbuf(req, REPLY_REC_OFF,
- sizeof(*rep_msp), NULL);
+ rep_msp = req_capsule_server_get(&req->rq_pill, &RMF_MGS_SEND_PARAM);
memcpy(msp, rep_msp, sizeof(*rep_msp));
}
{
struct config_llog_data *cld = (struct config_llog_data *)data;
struct ldlm_enqueue_info einfo = { type, mode, mgc_blocking_ast,
- ldlm_completion_ast, NULL, data};
-
+ ldlm_completion_ast, NULL, NULL, data};
+ struct ptlrpc_request *req;
+ int short_limit = cld->cld_is_sptlrpc;
int rc;
ENTRY;
/* We need a callback for every lockholder, so don't try to
ldlm_lock_match (see rev 1.1.2.11.2.47) */
-
- rc = ldlm_cli_enqueue(exp, NULL, &einfo, &cld->cld_resid,
- NULL, flags, NULL, 0, NULL, lockh, 0);
- /* A failed enqueue should still call the mgc_blocking_ast,
- where it will be requeued if needed ("grant failed"). */
-
+ req = ptlrpc_request_alloc_pack(class_exp2cliimp(exp),
+ &RQF_LDLM_ENQUEUE, LUSTRE_DLM_VERSION,
+ LDLM_ENQUEUE);
+ if (req == NULL)
+ RETURN(-ENOMEM);
+ ptlrpc_request_set_replen(req);
+ /* check if this is server or client */
+ if (cld->cld_cfg.cfg_sb) {
+ struct lustre_sb_info *lsi = s2lsi(cld->cld_cfg.cfg_sb);
+ if (lsi && (lsi->lsi_flags & LSI_SERVER))
+ short_limit = 1;
+ }
+ /* Limit how long we will wait for the enqueue to complete */
+ req->rq_delay_limit = short_limit ? 5 : MGC_ENQUEUE_LIMIT;
+ rc = ldlm_cli_enqueue(exp, &req, &einfo, &cld->cld_resid, NULL, flags,
+ NULL, 0, lockh, 0);
+ /* A failed enqueue should still call the mgc_blocking_ast,
+ where it will be requeued if needed ("grant failed"). */
+ ptlrpc_req_finished(req);
RETURN(rc);
}
RETURN(0);
}
-#if 0
-static int mgc_iocontrol(unsigned int cmd, struct obd_export *exp, int len,
- void *karg, void *uarg)
-{
- struct obd_device *obd = exp->exp_obd;
- struct obd_ioctl_data *data = karg;
- struct llog_ctxt *ctxt;
- struct lvfs_run_ctxt saved;
- int rc;
- ENTRY;
-
- if (!try_module_get(THIS_MODULE)) {
- CERROR("Can't get module. Is it alive?");
- return -EINVAL;
- }
- switch (cmd) {
- /* REPLicator context */
- case OBD_IOC_PARSE: {
- CERROR("MGC parsing llog %s\n", data->ioc_inlbuf1);
- ctxt = llog_get_context(exp->exp_obd, LLOG_CONFIG_REPL_CTXT);
- rc = class_config_parse_llog(ctxt, data->ioc_inlbuf1, NULL);
- GOTO(out, rc);
- }
-#ifdef __KERNEL__
- case OBD_IOC_LLOG_INFO:
- case OBD_IOC_LLOG_PRINT: {
- ctxt = llog_get_context(obd, LLOG_CONFIG_REPL_CTXT);
- rc = llog_ioctl(ctxt, cmd, data);
-
- GOTO(out, rc);
- }
-#endif
- /* ORIGinator context */
- case OBD_IOC_DUMP_LOG: {
- ctxt = llog_get_context(obd, LLOG_CONFIG_ORIG_CTXT);
- push_ctxt(&saved, &obd->obd_lvfs_ctxt, NULL);
- rc = class_config_dump_llog(ctxt, data->ioc_inlbuf1, NULL);
- pop_ctxt(&saved, &obd->obd_lvfs_ctxt, NULL);
- if (rc)
- RETURN(rc);
-
- GOTO(out, rc);
- }
- default:
- CERROR("mgc_ioctl(): unrecognised ioctl %#x\n", cmd);
- GOTO(out, rc = -ENOTTY);
- }
-out:
- module_put(THIS_MODULE);
-
- return rc;
-}
-#endif
-
/* Send target_reg message to MGS */
static int mgc_target_register(struct obd_export *exp,
struct mgs_target_info *mti)
RETURN(-ENOMEM);
req_mti = req_capsule_client_get(&req->rq_pill, &RMF_MGS_TARGET_INFO);
- memcpy(req_mti, mti, sizeof(*req_mti));
+ if (!req_mti) {
+ ptlrpc_req_finished(req);
+ RETURN(-ENOMEM);
+ }
+ memcpy(req_mti, mti, sizeof(*req_mti));
ptlrpc_request_set_replen(req);
-
CDEBUG(D_MGC, "register %s\n", mti->mti_svname);
+ /* Limit how long we will wait for the enqueue to complete */
+ req->rq_delay_limit = MGC_TARGET_REG_LIMIT;
rc = ptlrpc_queue_wait(req);
if (!rc) {
void *key, obd_count vallen, void *val,
struct ptlrpc_request_set *set)
{
- struct obd_import *imp = class_exp2cliimp(exp);
int rc = -EINVAL;
ENTRY;
- /* Try to "recover" the initial connection; i.e. retry */
- if (KEY_IS(KEY_INIT_RECOV)) {
- if (vallen != sizeof(int))
- RETURN(-EINVAL);
- spin_lock(&imp->imp_lock);
- imp->imp_initial_recov = *(int *)val;
- spin_unlock(&imp->imp_lock);
- CDEBUG(D_HA, "%s: set imp_initial_recov = %d\n",
- exp->exp_obd->obd_name, imp->imp_initial_recov);
- RETURN(0);
- }
/* Turn off initial_recov after we try all backup servers once */
if (KEY_IS(KEY_INIT_RECOV_BACKUP)) {
+ struct obd_import *imp = class_exp2cliimp(exp);
int value;
if (vallen != sizeof(int))
RETURN(-EINVAL);
value = *(int *)val;
- spin_lock(&imp->imp_lock);
- imp->imp_initial_recov_bk = value > 0;
- /* Even after the initial connection, give up all comms if
- nobody answers the first time. */
- imp->imp_recon_bk = 1;
- spin_unlock(&imp->imp_lock);
- CDEBUG(D_MGC, "InitRecov %s %d/%d:d%d:i%d:r%d:or%d:%s\n",
- imp->imp_obd->obd_name, value, imp->imp_initial_recov,
+ CDEBUG(D_MGC, "InitRecov %s %d/d%d:i%d:r%d:or%d:%s\n",
+ imp->imp_obd->obd_name, value,
imp->imp_deactive, imp->imp_invalid,
imp->imp_replayable, imp->imp_obd->obd_replayable,
ptlrpc_import_state_name(imp->imp_state));
/* Resurrect if we previously died */
- if (imp->imp_invalid || value > 1)
+ if ((imp->imp_state != LUSTRE_IMP_FULL &&
+ imp->imp_state != LUSTRE_IMP_NEW) || value > 1)
ptlrpc_reconnect_import(imp);
RETURN(0);
}
/* FIXME move this to mgc_process_config */
- if (KEY_IS("register_target")) {
+ if (KEY_IS(KEY_REGISTER_TARGET)) {
struct mgs_target_info *mti;
if (vallen != sizeof(struct mgs_target_info))
RETURN(-EINVAL);
rc = mgc_target_register(exp, mti);
RETURN(rc);
}
- if (KEY_IS("set_fs")) {
+ if (KEY_IS(KEY_SET_FS)) {
struct super_block *sb = (struct super_block *)val;
struct lustre_sb_info *lsi;
if (vallen != sizeof(struct super_block))
}
RETURN(rc);
}
- if (KEY_IS("clear_fs")) {
+ if (KEY_IS(KEY_CLEAR_FS)) {
if (vallen != 0)
RETURN(-EINVAL);
rc = mgc_fs_cleanup(exp->exp_obd);
rc = mgc_set_mgs_param(exp, msp);
RETURN(rc);
}
+ if (KEY_IS(KEY_MGSSEC)) {
+ struct client_obd *cli = &exp->exp_obd->u.cli;
+ struct sptlrpc_flavor flvr;
+
+ /*
+ * empty string means using current flavor, if which haven't
+ * been set yet, set it as null.
+ *
+ * if flavor has been set previously, check the asking flavor
+ * must match the existing one.
+ */
+ if (vallen == 0) {
+ if (cli->cl_flvr_mgc.sf_rpc != SPTLRPC_FLVR_INVALID)
+ RETURN(0);
+ val = "null";
+ vallen = 4;
+ }
+
+ rc = sptlrpc_parse_flavor(val, &flvr);
+ if (rc) {
+ CERROR("invalid sptlrpc flavor %s to MGS\n",
+ (char *) val);
+ RETURN(rc);
+ }
+
+ /*
+ * caller already hold a mutex
+ */
+ if (cli->cl_flvr_mgc.sf_rpc == SPTLRPC_FLVR_INVALID) {
+ cli->cl_flvr_mgc = flvr;
+ } else if (memcmp(&cli->cl_flvr_mgc, &flvr,
+ sizeof(flvr)) != 0) {
+ char str[20];
+
+ sptlrpc_flavor2name(&cli->cl_flvr_mgc,
+ str, sizeof(str));
+ LCONSOLE_ERROR("asking sptlrpc flavor %s to MGS but "
+ "currently %s is in use\n",
+ (char *) val, str);
+ rc = -EPERM;
+ }
+ RETURN(rc);
+ }
RETURN(rc);
}
case IMP_EVENT_ACTIVE:
LCONSOLE_WARN("%s: Reactivating import\n", obd->obd_name);
/* Clearing obd_no_recov allows us to continue pinging */
- obd->obd_no_recov = 0;
+ obd->obd_no_recov = 0;
break;
case IMP_EVENT_OCD:
break;
RETURN(rc);
}
-static int mgc_llog_init(struct obd_device *obd, int group,
- struct obd_device *tgt, int count,
- struct llog_catid *logid, struct obd_uuid *uuid)
+static int mgc_llog_init(struct obd_device *obd, struct obd_llog_group *olg,
+ struct obd_device *tgt, int *index)
{
struct llog_ctxt *ctxt;
- struct obd_llog_group *olg = &obd->obd_olg;
int rc;
ENTRY;
- LASSERT(group == OBD_LLOG_GROUP);
- LASSERT(olg->olg_group == group);
+ LASSERT(olg == &obd->obd_olg);
rc = llog_setup(obd, olg, LLOG_CONFIG_ORIG_CTXT, tgt, 0, NULL,
&llog_lvfs_ops);
&llog_client_ops);
if (rc == 0) {
ctxt = llog_get_context(obd, LLOG_CONFIG_REPL_CTXT);
+ if (!ctxt) {
+ ctxt = llog_get_context(obd, LLOG_CONFIG_ORIG_CTXT);
+ if (ctxt)
+ llog_cleanup(ctxt);
+ RETURN(-ENODEV);
+ }
llog_initiator_connect(ctxt);
llog_ctxt_put(ctxt);
+ } else {
+ ctxt = llog_get_context(obd, LLOG_CONFIG_ORIG_CTXT);
+ if (ctxt)
+ llog_cleanup(ctxt);
}
RETURN(rc);
upon successful completion. */
OBD_ALLOC(temp_log, strlen(logname) + 1);
- if (!temp_log)
+ if (!temp_log)
RETURN(-ENOMEM);
sprintf(temp_log, "%sT", logname);
if (rc)
GOTO(out, rc);
rc = llog_init_handle(local_llh, LLOG_F_IS_PLAIN, NULL);
- if (rc)
+ if (rc)
GOTO(out, rc);
rc = llog_destroy(local_llh);
llog_free_handle(local_llh);
struct client_obd *cli = &obd->u.cli;
LASSERT(cli);
LASSERT(cli->cl_mgc_configs_dir);
- rc = lustre_rename(cli->cl_mgc_configs_dir, temp_log, logname);
+ rc = lustre_rename(cli->cl_mgc_configs_dir, cli->cl_mgc_vfsmnt,
+ temp_log, logname);
}
CDEBUG(D_MGC, "Copied remote log %s (%d)\n", logname, rc);
out:
RETURN(rc);
}
-DECLARE_MUTEX(llog_process_lock);
-
/* Get a config log from the MGS and process it.
This func is called for both clients and servers. */
-static int mgc_process_log(struct obd_device *mgc,
- struct config_llog_data *cld)
+int mgc_process_log(struct obd_device *mgc,
+ struct config_llog_data *cld)
{
struct llog_ctxt *ctxt, *lctxt;
struct lustre_handle lockh;
struct client_obd *cli = &mgc->u.cli;
struct lvfs_run_ctxt saved;
- struct lustre_sb_info *lsi;
+ struct lustre_sb_info *lsi = NULL;
int rc = 0, rcl, flags = 0, must_pop = 0;
ENTRY;
- if (!cld || !cld->cld_cfg.cfg_sb) {
- /* This should never happen */
- CERROR("Missing cld, aborting log update\n");
- RETURN(-EINVAL);
- }
- if (cld->cld_stopping)
+ LASSERT(cld);
+
+ /* I don't want multiple processes running process_log at once --
+ sounds like badness. It actually might be fine, as long as
+ we're not trying to update from the same log
+ simultaneously (in which case we should use a per-log sem.) */
+ cfs_down(&llog_process_lock);
+
+ if (cld->cld_stopping) {
+ cfs_up(&llog_process_lock);
RETURN(0);
+ }
- OBD_FAIL_TIMEOUT(OBD_FAIL_MGC_PROCESS_LOG, 20);
+ OBD_FAIL_TIMEOUT(OBD_FAIL_MGC_PAUSE_PROCESS_LOG, 20);
- lsi = s2lsi(cld->cld_cfg.cfg_sb);
+ if (cld->cld_cfg.cfg_sb)
+ lsi = s2lsi(cld->cld_cfg.cfg_sb);
CDEBUG(D_MGC, "Process log %s:%s from %d\n", cld->cld_logname,
cld->cld_cfg.cfg_instance, cld->cld_cfg.cfg_last_idx + 1);
ctxt = llog_get_context(mgc, LLOG_CONFIG_REPL_CTXT);
if (!ctxt) {
CERROR("missing llog context\n");
+ cfs_up(&llog_process_lock);
RETURN(-EINVAL);
}
- /* I don't want mutliple processes running process_log at once --
- sounds like badness. It actually might be fine, as long as
- we're not trying to update from the same log
- simultaneously (in which case we should use a per-log sem.) */
- down(&llog_process_lock);
-
/* Get the cfg lock on the llog */
rcl = mgc_enqueue(mgc->u.cli.cl_mgc_mgsexp, NULL, LDLM_PLAIN, NULL,
LCK_CR, &flags, NULL, NULL, NULL,
lctxt = llog_get_context(mgc, LLOG_CONFIG_ORIG_CTXT);
+ /*
+ * local copy of sptlrpc log is controlled elsewhere, don't try to
+ * read it up here.
+ */
+ if (rcl && cld->cld_is_sptlrpc)
+ GOTO(out_pop, rc);
+
/* Copy the setup log locally if we can. Don't mess around if we're
running an MGS though (logs are already local). */
if (lctxt && lsi && (lsi->lsi_flags & LSI_SERVER) &&
GOTO(out_pop, rc = -ENOTCONN);
}
CDEBUG(D_MGC, "Failed to get MGS log %s, using local "
- "copy for now, will try to update later.\n",
+ "copy for now, will try to update later.\n",
cld->cld_logname);
}
/* Now, whether we copied or not, start using the local llog.
ctxt = lctxt;
}
+ if (cld->cld_is_sptlrpc)
+ sptlrpc_conf_log_update_begin(cld->cld_logname);
+
/* logname and instance info should be the same, so use our
copy of the instance for the update. The cfg_last_idx will
be updated here. */
- rc = class_config_parse_llog(ctxt, cld->cld_logname, &cld->cld_cfg);
+ if (rcl == 0 || lctxt == ctxt)
+ rc = class_config_parse_llog(ctxt, cld->cld_logname, &cld->cld_cfg);
out_pop:
llog_ctxt_put(ctxt);
if (ctxt != lctxt)
if (must_pop)
pop_ctxt(&saved, &mgc->obd_lvfs_ctxt, NULL);
+ /*
+ * update settings on existing OBDs. doing it inside
+ * of llog_process_lock so no device is attaching/detaching
+ * in parallel.
+ * the logname must be <fsname>-sptlrpc
+ */
+ if (cld->cld_is_sptlrpc && rcl == 0) {
+ sptlrpc_conf_log_update_end(cld->cld_logname);
+ class_notify_sptlrpc_conf(cld->cld_logname,
+ strlen(cld->cld_logname) -
+ strlen("-sptlrpc"));
+ }
+
/* Now drop the lock so MGS can revoke it */
if (!rcl) {
rcl = mgc_cancel(mgc->u.cli.cl_mgc_mgsexp, NULL,
CDEBUG(D_MGC, "%s: configuration from log '%s' %sed (%d).\n",
mgc->obd_name, cld->cld_logname, rc ? "fail" : "succeed", rc);
- up(&llog_process_lock);
+ cfs_up(&llog_process_lock);
RETURN(rc);
}
CERROR("lov_del_obd unimplemented\n");
rc = -ENOSYS;
break;
+ case LCFG_SPTLRPC_CONF: {
+ rc = sptlrpc_process_config(lcfg);
+ break;
+ }
case LCFG_LOG_START: {
struct config_llog_data *cld;
struct config_llog_instance *cfg;
cfg->cfg_last_idx);
/* We're only called through here on the initial mount */
- rc = config_log_add(logname, cfg, sb);
+ rc = config_log_add(obd, logname, cfg, sb);
if (rc)
break;
cld = config_log_find(logname, cfg);
class_unregister_type(LUSTRE_MGC_NAME);
}
-MODULE_AUTHOR("Cluster File Systems, Inc. <info@clusterfs.com>");
+MODULE_AUTHOR("Sun Microsystems, Inc. <http://www.lustre.org/>");
MODULE_DESCRIPTION("Lustre Management Client");
MODULE_LICENSE("GPL");
git://git.whamcloud.com / fs / lustre-release.git / blobdiff