X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;ds=inline;f=lustre%2Fmgc%2Fmgc_request.c;h=7d35508bb61dfd9b18666ccd9dfdc51a5a859773;hb=e70a41c4316b5eb3a0b8e6b52c95653a2d4c85e5;hp=f2e30263605e726c11cc57ecf2e666d996af1fee;hpb=a926e593b0c769d20aef191e2b0b6b1d881b6637;p=fs%2Flustre-release.git diff --git a/lustre/mgc/mgc_request.c b/lustre/mgc/mgc_request.c index f2e3026..7d35508 100644 --- a/lustre/mgc/mgc_request.c +++ b/lustre/mgc/mgc_request.c @@ -27,7 +27,7 @@ * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved. * Use is subject to license terms. * - * Copyright (c) 2011, 2013, Intel Corporation. + * Copyright (c) 2011, 2015, Intel Corporation. */ /* * This file is part of Lustre, http://www.lustre.org/ @@ -42,12 +42,16 @@ #define D_MGC D_CONFIG /*|D_WARNING*/ #include -#include -#include +#include + +#include #include -#include +#include #include -#include +#include +#include +#include +#include #include "mgc_internal.h" @@ -77,8 +81,9 @@ static int mgc_name2resid(char *name, int len, struct ldlm_res_id *res_id, break; case CONFIG_T_RECOVER: case CONFIG_T_PARAMS: - resname = type; - break; + case CONFIG_T_NODEMAP: + resname = type; + break; default: LBUG(); } @@ -96,7 +101,8 @@ int mgc_fsname2resid(char *fsname, struct ldlm_res_id *res_id, int type) } EXPORT_SYMBOL(mgc_fsname2resid); -int mgc_logname2resid(char *logname, struct ldlm_res_id *res_id, int type) +static int mgc_logname2resid(char *logname, struct ldlm_res_id *res_id, + int type) { char *name_end; int len; @@ -113,50 +119,52 @@ int mgc_logname2resid(char *logname, struct ldlm_res_id *res_id, int type) } /********************** config llog list **********************/ -static CFS_LIST_HEAD(config_llog_list); +static struct list_head config_llog_list = LIST_HEAD_INIT(config_llog_list); static DEFINE_SPINLOCK(config_list_lock); /* Take a reference to a config log */ static int config_log_get(struct config_llog_data *cld) { - ENTRY; - cfs_atomic_inc(&cld->cld_refcount); - CDEBUG(D_INFO, "log %s refs %d\n", cld->cld_logname, - cfs_atomic_read(&cld->cld_refcount)); - RETURN(0); + ENTRY; + atomic_inc(&cld->cld_refcount); + CDEBUG(D_INFO, "log %s refs %d\n", cld->cld_logname, + atomic_read(&cld->cld_refcount)); + RETURN(0); } /* Drop a reference to a config log. When no longer referenced, we can free the config log data */ static void config_log_put(struct config_llog_data *cld) { - ENTRY; + ENTRY; - CDEBUG(D_INFO, "log %s refs %d\n", cld->cld_logname, - cfs_atomic_read(&cld->cld_refcount)); - LASSERT(cfs_atomic_read(&cld->cld_refcount) > 0); + CDEBUG(D_INFO, "log %s refs %d\n", cld->cld_logname, + atomic_read(&cld->cld_refcount)); + LASSERT(atomic_read(&cld->cld_refcount) > 0); - /* spinlock to make sure no item with 0 refcount in the list */ - if (cfs_atomic_dec_and_lock(&cld->cld_refcount, &config_list_lock)) { - cfs_list_del(&cld->cld_list_chain); + /* spinlock to make sure no item with 0 refcount in the list */ + if (atomic_dec_and_lock(&cld->cld_refcount, &config_list_lock)) { + list_del(&cld->cld_list_chain); spin_unlock(&config_list_lock); - CDEBUG(D_MGC, "dropping config log %s\n", cld->cld_logname); + CDEBUG(D_MGC, "dropping config log %s\n", cld->cld_logname); - if (cld->cld_recover) - config_log_put(cld->cld_recover); - if (cld->cld_sptlrpc) - config_log_put(cld->cld_sptlrpc); + if (cld->cld_recover) + config_log_put(cld->cld_recover); + if (cld->cld_sptlrpc) + config_log_put(cld->cld_sptlrpc); if (cld->cld_params) config_log_put(cld->cld_params); - if (cld_is_sptlrpc(cld)) - sptlrpc_conf_log_stop(cld->cld_logname); + if (cld->cld_nodemap) + config_log_put(cld->cld_nodemap); + if (cld_is_sptlrpc(cld)) + sptlrpc_conf_log_stop(cld->cld_logname); - class_export_put(cld->cld_mgcexp); - OBD_FREE(cld, sizeof(*cld) + strlen(cld->cld_logname) + 1); - } + class_export_put(cld->cld_mgcexp); + OBD_FREE(cld, sizeof(*cld) + strlen(cld->cld_logname) + 1); + } - EXIT; + EXIT; } /* Find a config log by name */ @@ -173,81 +181,83 @@ struct config_llog_data *config_log_find(char *logname, instance = cfg ? cfg->cfg_instance : NULL; spin_lock(&config_list_lock); - cfs_list_for_each_entry(cld, &config_llog_list, cld_list_chain) { + list_for_each_entry(cld, &config_llog_list, cld_list_chain) { /* check if instance equals */ if (instance != cld->cld_cfg.cfg_instance) continue; - /* instance may be NULL, should check name */ - if (strcmp(logname, cld->cld_logname) == 0) { - found = cld; - break; - } - } - if (found) { - cfs_atomic_inc(&found->cld_refcount); - LASSERT(found->cld_stopping == 0 || cld_is_sptlrpc(found) == 0); - } + /* instance may be NULL, should check name */ + if (strcmp(logname, cld->cld_logname) == 0) { + found = cld; + break; + } + } + if (found) { + atomic_inc(&found->cld_refcount); + LASSERT(found->cld_stopping == 0 || cld_is_sptlrpc(found) == 0); + } spin_unlock(&config_list_lock); RETURN(found); } static struct config_llog_data *do_config_log_add(struct obd_device *obd, - char *logname, - int type, - struct config_llog_instance *cfg, - struct super_block *sb) + char *logname, + int type, + struct config_llog_instance *cfg, + struct super_block *sb) { - struct config_llog_data *cld; - int rc; - ENTRY; + struct config_llog_data *cld; + int rc; + + ENTRY; - CDEBUG(D_MGC, "do adding config log %s:%p\n", logname, - cfg ? cfg->cfg_instance : 0); + CDEBUG(D_MGC, "do adding config log %s:%p\n", logname, + cfg ? cfg->cfg_instance : NULL); - OBD_ALLOC(cld, sizeof(*cld) + strlen(logname) + 1); - if (!cld) - RETURN(ERR_PTR(-ENOMEM)); + OBD_ALLOC(cld, sizeof(*cld) + strlen(logname) + 1); + if (!cld) + RETURN(ERR_PTR(-ENOMEM)); - strcpy(cld->cld_logname, logname); - if (cfg) - cld->cld_cfg = *cfg; + strcpy(cld->cld_logname, logname); + if (cfg) + cld->cld_cfg = *cfg; else cld->cld_cfg.cfg_callback = class_config_llog_handler; mutex_init(&cld->cld_lock); - cld->cld_cfg.cfg_last_idx = 0; - cld->cld_cfg.cfg_flags = 0; - cld->cld_cfg.cfg_sb = sb; - cld->cld_type = type; - cfs_atomic_set(&cld->cld_refcount, 1); - - /* Keep the mgc around until we are done */ - cld->cld_mgcexp = class_export_get(obd->obd_self_export); - - if (cld_is_sptlrpc(cld)) { - sptlrpc_conf_log_start(logname); - cld->cld_cfg.cfg_obdname = obd->obd_name; - } + cld->cld_cfg.cfg_last_idx = 0; + cld->cld_cfg.cfg_flags = 0; + cld->cld_cfg.cfg_sb = sb; + cld->cld_type = type; + atomic_set(&cld->cld_refcount, 1); + + /* Keep the mgc around until we are done */ + cld->cld_mgcexp = class_export_get(obd->obd_self_export); + + if (cld_is_sptlrpc(cld)) { + sptlrpc_conf_log_start(logname); + cld->cld_cfg.cfg_obdname = obd->obd_name; + } - rc = mgc_logname2resid(logname, &cld->cld_resid, type); + rc = mgc_logname2resid(logname, &cld->cld_resid, type); spin_lock(&config_list_lock); - cfs_list_add(&cld->cld_list_chain, &config_llog_list); + list_add(&cld->cld_list_chain, &config_llog_list); spin_unlock(&config_list_lock); - if (rc) { - config_log_put(cld); - RETURN(ERR_PTR(rc)); - } + if (rc) { + config_log_put(cld); + RETURN(ERR_PTR(rc)); + } - if (cld_is_sptlrpc(cld)) { - rc = mgc_process_log(obd, cld); + if (cld_is_sptlrpc(cld) || cld_is_nodemap(cld)) { + rc = mgc_process_log(obd, cld); if (rc && rc != -ENOENT) - CERROR("failed processing sptlrpc log: %d\n", rc); - } + CERROR("%s: failed processing log, type %d: rc = %d\n", + obd->obd_name, type, rc); + } - RETURN(cld); + RETURN(cld); } static struct config_llog_data *config_recover_log_add(struct obd_device *obd, @@ -304,90 +314,109 @@ static struct config_llog_data *config_params_log_add(struct obd_device *obd, * 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_instance *cfg, + struct super_block *sb) { struct lustre_sb_info *lsi = s2lsi(sb); struct config_llog_data *cld; struct config_llog_data *sptlrpc_cld; struct config_llog_data *params_cld; + struct config_llog_data *nodemap_cld; char seclogname[32]; char *ptr; int rc; ENTRY; - CDEBUG(D_MGC, "adding config log %s:%p\n", logname, cfg->cfg_instance); + CDEBUG(D_MGC, "adding config log %s:%p\n", logname, cfg->cfg_instance); - /* - * for each regular log, the depended sptlrpc log name is - * -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); - } + /* + * for each regular log, the depended sptlrpc log name is + * -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"); + memcpy(seclogname, logname, ptr - logname); + strcpy(seclogname + (ptr - logname), "-sptlrpc"); + + sptlrpc_cld = config_log_find(seclogname, NULL); + if (sptlrpc_cld == NULL) { + sptlrpc_cld = do_config_log_add(obd, seclogname, + CONFIG_T_SPTLRPC, NULL, NULL); + if (IS_ERR(sptlrpc_cld)) { + CERROR("can't create sptlrpc log: %s\n", seclogname); + GOTO(out, rc = PTR_ERR(sptlrpc_cld)); + } + } + + nodemap_cld = config_log_find(LUSTRE_NODEMAP_NAME, NULL); + if (!nodemap_cld && IS_SERVER(lsi) && !IS_MGS(lsi)) { + nodemap_cld = do_config_log_add(obd, LUSTRE_NODEMAP_NAME, + CONFIG_T_NODEMAP, NULL, NULL); + if (IS_ERR(nodemap_cld)) { + rc = PTR_ERR(nodemap_cld); + CERROR("%s: cannot create nodemap log: rc = %d\n", + obd->obd_name, rc); + GOTO(out_sptlrpc, rc); + } + } - sptlrpc_cld = config_log_find(seclogname, NULL); - if (sptlrpc_cld == NULL) { - sptlrpc_cld = do_config_log_add(obd, seclogname, - CONFIG_T_SPTLRPC, NULL, NULL); - if (IS_ERR(sptlrpc_cld)) { - CERROR("can't create sptlrpc log: %s\n", seclogname); - GOTO(out_err, rc = PTR_ERR(sptlrpc_cld)); - } - } params_cld = config_params_log_add(obd, cfg, sb); if (IS_ERR(params_cld)) { rc = PTR_ERR(params_cld); CERROR("%s: can't create params log: rc = %d\n", obd->obd_name, rc); - GOTO(out_err1, rc); + GOTO(out_nodemap, rc); } cld = do_config_log_add(obd, logname, CONFIG_T_CONFIG, cfg, sb); if (IS_ERR(cld)) { CERROR("can't create log: %s\n", logname); - GOTO(out_err2, rc = PTR_ERR(cld)); + GOTO(out_params, rc = PTR_ERR(cld)); } - cld->cld_sptlrpc = sptlrpc_cld; - cld->cld_params = params_cld; - - LASSERT(lsi->lsi_lmd); - if (!(lsi->lsi_lmd->lmd_flags & LMD_FLG_NOIR)) { - struct config_llog_data *recover_cld; + LASSERT(lsi->lsi_lmd); + if (!(lsi->lsi_lmd->lmd_flags & LMD_FLG_NOIR)) { + struct config_llog_data *recover_cld; ptr = strrchr(seclogname, '-'); if (ptr != NULL) { *ptr = 0; } else { - CERROR("sptlrpc log name not correct: %s", seclogname); + CERROR("%s: sptlrpc log name not correct, %s: " + "rc = %d\n", obd->obd_name, seclogname, -EINVAL); config_log_put(cld); RETURN(-EINVAL); } - recover_cld = config_recover_log_add(obd, seclogname, cfg, sb); + recover_cld = config_recover_log_add(obd, seclogname, cfg, sb); if (IS_ERR(recover_cld)) - GOTO(out_err3, rc = PTR_ERR(recover_cld)); + GOTO(out_cld, rc = PTR_ERR(recover_cld)); cld->cld_recover = recover_cld; } + cld->cld_sptlrpc = sptlrpc_cld; + cld->cld_params = params_cld; + cld->cld_nodemap = nodemap_cld; + RETURN(0); -out_err3: +out_cld: config_log_put(cld); -out_err2: +out_params: config_log_put(params_cld); -out_err1: +out_nodemap: + config_log_put(nodemap_cld); + +out_sptlrpc: config_log_put(sptlrpc_cld); -out_err: - RETURN(rc); +out: + return rc; } DEFINE_MUTEX(llog_process_lock); @@ -396,36 +425,38 @@ DEFINE_MUTEX(llog_process_lock); */ static int config_log_end(char *logname, struct config_llog_instance *cfg) { - struct config_llog_data *cld; - struct config_llog_data *cld_sptlrpc = NULL; + struct config_llog_data *cld; + struct config_llog_data *cld_sptlrpc = NULL; struct config_llog_data *cld_params = NULL; - struct config_llog_data *cld_recover = NULL; - int rc = 0; - ENTRY; + struct config_llog_data *cld_recover = NULL; + struct config_llog_data *cld_nodemap = NULL; + int rc = 0; - cld = config_log_find(logname, cfg); - if (cld == NULL) - RETURN(-ENOENT); + ENTRY; + + cld = config_log_find(logname, cfg); + if (cld == NULL) + RETURN(-ENOENT); mutex_lock(&cld->cld_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)) { + /* + * 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)) { mutex_unlock(&cld->cld_lock); - /* drop the ref from the find */ - config_log_put(cld); - RETURN(rc); - } + /* drop the ref from the find */ + config_log_put(cld); + RETURN(rc); + } - cld->cld_stopping = 1; + cld->cld_stopping = 1; - cld_recover = cld->cld_recover; - cld->cld_recover = NULL; + cld_recover = cld->cld_recover; + cld->cld_recover = NULL; mutex_unlock(&cld->cld_lock); if (cld_recover) { @@ -440,10 +471,12 @@ static int config_log_end(char *logname, struct config_llog_instance *cfg) cld->cld_sptlrpc = NULL; cld_params = cld->cld_params; cld->cld_params = NULL; + cld_nodemap = cld->cld_nodemap; + cld->cld_nodemap = NULL; spin_unlock(&config_list_lock); - if (cld_sptlrpc) - config_log_put(cld_sptlrpc); + if (cld_sptlrpc) + config_log_put(cld_sptlrpc); if (cld_params) { mutex_lock(&cld_params->cld_lock); @@ -452,69 +485,87 @@ static int config_log_end(char *logname, struct config_llog_instance *cfg) config_log_put(cld_params); } - /* drop the ref from the find */ - config_log_put(cld); - /* drop the start ref */ - config_log_put(cld); + /* don't set cld_stopping on nm lock as other targets may be active */ + if (cld_nodemap) + config_log_put(cld_nodemap); - CDEBUG(D_MGC, "end config log %s (%d)\n", logname ? logname : "client", - rc); - RETURN(rc); + /* 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); } -int lprocfs_mgc_rd_ir_state(char *page, char **start, off_t off, - int count, int *eof, void *data) +#ifdef CONFIG_PROC_FS +int lprocfs_mgc_rd_ir_state(struct seq_file *m, void *data) { - struct obd_device *obd = data; - struct obd_import *imp = obd->u.cli.cl_import; - struct obd_connect_data *ocd = &imp->imp_connect_data; - struct config_llog_data *cld; - int rc = 0; - ENTRY; + struct obd_device *obd = data; + struct obd_import *imp; + struct obd_connect_data *ocd; + struct config_llog_data *cld; + ENTRY; + + LASSERT(obd != NULL); + LPROCFS_CLIMP_CHECK(obd); + imp = obd->u.cli.cl_import; + ocd = &imp->imp_connect_data; - rc = snprintf(page, count, "imperative_recovery: %s\n", - OCD_HAS_FLAG(ocd, IMP_RECOV) ? "ENABLED" : "DISABLED"); - rc += snprintf(page + rc, count - rc, "client_state:\n"); + seq_printf(m, "imperative_recovery: %s\n", + OCD_HAS_FLAG(ocd, IMP_RECOV) ? "ENABLED" : "DISABLED"); + seq_printf(m, "client_state:\n"); spin_lock(&config_list_lock); - cfs_list_for_each_entry(cld, &config_llog_list, cld_list_chain) { + list_for_each_entry(cld, &config_llog_list, cld_list_chain) { if (cld->cld_recover == NULL) continue; - rc += snprintf(page + rc, count - rc, - " - { client: %s, nidtbl_version: %u }\n", - cld->cld_logname, - cld->cld_recover->cld_cfg.cfg_last_idx); + seq_printf(m, " - { client: %s, nidtbl_version: %u }\n", + cld->cld_logname, + cld->cld_recover->cld_cfg.cfg_last_idx); } spin_unlock(&config_list_lock); - RETURN(rc); + LPROCFS_CLIMP_EXIT(obd); + RETURN(0); } +#endif /* reenqueue any lost locks */ -#define RQ_RUNNING 0x1 -#define RQ_NOW 0x2 -#define RQ_LATER 0x4 -#define RQ_STOP 0x8 +#define RQ_RUNNING 0x1 +#define RQ_NOW 0x2 +#define RQ_LATER 0x4 +#define RQ_STOP 0x8 +#define RQ_PRECLEANUP 0x10 static int rq_state = 0; -static cfs_waitq_t rq_waitq; +static wait_queue_head_t rq_waitq; static DECLARE_COMPLETION(rq_exit); +static DECLARE_COMPLETION(rq_start); static void do_requeue(struct config_llog_data *cld) { - ENTRY; - 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. */ - 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); - } + int rc = 0; + ENTRY; + + LASSERT(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. + */ + down_read_nested(&cld->cld_mgcexp->exp_obd->u.cli.cl_sem, + OBD_CLI_SEM_MGC); + if (cld->cld_mgcexp->exp_obd->u.cli.cl_conn_count != 0) { + CDEBUG(D_MGC, "updating log %s\n", cld->cld_logname); + rc = mgc_process_log(cld->cld_mgcexp->exp_obd, cld); + if (rc && rc != -ENOENT) + CERROR("failed processing log: %d\n", rc); + } else { + CDEBUG(D_MGC, "disconnecting, won't update log %s\n", + cld->cld_logname); + } up_read(&cld->cld_mgcexp->exp_obd->u.cli.cl_sem); EXIT; @@ -529,12 +580,13 @@ static void do_requeue(struct config_llog_data *cld) static int mgc_requeue_thread(void *data) { - int rc = 0; - ENTRY; + int rc = 0; + bool first = true; + ENTRY; - CDEBUG(D_MGC, "Starting requeue thread\n"); + CDEBUG(D_MGC, "Starting requeue thread\n"); - /* Keep trying failed locks periodically */ + /* Keep trying failed locks periodically */ spin_lock(&config_list_lock); rq_state |= RQ_RUNNING; while (1) { @@ -548,13 +600,20 @@ static int mgc_requeue_thread(void *data) rq_state &= ~(RQ_NOW | RQ_LATER); spin_unlock(&config_list_lock); + if (first) { + first = false; + complete(&rq_start); + } + /* 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. */ - to = MGC_TIMEOUT_MIN_SECONDS * HZ; - to += rand * HZ / 100; /* rand is centi-seconds */ + to = msecs_to_jiffies(MGC_TIMEOUT_MIN_SECONDS * MSEC_PER_SEC); + /* rand is centi-seconds */ + to += msecs_to_jiffies(rand * MSEC_PER_SEC / 100); lwi = LWI_TIMEOUT(to, NULL, NULL); - l_wait_event(rq_waitq, rq_state & RQ_STOP, &lwi); + l_wait_event(rq_waitq, rq_state & (RQ_STOP | RQ_PRECLEANUP), + &lwi); /* * iterate & processing through the list. for each cld, process @@ -567,20 +626,21 @@ static int mgc_requeue_thread(void *data) cld_prev = NULL; spin_lock(&config_list_lock); - cfs_list_for_each_entry(cld, &config_llog_list, + rq_state &= ~RQ_PRECLEANUP; + list_for_each_entry(cld, &config_llog_list, cld_list_chain) { if (!cld->cld_lostlock) continue; spin_unlock(&config_list_lock); - LASSERT(cfs_atomic_read(&cld->cld_refcount) > 0); + LASSERT(atomic_read(&cld->cld_refcount) > 0); - /* Whether we enqueued again or not in mgc_process_log, - * we're done with the ref from the old enqueue */ - if (cld_prev) - config_log_put(cld_prev); - cld_prev = cld; + /* Whether we enqueued again or not in mgc_process_log, + * we're done with the ref from the old enqueue */ + if (cld_prev) + config_log_put(cld_prev); + cld_prev = cld; cld->cld_lostlock = 0; if (likely(!stopped)) @@ -619,12 +679,12 @@ static int mgc_requeue_thread(void *data) We are responsible for dropping the config log reference from here on out. */ static void mgc_requeue_add(struct config_llog_data *cld) { - ENTRY; + ENTRY; - CDEBUG(D_INFO, "log %s: requeue (r=%d sp=%d st=%x)\n", - cld->cld_logname, cfs_atomic_read(&cld->cld_refcount), - cld->cld_stopping, rq_state); - LASSERT(cfs_atomic_read(&cld->cld_refcount) > 0); + CDEBUG(D_INFO, "log %s: requeue (r=%d sp=%d st=%x)\n", + cld->cld_logname, atomic_read(&cld->cld_refcount), + cld->cld_stopping, rq_state); + LASSERT(atomic_read(&cld->cld_refcount) > 0); mutex_lock(&cld->cld_lock); if (cld->cld_stopping || cld->cld_lostlock) { @@ -645,7 +705,7 @@ static void mgc_requeue_add(struct config_llog_data *cld) } else { rq_state |= RQ_NOW; spin_unlock(&config_list_lock); - cfs_waitq_signal(&rq_waitq); + wake_up(&rq_waitq); } EXIT; } @@ -686,13 +746,13 @@ static int mgc_local_llog_fini(const struct lu_env *env, RETURN(0); } -static int mgc_fs_setup(struct obd_device *obd, struct super_block *sb) +static int mgc_fs_setup(const struct lu_env *env, struct obd_device *obd, + struct super_block *sb) { struct lustre_sb_info *lsi = s2lsi(sb); struct client_obd *cli = &obd->u.cli; struct lu_fid rfid, fid; struct dt_object *root, *dto; - struct lu_env *env; int rc = 0; ENTRY; @@ -700,34 +760,24 @@ static int mgc_fs_setup(struct obd_device *obd, struct super_block *sb) LASSERT(lsi); LASSERT(lsi->lsi_dt_dev); - OBD_ALLOC_PTR(env); - if (env == NULL) - RETURN(-ENOMEM); - - /* The mgc fs exclusion sem. Only one fs can be setup at a time. */ - down(&cli->cl_mgc_sem); - - cfs_cleanup_group_info(); + /* The mgc fs exclusion mutex. Only one fs can be setup at a time. */ + mutex_lock(&cli->cl_mgc_mutex); /* Setup the configs dir */ - rc = lu_env_init(env, LCT_MG_THREAD); - if (rc) - GOTO(out_err, rc); - fid.f_seq = FID_SEQ_LOCAL_NAME; fid.f_oid = 1; fid.f_ver = 0; rc = local_oid_storage_init(env, lsi->lsi_dt_dev, &fid, &cli->cl_mgc_los); if (rc) - GOTO(out_env, rc); + RETURN(rc); rc = dt_root_get(env, lsi->lsi_dt_dev, &rfid); if (rc) - GOTO(out_env, rc); + GOTO(out_los, rc); root = dt_locate_at(env, lsi->lsi_dt_dev, &rfid, - &cli->cl_mgc_los->los_dev->dd_lu_dev); + &cli->cl_mgc_los->los_dev->dd_lu_dev, NULL); if (unlikely(IS_ERR(root))) GOTO(out_los, rc = PTR_ERR(root)); @@ -760,41 +810,28 @@ out_los: if (rc < 0) { local_oid_storage_fini(env, cli->cl_mgc_los); cli->cl_mgc_los = NULL; - up(&cli->cl_mgc_sem); + mutex_unlock(&cli->cl_mgc_mutex); } -out_env: - lu_env_fini(env); -out_err: - OBD_FREE_PTR(env); return rc; } -static int mgc_fs_cleanup(struct obd_device *obd) +static int mgc_fs_cleanup(const struct lu_env *env, struct obd_device *obd) { - struct lu_env env; struct client_obd *cli = &obd->u.cli; - int rc; - ENTRY; LASSERT(cli->cl_mgc_los != NULL); - rc = lu_env_init(&env, LCT_MG_THREAD); - if (rc) - GOTO(unlock, rc); - - mgc_local_llog_fini(&env, obd); + mgc_local_llog_fini(env, obd); - lu_object_put_nocache(&env, &cli->cl_mgc_configs_dir->do_lu); + lu_object_put_nocache(env, &cli->cl_mgc_configs_dir->do_lu); cli->cl_mgc_configs_dir = NULL; - local_oid_storage_fini(&env, cli->cl_mgc_los); + local_oid_storage_fini(env, cli->cl_mgc_los); cli->cl_mgc_los = NULL; - lu_env_fini(&env); -unlock: class_decref(obd, "mgc_fs", obd); - up(&cli->cl_mgc_sem); + mutex_unlock(&cli->cl_mgc_mutex); RETURN(0); } @@ -836,36 +873,36 @@ static int mgc_llog_fini(const struct lu_env *env, struct obd_device *obd) } -static cfs_atomic_t mgc_count = CFS_ATOMIC_INIT(0); -static int mgc_precleanup(struct obd_device *obd, enum obd_cleanup_stage stage) +static atomic_t mgc_count = ATOMIC_INIT(0); +static int mgc_precleanup(struct obd_device *obd) { - int rc = 0; - ENTRY; + int rc = 0; + int temp; + ENTRY; - switch (stage) { - case OBD_CLEANUP_EARLY: - break; - case OBD_CLEANUP_EXPORTS: - if (cfs_atomic_dec_and_test(&mgc_count)) { - int running; - /* stop requeue thread */ - spin_lock(&config_list_lock); - running = rq_state & RQ_RUNNING; - if (running) - rq_state |= RQ_STOP; - spin_unlock(&config_list_lock); - if (running) { - cfs_waitq_signal(&rq_waitq); - wait_for_completion(&rq_exit); - } - } - obd_cleanup_client_import(obd); - rc = mgc_llog_fini(NULL, obd); - if (rc != 0) - CERROR("failed to cleanup llogging subsystems\n"); - break; - } - RETURN(rc); + if (atomic_dec_and_test(&mgc_count)) { + LASSERT(rq_state & RQ_RUNNING); + /* stop requeue thread */ + temp = RQ_STOP; + } else { + /* wakeup requeue thread to clean our cld */ + temp = RQ_NOW | RQ_PRECLEANUP; + } + + spin_lock(&config_list_lock); + rq_state |= temp; + spin_unlock(&config_list_lock); + wake_up(&rq_waitq); + + if (temp & RQ_STOP) + wait_for_completion(&rq_exit); + obd_cleanup_client_import(obd); + + rc = mgc_llog_fini(NULL, obd); + if (rc != 0) + CERROR("failed to cleanup llogging subsystems\n"); + + RETURN(rc); } static int mgc_cleanup(struct obd_device *obd) @@ -888,50 +925,55 @@ static int mgc_cleanup(struct obd_device *obd) static int mgc_setup(struct obd_device *obd, struct lustre_cfg *lcfg) { - struct lprocfs_static_vars lvars; - int rc; - ENTRY; + struct task_struct *task; + int rc; + ENTRY; - ptlrpcd_addref(); + rc = ptlrpcd_addref(); + if (rc < 0) + RETURN(rc); - rc = client_obd_setup(obd, lcfg); - if (rc) - GOTO(err_decref, rc); + rc = client_obd_setup(obd, lcfg); + if (rc) + GOTO(err_decref, rc); rc = mgc_llog_init(NULL, obd); - if (rc) { - CERROR("failed to setup llogging subsystems\n"); - GOTO(err_cleanup, rc); - } + 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); +#ifdef CONFIG_PROC_FS + obd->obd_vars = lprocfs_mgc_obd_vars; + lprocfs_obd_setup(obd); +#endif + sptlrpc_lprocfs_cliobd_attach(obd); - if (cfs_atomic_inc_return(&mgc_count) == 1) { + if (atomic_inc_return(&mgc_count) == 1) { rq_state = 0; - cfs_waitq_init(&rq_waitq); + init_waitqueue_head(&rq_waitq); /* start requeue thread */ - rc = PTR_ERR(kthread_run(mgc_requeue_thread, NULL, - "ll_cfg_requeue")); - if (IS_ERR_VALUE(rc)) { - CERROR("%s: Cannot start requeue thread (%d)," - "no more log updates!\n", + task = kthread_run(mgc_requeue_thread, NULL, "ll_cfg_requeue"); + if (IS_ERR(task)) { + rc = PTR_ERR(task); + CERROR("%s: cannot start requeue thread: rc = %d; " + "no more log updates\n", obd->obd_name, rc); GOTO(err_cleanup, rc); } /* rc is the task_struct pointer of mgc_requeue_thread. */ rc = 0; - } + wait_for_completion(&rq_start); + } - RETURN(rc); + RETURN(rc); err_cleanup: - client_obd_cleanup(obd); + client_obd_cleanup(obd); err_decref: - ptlrpcd_decref(); - RETURN(rc); + ptlrpcd_decref(); + RETURN(rc); } /* based on ll_mdc_blocking_ast */ @@ -958,29 +1000,29 @@ static int mgc_blocking_ast(struct ldlm_lock *lock, struct ldlm_lock_desc *desc, PLDLMRES(lock->l_resource), (char *)&lock->l_resource->lr_name.name[0]); - if (!cld) { - CDEBUG(D_INFO, "missing data, won't requeue\n"); - break; - } + if (!cld) { + CDEBUG(D_INFO, "missing data, won't requeue\n"); + break; + } - /* held at mgc_process_log(). */ - LASSERT(cfs_atomic_read(&cld->cld_refcount) > 0); - /* Are we done with this log? */ - if (cld->cld_stopping) { - CDEBUG(D_MGC, "log %s: stopping, won't requeue\n", - cld->cld_logname); - config_log_put(cld); - break; - } - /* Make sure not to re-enqueue when the mgc is stopping - (we get called from client_disconnect_export) */ - if (!lock->l_conn_export || - !lock->l_conn_export->exp_obd->u.cli.cl_conn_count) { - CDEBUG(D_MGC, "log %.8s: disconnecting, won't requeue\n", - cld->cld_logname); - config_log_put(cld); - break; - } + /* held at mgc_process_log(). */ + LASSERT(atomic_read(&cld->cld_refcount) > 0); + /* Are we done with this log? */ + if (cld->cld_stopping) { + CDEBUG(D_MGC, "log %s: stopping, won't requeue\n", + cld->cld_logname); + config_log_put(cld); + break; + } + /* Make sure not to re-enqueue when the mgc is stopping + (we get called from client_disconnect_export) */ + if (lock->l_conn_export == NULL || + lock->l_conn_export->exp_obd->u.cli.cl_conn_count == 0) { + CDEBUG(D_MGC, "log %.8s: disconnecting, won't requeue\n", + cld->cld_logname); + config_log_put(cld); + break; + } /* Re-enqueue now */ mgc_requeue_add(cld); @@ -994,7 +1036,10 @@ static int mgc_blocking_ast(struct ldlm_lock *lock, struct ldlm_lock_desc *desc, } /* Not sure where this should go... */ -#define MGC_ENQUEUE_LIMIT 50 +/* This is the timeout value for MGS_CONNECT request plus a ping interval, such + * that we can have a chance to try the secondary MGS if any. */ +#define MGC_ENQUEUE_LIMIT (INITIAL_CONNECT_TIMEOUT + (AT_OFF ? 0 : at_min) \ + + PING_INTERVAL) #define MGC_TARGET_REG_LIMIT 10 #define MGC_SEND_PARAM_LIMIT 10 @@ -1036,8 +1081,8 @@ static int mgc_set_mgs_param(struct obd_export *exp, } /* Take a config lock so we can get cancel notifications */ -static int mgc_enqueue(struct obd_export *exp, struct lov_stripe_md *lsm, - __u32 type, ldlm_policy_data_t *policy, __u32 mode, +static int mgc_enqueue(struct obd_export *exp, enum ldlm_type type, + union ldlm_policy_data *policy, enum ldlm_mode mode, __u64 *flags, void *bl_cb, void *cp_cb, void *gl_cb, void *data, __u32 lvb_len, void *lvb_swabber, struct lustre_handle *lockh) @@ -1084,14 +1129,14 @@ static int mgc_enqueue(struct obd_export *exp, struct lov_stripe_md *lsm, RETURN(rc); } -static int mgc_cancel(struct obd_export *exp, struct lov_stripe_md *md, - __u32 mode, struct lustre_handle *lockh) +static int mgc_cancel(struct obd_export *exp, enum ldlm_mode mode, + struct lustre_handle *lockh) { - ENTRY; + ENTRY; - ldlm_lock_decref(lockh, mode); + ldlm_lock_decref(lockh, mode); - RETURN(0); + RETURN(0); } static void mgc_notify_active(struct obd_device *unused) @@ -1100,7 +1145,7 @@ static void mgc_notify_active(struct obd_device *unused) spin_lock(&config_list_lock); rq_state |= RQ_NOW; spin_unlock(&config_list_lock); - cfs_waitq_signal(&rq_waitq); + wake_up(&rq_waitq); /* TODO: Help the MGS rebuild nidtbl. -jay */ } @@ -1145,9 +1190,10 @@ static int mgc_target_register(struct obd_export *exp, RETURN(rc); } -int mgc_set_info_async(const struct lu_env *env, struct obd_export *exp, - obd_count keylen, void *key, obd_count vallen, - void *val, struct ptlrpc_request_set *set) +static int mgc_set_info_async(const struct lu_env *env, struct obd_export *exp, + u32 keylen, void *key, + u32 vallen, void *val, + struct ptlrpc_request_set *set) { int rc = -EINVAL; ENTRY; @@ -1187,13 +1233,13 @@ int mgc_set_info_async(const struct lu_env *env, struct obd_export *exp, if (vallen != sizeof(struct super_block)) RETURN(-EINVAL); - rc = mgc_fs_setup(exp->exp_obd, sb); + rc = mgc_fs_setup(env, exp->exp_obd, sb); RETURN(rc); } if (KEY_IS(KEY_CLEAR_FS)) { if (vallen != 0) RETURN(-EINVAL); - rc = mgc_fs_cleanup(exp->exp_obd); + rc = mgc_fs_cleanup(env, exp->exp_obd); RETURN(rc); } if (KEY_IS(KEY_SET_INFO)) { @@ -1251,8 +1297,7 @@ int mgc_set_info_async(const struct lu_env *env, struct obd_export *exp, } static int mgc_get_info(const struct lu_env *env, struct obd_export *exp, - __u32 keylen, void *key, __u32 *vallen, void *val, - struct lov_stripe_md *unused) + __u32 keylen, void *key, __u32 *vallen, void *val) { int rc = -EINVAL; @@ -1365,7 +1410,7 @@ static int mgc_apply_recover_logs(struct obd_device *mgc, while (datalen > 0) { int entry_len = sizeof(*entry); - int is_ost; + int is_ost, i; struct obd_device *obd; char *obdname; char *cname; @@ -1471,11 +1516,17 @@ static int mgc_apply_recover_logs(struct obd_device *mgc, continue; } - /* TODO: iterate all nids to find one */ - /* find uuid by nid */ - rc = client_import_find_conn(obd->u.cli.cl_import, - entry->u.nids[0], - (struct obd_uuid *)uuid); + /* iterate all nids to find one */ + /* find uuid by nid */ + rc = -ENOENT; + for (i = 0; i < entry->mne_nid_count; i++) { + rc = client_import_find_conn(obd->u.cli.cl_import, + entry->u.nids[i], + (struct obd_uuid *)uuid); + if (rc == 0) + break; + } + up_read(&obd->u.cli.cl_sem); if (rc < 0) { CERROR("mgc: cannot find uuid by nid %s\n", @@ -1492,12 +1543,11 @@ static int mgc_apply_recover_logs(struct obd_device *mgc, lustre_cfg_bufs_set_string(&bufs, 1, params); - rc = -ENOMEM; - lcfg = lustre_cfg_new(LCFG_PARAM, &bufs); - if (lcfg == NULL) { - CERROR("mgc: cannot allocate memory\n"); - break; - } + lcfg = lustre_cfg_new(LCFG_PARAM, &bufs); + if (lcfg == NULL) { + rc = -ENOMEM; + break; + } CDEBUG(D_INFO, "ir apply logs "LPD64"/"LPD64" for %s -> %s\n", prev_version, max_version, obdname, params); @@ -1517,24 +1567,36 @@ static int mgc_apply_recover_logs(struct obd_device *mgc, /** * This function is called if this client was notified for target restarting - * by the MGS. A CONFIG_READ RPC is going to send to fetch recovery logs. + * by the MGS. A CONFIG_READ RPC is going to send to fetch recovery or + * nodemap logs. */ -static int mgc_process_recover_log(struct obd_device *obd, - struct config_llog_data *cld) +static int mgc_process_recover_nodemap_log(struct obd_device *obd, + struct config_llog_data *cld) { - struct ptlrpc_request *req = NULL; - struct config_llog_instance *cfg = &cld->cld_cfg; - struct mgs_config_body *body; - struct mgs_config_res *res; - struct ptlrpc_bulk_desc *desc; - struct page **pages; - int nrpages; - bool eof = true; + struct ptlrpc_connection *mgc_conn; + struct ptlrpc_request *req = NULL; + struct config_llog_instance *cfg = &cld->cld_cfg; + struct mgs_config_body *body; + struct mgs_config_res *res; + struct nodemap_config *new_config = NULL; + struct lu_nodemap *recent_nodemap = NULL; + struct ptlrpc_bulk_desc *desc; + struct page **pages = NULL; + __u64 config_read_offset = 0; + int nrpages = 0; + bool eof = true; bool mne_swab = false; - int i; - int ealen; - int rc; - ENTRY; + int i; + int ealen; + int rc; + ENTRY; + + mgc_conn = class_exp2cliimp(cld->cld_mgcexp)->imp_connection; + + /* don't need to get local config */ + if (cld_is_nodemap(cld) && + (LNET_NETTYP(LNET_NIDNET(mgc_conn->c_peer.nid)) == LOLND)) + GOTO(out, rc = 0); /* allocate buffer for bulk transfer. * if this is the first time for this mgs to read logs, @@ -1543,7 +1605,7 @@ static int mgc_process_recover_log(struct obd_device *obd, * small and CONFIG_READ_NRPAGES will be used. */ nrpages = CONFIG_READ_NRPAGES; - if (cfg->cfg_last_idx == 0) /* the first time */ + if (cfg->cfg_last_idx == 0 || cld_is_nodemap(cld)) nrpages = CONFIG_READ_NRPAGES_INIT; OBD_ALLOC(pages, sizeof(*pages) * nrpages); @@ -1551,108 +1613,175 @@ static int mgc_process_recover_log(struct obd_device *obd, GOTO(out, rc = -ENOMEM); for (i = 0; i < nrpages; i++) { - pages[i] = alloc_page(GFP_IOFS); + pages[i] = alloc_page(GFP_KERNEL); if (pages[i] == NULL) GOTO(out, rc = -ENOMEM); } again: - LASSERT(cld_is_recover(cld)); +#ifdef HAVE_SERVER_SUPPORT + if (cld_is_nodemap(cld) && config_read_offset == 0) { + new_config = nodemap_config_alloc(); + if (IS_ERR(new_config)) { + rc = PTR_ERR(new_config); + new_config = NULL; + GOTO(out, rc); + } + } +#endif + LASSERT(cld_is_recover(cld) || cld_is_nodemap(cld)); LASSERT(mutex_is_locked(&cld->cld_lock)); - req = ptlrpc_request_alloc(class_exp2cliimp(cld->cld_mgcexp), - &RQF_MGS_CONFIG_READ); - if (req == NULL) - GOTO(out, rc = -ENOMEM); + req = ptlrpc_request_alloc(class_exp2cliimp(cld->cld_mgcexp), + &RQF_MGS_CONFIG_READ); + if (req == NULL) + GOTO(out, rc = -ENOMEM); - rc = ptlrpc_request_pack(req, LUSTRE_MGS_VERSION, MGS_CONFIG_READ); - if (rc) - GOTO(out, rc); + rc = ptlrpc_request_pack(req, LUSTRE_MGS_VERSION, MGS_CONFIG_READ); + if (rc) + GOTO(out, rc); - /* pack request */ - body = req_capsule_client_get(&req->rq_pill, &RMF_MGS_CONFIG_BODY); - LASSERT(body != NULL); - LASSERT(sizeof(body->mcb_name) > strlen(cld->cld_logname)); + /* pack request */ + body = req_capsule_client_get(&req->rq_pill, &RMF_MGS_CONFIG_BODY); + LASSERT(body != NULL); + LASSERT(sizeof(body->mcb_name) > strlen(cld->cld_logname)); if (strlcpy(body->mcb_name, cld->cld_logname, sizeof(body->mcb_name)) >= sizeof(body->mcb_name)) GOTO(out, rc = -E2BIG); - body->mcb_offset = cfg->cfg_last_idx + 1; - body->mcb_type = cld->cld_type; + if (cld_is_nodemap(cld)) + body->mcb_offset = config_read_offset; + else + body->mcb_offset = cfg->cfg_last_idx + 1; + body->mcb_type = cld->cld_type; body->mcb_bits = PAGE_CACHE_SHIFT; - body->mcb_units = nrpages; + body->mcb_units = nrpages; /* allocate bulk transfer descriptor */ - desc = ptlrpc_prep_bulk_imp(req, nrpages, 1, BULK_PUT_SINK, - MGS_BULK_PORTAL); + desc = ptlrpc_prep_bulk_imp(req, nrpages, 1, + PTLRPC_BULK_PUT_SINK | PTLRPC_BULK_BUF_KIOV, + MGS_BULK_PORTAL, + &ptlrpc_bulk_kiov_pin_ops); if (desc == NULL) GOTO(out, rc = -ENOMEM); for (i = 0; i < nrpages; i++) - ptlrpc_prep_bulk_page_pin(desc, pages[i], 0, PAGE_CACHE_SIZE); + desc->bd_frag_ops->add_kiov_frag(desc, pages[i], 0, + PAGE_CACHE_SIZE); - ptlrpc_request_set_replen(req); - rc = ptlrpc_queue_wait(req); - if (rc) - GOTO(out, rc); + ptlrpc_request_set_replen(req); + rc = ptlrpc_queue_wait(req); + if (rc) + GOTO(out, rc); - res = req_capsule_server_get(&req->rq_pill, &RMF_MGS_CONFIG_RES); - if (res->mcr_size < res->mcr_offset) - GOTO(out, rc = -EINVAL); + res = req_capsule_server_get(&req->rq_pill, &RMF_MGS_CONFIG_RES); + if (!res) + GOTO(out, rc = -EPROTO); + + if (cld_is_nodemap(cld)) { + config_read_offset = res->mcr_offset; + eof = config_read_offset == II_END_OFF; + } else { + if (res->mcr_size < res->mcr_offset) + GOTO(out, rc = -EINVAL); - /* always update the index even though it might have errors with - * handling the recover logs */ - cfg->cfg_last_idx = res->mcr_offset; - eof = res->mcr_offset == res->mcr_size; + /* always update the index even though it might have errors with + * handling the recover logs + */ + cfg->cfg_last_idx = res->mcr_offset; + eof = res->mcr_offset == res->mcr_size; - CDEBUG(D_INFO, "Latest version "LPD64", more %d.\n", - res->mcr_offset, eof == false); + CDEBUG(D_INFO, "Latest version "LPD64", more %d.\n", + res->mcr_offset, eof == false); + } - ealen = sptlrpc_cli_unwrap_bulk_read(req, req->rq_bulk, 0); - if (ealen < 0) - GOTO(out, rc = ealen); + ealen = sptlrpc_cli_unwrap_bulk_read(req, req->rq_bulk, 0); + if (ealen < 0) + GOTO(out, rc = ealen); if (ealen > nrpages << PAGE_CACHE_SHIFT) - GOTO(out, rc = -EINVAL); + GOTO(out, rc = -EINVAL); - if (ealen == 0) { /* no logs transferred */ - if (!eof) - rc = -EINVAL; - GOTO(out, rc); - } + if (ealen == 0) { /* no logs transferred */ +#ifdef HAVE_SERVER_SUPPORT + /* config changed since first read RPC */ + if (cld_is_nodemap(cld) && config_read_offset == 0) { + recent_nodemap = NULL; + nodemap_config_dealloc(new_config); + new_config = NULL; + + CDEBUG(D_INFO, "nodemap config changed in transit, retrying\n"); + + /* setting eof to false, we request config again */ + eof = false; + GOTO(out, rc = 0); + } +#endif + if (!eof) + rc = -EINVAL; + GOTO(out, rc); + } mne_swab = !!ptlrpc_rep_need_swab(req); -#if LUSTRE_VERSION_CODE < OBD_OCD_VERSION(3, 2, 50, 0) +#if LUSTRE_VERSION_CODE < OBD_OCD_VERSION(3, 0, 53, 0) /* This import flag means the server did an extra swab of IR MNE * records (fixed in LU-1252), reverse it here if needed. LU-1644 */ if (unlikely(req->rq_import->imp_need_mne_swab)) mne_swab = !mne_swab; -#else -#warning "LU-1644: Remove old OBD_CONNECT_MNE_SWAB fixup and imp_need_mne_swab" #endif - for (i = 0; i < nrpages && ealen > 0; i++) { - int rc2; - void *ptr; + /* When a nodemap config is received, we build a new nodemap config, + * with new nodemap structs. We keep track of the most recently added + * nodemap since the config is read ordered by nodemap_id, and so it + * is likely that the next record will be related. Because access to + * the nodemaps is single threaded until the nodemap_config is active, + * we don't need to reference count with recent_nodemap, though + * recent_nodemap should be set to NULL when the nodemap_config + * is either destroyed or set active. + */ + for (i = 0; i < nrpages && ealen > 0; i++) { + int rc2; + union lu_page *ptr; ptr = kmap(pages[i]); - rc2 = mgc_apply_recover_logs(obd, cld, res->mcr_offset, ptr, - min_t(int, ealen, PAGE_CACHE_SIZE), - mne_swab); + if (cld_is_nodemap(cld)) + rc2 = nodemap_process_idx_pages(new_config, ptr, + &recent_nodemap); + else + rc2 = mgc_apply_recover_logs(obd, cld, res->mcr_offset, + ptr, + min_t(int, ealen, + PAGE_CACHE_SIZE), + mne_swab); kunmap(pages[i]); if (rc2 < 0) { - CWARN("Process recover log %s error %d\n", - cld->cld_logname, rc2); + CWARN("%s: error processing %s log %s: rc = %d\n", + obd->obd_name, + cld_is_nodemap(cld) ? "nodemap" : "recovery", + cld->cld_logname, + rc2); break; - } + } ealen -= PAGE_CACHE_SIZE; - } + } out: - if (req) - ptlrpc_req_finished(req); + if (req) { + ptlrpc_req_finished(req); + req = NULL; + } - if (rc == 0 && !eof) - goto again; + if (rc == 0 && !eof) + goto again; + +#ifdef HAVE_SERVER_SUPPORT + if (new_config != NULL) { + /* recent_nodemap cannot be used after set_active/dealloc */ + if (rc == 0) + nodemap_config_set_active_mgc(new_config); + else + nodemap_config_dealloc(new_config); + } +#endif if (pages) { for (i = 0; i < nrpages; i++) { @@ -1682,7 +1811,7 @@ static int mgc_llog_local_copy(const struct lu_env *env, * - if failed then move bakup to logname again */ - OBD_ALLOC(temp_log, strlen(logname) + 1); + OBD_ALLOC(temp_log, strlen(logname) + 2); if (!temp_log) RETURN(-ENOMEM); sprintf(temp_log, "%sT", logname); @@ -1704,7 +1833,7 @@ out: obd->obd_name, logname, rc); } llog_erase(env, lctxt, NULL, temp_log); - OBD_FREE(temp_log, strlen(logname) + 1); + OBD_FREE(temp_log, strlen(logname) + 2); return rc; } @@ -1758,7 +1887,8 @@ static int mgc_process_cfg_log(struct obd_device *mgc, rc = mgc_llog_local_copy(env, mgc, ctxt, lctxt, cld->cld_logname); if (local_only || rc) { - if (llog_is_empty(env, lctxt, cld->cld_logname)) { + if (strcmp(cld->cld_logname, PARAMS_FILENAME) != 0 && + llog_is_empty(env, lctxt, cld->cld_logname)) { LCONSOLE_ERROR_MSG(0x13a, "Failed to get MGS " "log %s and no local copy." "\n", cld->cld_logname); @@ -1767,6 +1897,7 @@ static int mgc_process_cfg_log(struct obd_device *mgc, CDEBUG(D_MGC, "Failed to get MGS log %s, using local " "copy for now, will try to update later.\n", cld->cld_logname); + rc = 0; } /* Now, whether we copied or not, start using the local llog. * If we failed to copy, we'll start using whatever the old @@ -1816,23 +1947,62 @@ out_free: return rc; } -/** Get a config log from the MGS and process it. - * This func is called for both clients and servers. - * Copy the log locally before parsing it if appropriate (non-MGS server) +static bool mgc_import_in_recovery(struct obd_import *imp) +{ + bool in_recovery = true; + + spin_lock(&imp->imp_lock); + if (imp->imp_state == LUSTRE_IMP_FULL || + imp->imp_state == LUSTRE_IMP_CLOSED) + in_recovery = false; + spin_unlock(&imp->imp_lock); + + return in_recovery; +} + +/** + * Get a configuration log from the MGS and process it. + * + * This function is called for both clients and servers to process the + * configuration log from the MGS. The MGC enqueues a DLM lock on the + * log from the MGS, and if the lock gets revoked the MGC will be notified + * by the lock cancellation callback that the config log has changed, + * and will enqueue another MGS lock on it, and then continue processing + * the new additions to the end of the log. + * + * Since the MGC import is not replayable, if the import is being evicted + * (rcl == -ESHUTDOWN, \see ptlrpc_import_delay_req()), retry to process + * the log until recovery is finished or the import is closed. + * + * Make a local copy of the log before parsing it if appropriate (non-MGS + * server) so that the server can start even when the MGS is down. + * + * There shouldn't be multiple processes running process_log at once -- + * sounds like badness. It actually might be fine, as long as they're not + * trying to update from the same log simultaneously, in which case we + * should use a per-log semaphore instead of cld_lock. + * + * \param[in] mgc MGC device by which to fetch the configuration log + * \param[in] cld log processing state (stored in lock callback data) + * + * \retval 0 on success + * \retval negative errno on failure */ int mgc_process_log(struct obd_device *mgc, struct config_llog_data *cld) { struct lustre_handle lockh = { 0 }; __u64 flags = LDLM_FL_NO_LRU; int rc = 0, rcl; + bool retry = false; ENTRY; - LASSERT(cld); + LASSERT(cld != NULL); /* 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.) */ +restart: mutex_lock(&cld->cld_lock); if (cld->cld_stopping) { mutex_unlock(&cld->cld_lock); @@ -1841,51 +2011,90 @@ int mgc_process_log(struct obd_device *mgc, struct config_llog_data *cld) OBD_FAIL_TIMEOUT(OBD_FAIL_MGC_PAUSE_PROCESS_LOG, 20); - CDEBUG(D_MGC, "Process log %s:%p from %d\n", cld->cld_logname, - cld->cld_cfg.cfg_instance, cld->cld_cfg.cfg_last_idx + 1); - - /* 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, - cld, 0, NULL, &lockh); - if (rcl == 0) { - /* Get the cld, it will be released in mgc_blocking_ast. */ - config_log_get(cld); - rc = ldlm_lock_set_data(&lockh, (void *)cld); - LASSERT(rc == 0); - } else { - CDEBUG(D_MGC, "Can't get cfg lock: %d\n", rcl); + CDEBUG(D_MGC, "Process log %s:%p from %d\n", cld->cld_logname, + cld->cld_cfg.cfg_instance, cld->cld_cfg.cfg_last_idx + 1); + + /* Get the cfg lock on the llog */ + rcl = mgc_enqueue(mgc->u.cli.cl_mgc_mgsexp, LDLM_PLAIN, NULL, + LCK_CR, &flags, NULL, NULL, NULL, + cld, 0, NULL, &lockh); + if (rcl == 0) { + /* Get the cld, it will be released in mgc_blocking_ast. */ + config_log_get(cld); + rc = ldlm_lock_set_data(&lockh, (void *)cld); + LASSERT(rc == 0); + } else { + CDEBUG(D_MGC, "Can't get cfg lock: %d\n", rcl); + + if (rcl == -ESHUTDOWN && + atomic_read(&mgc->u.cli.cl_mgc_refcount) > 0 && !retry) { + struct obd_import *imp; + struct l_wait_info lwi; + int secs = cfs_time_seconds(obd_timeout); + + mutex_unlock(&cld->cld_lock); + imp = class_exp2cliimp(mgc->u.cli.cl_mgc_mgsexp); + + /* Let's force the pinger, and wait the import to be + * connected, note: since mgc import is non-replayable, + * and even the import state is disconnected, it does + * not mean the "recovery" is stopped, so we will keep + * waitting until timeout or the import state is + * FULL or closed */ + ptlrpc_pinger_force(imp); + + lwi = LWI_TIMEOUT(secs, NULL, NULL); + l_wait_event(imp->imp_recovery_waitq, + !mgc_import_in_recovery(imp), &lwi); + + if (imp->imp_state == LUSTRE_IMP_FULL) { + retry = true; + goto restart; + } else { + mutex_lock(&cld->cld_lock); + cld->cld_lostlock = 1; + } + } else { + /* mark cld_lostlock so that it will requeue + * after MGC becomes available. */ + cld->cld_lostlock = 1; + } + /* Get extra reference, it will be put in requeue thread */ + config_log_get(cld); + } - /* mark cld_lostlock so that it will requeue - * after MGC becomes available. */ - cld->cld_lostlock = 1; - /* Get extra reference, it will be put in requeue thread */ - config_log_get(cld); - } + if (cld_is_recover(cld) || cld_is_nodemap(cld)) { + if (!rcl) + rc = mgc_process_recover_nodemap_log(mgc, cld); + else if (cld_is_nodemap(cld)) + rc = rcl; - if (cld_is_recover(cld)) { - rc = 0; /* this is not a fatal error for recover log */ - if (rcl == 0) - rc = mgc_process_recover_log(mgc, cld); - } else { - rc = mgc_process_cfg_log(mgc, cld, rcl != 0); - } + if (cld_is_recover(cld) && rc) { + if (!rcl) { + CERROR("%s: recover log %s failed, not fatal: rc = %d\n", + mgc->obd_name, cld->cld_logname, rc); + cld->cld_lostlock = 1; + } + rc = 0; /* this is not a fatal error for recover log */ + } + } else { + rc = mgc_process_cfg_log(mgc, cld, rcl != 0); + } - CDEBUG(D_MGC, "%s: configuration from log '%s' %sed (%d).\n", - mgc->obd_name, cld->cld_logname, rc ? "fail" : "succeed", rc); + CDEBUG(D_MGC, "%s: configuration from log '%s' %sed (%d).\n", + mgc->obd_name, cld->cld_logname, rc ? "fail" : "succeed", rc); mutex_unlock(&cld->cld_lock); - /* Now drop the lock so MGS can revoke it */ - if (!rcl) { - rcl = mgc_cancel(mgc->u.cli.cl_mgc_mgsexp, NULL, - LCK_CR, &lockh); - if (rcl) - CERROR("Can't drop cfg lock: %d\n", rcl); - } + /* Now drop the lock so MGS can revoke it */ + if (!rcl) { + rcl = mgc_cancel(mgc->u.cli.cl_mgc_mgsexp, LCK_CR, &lockh); + if (rcl) + CERROR("Can't drop cfg lock: %d\n", rcl); + } - RETURN(rc); + RETURN(rc); } @@ -1893,7 +2102,7 @@ int mgc_process_log(struct obd_device *mgc, struct config_llog_data *cld) * LCFG_LOG_START gets the config log from the MGS, processes it to start * any services, and adds it to the list logs to watch (follow). */ -static int mgc_process_config(struct obd_device *obd, obd_count len, void *buf) +static int mgc_process_config(struct obd_device *obd, size_t len, void *buf) { struct lustre_cfg *lcfg = buf; struct config_llog_instance *cfg = NULL; @@ -1968,7 +2177,7 @@ static int mgc_process_config(struct obd_device *obd, obd_count len, void *buf) if (rc == 0 && cld->cld_params != NULL) { rc = mgc_process_log(obd, cld->cld_params); if (rc == -ENOENT) { - CDEBUG(D_MGC, "There is no params" + CDEBUG(D_MGC, "There is no params " "config file yet\n"); rc = 0; } @@ -2000,7 +2209,7 @@ out: RETURN(rc); } -struct obd_ops mgc_obd_ops = { +static struct obd_ops mgc_obd_ops = { .o_owner = THIS_MODULE, .o_setup = mgc_setup, .o_precleanup = mgc_precleanup, @@ -2009,31 +2218,27 @@ struct obd_ops mgc_obd_ops = { .o_del_conn = client_import_del_conn, .o_connect = client_connect_import, .o_disconnect = client_disconnect_export, - //.o_enqueue = mgc_enqueue, - .o_cancel = mgc_cancel, - //.o_iocontrol = mgc_iocontrol, .o_set_info_async = mgc_set_info_async, .o_get_info = mgc_get_info, .o_import_event = mgc_import_event, .o_process_config = mgc_process_config, }; -int __init mgc_init(void) +static int __init mgc_init(void) { - return class_register_type(&mgc_obd_ops, NULL, NULL, - LUSTRE_MGC_NAME, NULL); + return class_register_type(&mgc_obd_ops, NULL, true, NULL, + LUSTRE_MGC_NAME, NULL); } -#ifdef __KERNEL__ -static void /*__exit*/ mgc_exit(void) +static void __exit mgc_exit(void) { class_unregister_type(LUSTRE_MGC_NAME); } -MODULE_AUTHOR("Sun Microsystems, Inc. "); +MODULE_AUTHOR("OpenSFS, Inc. "); MODULE_DESCRIPTION("Lustre Management Client"); +MODULE_VERSION(LUSTRE_VERSION_STRING); MODULE_LICENSE("GPL"); module_init(mgc_init); module_exit(mgc_exit); -#endif