X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre%2Fmgs%2Fmgs_llog.c;h=2740b2f375a95d41ab911dfbef80b2099f68ccae;hp=6b0aadb7e32269084c4568c53d4e4a025364afae;hb=1f6cb3534e74f0c9462008c8088b5734b64ed41c;hpb=72057a3af19ee02d9a686bd7e7d074917e381310 diff --git a/lustre/mgs/mgs_llog.c b/lustre/mgs/mgs_llog.c index 6b0aadb..2740b2f 100644 --- a/lustre/mgs/mgs_llog.c +++ b/lustre/mgs/mgs_llog.c @@ -23,7 +23,7 @@ * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved. * Use is subject to license terms. * - * Copyright (c) 2011, 2015, Intel Corporation. + * Copyright (c) 2011, 2017, Intel Corporation. */ /* * This file is part of Lustre, http://www.lustre.org/ @@ -42,25 +42,36 @@ #define D_MGS D_CONFIG #include -#include -#include +#include +#include #include #include +#include #include "mgs_internal.h" /********************** Class functions ********************/ -/* Find all logs in CONFIG directory and link then into list */ -int class_dentry_readdir(const struct lu_env *env, - struct mgs_device *mgs, struct list_head *log_list) +/** + * Find all logs in CONFIG directory and link then into list. + * + * \param[in] env pointer to the thread context + * \param[in] mgs pointer to the mgs device + * \param[out] log_list the list to hold the found llog name entry + * + * \retval 0 for success + * \retval negative error number on failure + **/ +int class_dentry_readdir(const struct lu_env *env, struct mgs_device *mgs, + struct list_head *log_list) { - struct dt_object *dir = mgs->mgs_configs_dir; + struct dt_object *dir = mgs->mgs_configs_dir; const struct dt_it_ops *iops; - struct dt_it *it; + struct dt_it *it; struct mgs_direntry *de; - char *key; - int rc, key_sz; + char *key; + int rc, key_sz; + size_t suffix_len = sizeof(".bak") - 1; INIT_LIST_HEAD(log_list); @@ -97,9 +108,8 @@ int class_dentry_readdir(const struct lu_env *env, } /* filter out ".bak" files */ - /* sizeof(".bak") - 1 == 3 */ - if (key_sz >= 3 && - !memcmp(".bak", key + key_sz - 3, 3)) { + if (key_sz >= suffix_len && + !memcmp(".bak", key + key_sz - suffix_len, suffix_len)) { CDEBUG(D_MGS, "Skipping backup file %.*s\n", key_sz, key); goto next; @@ -126,9 +136,18 @@ next: fini: iops->fini(env, it); - if (rc) + if (rc) { + struct mgs_direntry *n; + CERROR("%s: key failed when listing %s: rc = %d\n", mgs->mgs_obd->obd_name, MOUNT_CONFIGS_DIR, rc); + + list_for_each_entry_safe(de, n, log_list, mde_list) { + list_del_init(&de->mde_list); + mgs_direntry_free(de); + } + } + RETURN(rc); } @@ -172,7 +191,7 @@ static int mgs_fsdb_handler(const struct lu_env *env, struct llog_handle *llh, int cfg_len = rec->lrh_len; char *cfg_buf = (char*) (rec + 1); struct lustre_cfg *lcfg; - __u32 index; + u32 index; int rc = 0; ENTRY; @@ -192,12 +211,14 @@ static int mgs_fsdb_handler(const struct lu_env *env, struct llog_handle *llh, CDEBUG(D_INFO, "cmd %x %s %s\n", lcfg->lcfg_command, lustre_cfg_string(lcfg, 0), lustre_cfg_string(lcfg, 1)); - /* Figure out ost indicies */ - /* lov_modify_tgts add 0:lov1 1:ost1_UUID 2(index):0 3(gen):1 */ - if (lcfg->lcfg_command == LCFG_LOV_ADD_OBD || - lcfg->lcfg_command == LCFG_LOV_DEL_OBD) { - index = simple_strtoul(lustre_cfg_string(lcfg, 2), - NULL, 10); + /* Figure out ost indicies */ + /* lov_modify_tgts add 0:lov1 1:ost1_UUID 2(index):0 3(gen):1 */ + if (lcfg->lcfg_command == LCFG_LOV_ADD_OBD || + lcfg->lcfg_command == LCFG_LOV_DEL_OBD) { + rc = kstrtouint(lustre_cfg_string(lcfg, 2), 10, &index); + if (rc) + RETURN(rc); + CDEBUG(D_MGS, "OST index for %s is %u (%s)\n", lustre_cfg_string(lcfg, 1), index, lustre_cfg_string(lcfg, 2)); @@ -217,9 +238,11 @@ static int mgs_fsdb_handler(const struct lu_env *env, struct llog_handle *llh, } rc = 0; CDEBUG(D_MGS, "MDT index is %u\n", index); - set_bit(index, fsdb->fsdb_mdt_index_map); - fsdb->fsdb_mdt_count ++; - } + if (!test_bit(index, fsdb->fsdb_mdt_index_map)) { + set_bit(index, fsdb->fsdb_mdt_index_map); + fsdb->fsdb_mdt_count++; + } + } /** * figure out the old config. fsdb_gen = 0 means old log @@ -261,10 +284,12 @@ static int mgs_get_fsdb_from_llog(const struct lu_env *env, struct mgs_device *mgs, struct fs_db *fsdb) { - char *logname; - struct llog_handle *loghandle; - struct llog_ctxt *ctxt; - struct mgs_fsdb_handler_data d = { fsdb, 0 }; + char *logname; + struct llog_handle *loghandle; + struct llog_ctxt *ctxt; + struct mgs_fsdb_handler_data d = { + .fsdb = fsdb, + }; int rc; ENTRY; @@ -317,98 +342,185 @@ static void mgs_free_fsdb_srpc(struct fs_db *fsdb) sptlrpc_rule_set_free(&fsdb->fsdb_srpc_gen); } -struct fs_db *mgs_find_fsdb(struct mgs_device *mgs, char *fsname) +static void mgs_unlink_fsdb(struct mgs_device *mgs, struct fs_db *fsdb) { - struct fs_db *fsdb; + mutex_lock(&mgs->mgs_mutex); + if (likely(!list_empty(&fsdb->fsdb_list))) { + LASSERTF(atomic_read(&fsdb->fsdb_ref) >= 2, + "Invalid ref %d on %s\n", + atomic_read(&fsdb->fsdb_ref), + fsdb->fsdb_name); + + list_del_init(&fsdb->fsdb_list); + /* Drop the reference on the list.*/ + mgs_put_fsdb(mgs, fsdb); + } + mutex_unlock(&mgs->mgs_mutex); +} + +/* The caller must hold mgs->mgs_mutex. */ +static inline struct fs_db * +mgs_find_fsdb_noref(struct mgs_device *mgs, const char *fsname) +{ + struct fs_db *fsdb; struct list_head *tmp; list_for_each(tmp, &mgs->mgs_fs_db_list) { fsdb = list_entry(tmp, struct fs_db, fsdb_list); - if (strcmp(fsdb->fsdb_name, fsname) == 0) - return fsdb; - } - return NULL; + if (strcmp(fsdb->fsdb_name, fsname) == 0) + return fsdb; + } + + return NULL; +} + +/* The caller must hold mgs->mgs_mutex. */ +static void mgs_remove_fsdb_by_name(struct mgs_device *mgs, const char *name) +{ + struct fs_db *fsdb; + + fsdb = mgs_find_fsdb_noref(mgs, name); + if (fsdb) { + list_del_init(&fsdb->fsdb_list); + /* Drop the reference on the list.*/ + mgs_put_fsdb(mgs, fsdb); + } +} + +/* The caller must hold mgs->mgs_mutex. */ +struct fs_db *mgs_find_fsdb(struct mgs_device *mgs, const char *fsname) +{ + struct fs_db *fsdb; + + fsdb = mgs_find_fsdb_noref(mgs, fsname); + if (fsdb) + atomic_inc(&fsdb->fsdb_ref); + + return fsdb; } -/* caller must hold the mgs->mgs_fs_db_lock */ +/* The caller must hold mgs->mgs_mutex. */ static struct fs_db *mgs_new_fsdb(const struct lu_env *env, struct mgs_device *mgs, char *fsname) { - struct fs_db *fsdb; - int rc; - ENTRY; + struct fs_db *fsdb; + int rc; + ENTRY; + + if (strlen(fsname) >= sizeof(fsdb->fsdb_name)) { + CERROR("fsname %s is too long\n", fsname); - if (strlen(fsname) >= sizeof(fsdb->fsdb_name)) { - CERROR("fsname %s is too long\n", fsname); RETURN(ERR_PTR(-EINVAL)); - } + } - OBD_ALLOC_PTR(fsdb); - if (!fsdb) + OBD_ALLOC_PTR(fsdb); + if (!fsdb) RETURN(ERR_PTR(-ENOMEM)); - strcpy(fsdb->fsdb_name, fsname); + strncpy(fsdb->fsdb_name, fsname, sizeof(fsdb->fsdb_name)); mutex_init(&fsdb->fsdb_mutex); + INIT_LIST_HEAD(&fsdb->fsdb_list); set_bit(FSDB_UDESC, &fsdb->fsdb_flags); fsdb->fsdb_gen = 1; + INIT_LIST_HEAD(&fsdb->fsdb_clients); + atomic_set(&fsdb->fsdb_notify_phase, 0); + init_waitqueue_head(&fsdb->fsdb_notify_waitq); + init_completion(&fsdb->fsdb_notify_comp); - if (strcmp(fsname, MGSSELF_NAME) == 0) { + if (strcmp(fsname, MGSSELF_NAME) == 0) { set_bit(FSDB_MGS_SELF, &fsdb->fsdb_flags); fsdb->fsdb_mgs = mgs; - } else { - OBD_ALLOC(fsdb->fsdb_ost_index_map, INDEX_MAP_SIZE); - OBD_ALLOC(fsdb->fsdb_mdt_index_map, INDEX_MAP_SIZE); - if (!fsdb->fsdb_ost_index_map || !fsdb->fsdb_mdt_index_map) { - CERROR("No memory for index maps\n"); + if (logname_is_barrier(fsname)) + goto add; + } else { + OBD_ALLOC(fsdb->fsdb_mdt_index_map, INDEX_MAP_SIZE); + if (!fsdb->fsdb_mdt_index_map) { + CERROR("No memory for MDT index maps\n"); + GOTO(err, rc = -ENOMEM); - } + } - rc = name_create(&fsdb->fsdb_clilov, fsname, "-clilov"); - if (rc) - GOTO(err, rc); - rc = name_create(&fsdb->fsdb_clilmv, fsname, "-clilmv"); - if (rc) - GOTO(err, rc); + OBD_ALLOC(fsdb->fsdb_ost_index_map, INDEX_MAP_SIZE); + if (!fsdb->fsdb_ost_index_map) { + CERROR("No memory for OST index maps\n"); - /* initialise data for NID table */ - mgs_ir_init_fs(env, mgs, fsdb); + GOTO(err, rc = -ENOMEM); + } + + if (logname_is_barrier(fsname)) + goto add; + + rc = name_create(&fsdb->fsdb_clilov, fsname, "-clilov"); + if (rc) + GOTO(err, rc); + + rc = name_create(&fsdb->fsdb_clilmv, fsname, "-clilmv"); + if (rc) + GOTO(err, rc); + /* initialise data for NID table */ + mgs_ir_init_fs(env, mgs, fsdb); lproc_mgs_add_live(mgs, fsdb); - } + } + + if (!test_bit(FSDB_MGS_SELF, &fsdb->fsdb_flags) && + strcmp(PARAMS_FILENAME, fsname) != 0) { + /* populate the db from the client llog */ + rc = mgs_get_fsdb_from_llog(env, mgs, fsdb); + if (rc) { + CERROR("Can't get db from client log %d\n", rc); + + GOTO(err, rc); + } + } + + /* populate srpc rules from params llog */ + rc = mgs_get_fsdb_srpc_from_llog(env, mgs, fsdb); + if (rc) { + CERROR("Can't get db from params log %d\n", rc); + + GOTO(err, rc); + } +add: + /* One ref is for the fsdb on the list. + * The other ref is for the caller. */ + atomic_set(&fsdb->fsdb_ref, 2); list_add(&fsdb->fsdb_list, &mgs->mgs_fs_db_list); - RETURN(fsdb); + RETURN(fsdb); + err: - if (fsdb->fsdb_ost_index_map) - OBD_FREE(fsdb->fsdb_ost_index_map, INDEX_MAP_SIZE); - if (fsdb->fsdb_mdt_index_map) - OBD_FREE(fsdb->fsdb_mdt_index_map, INDEX_MAP_SIZE); - name_destroy(&fsdb->fsdb_clilov); - name_destroy(&fsdb->fsdb_clilmv); - OBD_FREE_PTR(fsdb); + atomic_set(&fsdb->fsdb_ref, 1); + mgs_put_fsdb(mgs, fsdb); + RETURN(ERR_PTR(rc)); } static void mgs_free_fsdb(struct mgs_device *mgs, struct fs_db *fsdb) { - /* wait for anyone with the sem */ - mutex_lock(&fsdb->fsdb_mutex); + LASSERT(list_empty(&fsdb->fsdb_list)); + lproc_mgs_del_live(mgs, fsdb); - list_del(&fsdb->fsdb_list); - - /* deinitialize fsr */ - mgs_ir_fini_fs(mgs, fsdb); - - if (fsdb->fsdb_ost_index_map) - OBD_FREE(fsdb->fsdb_ost_index_map, INDEX_MAP_SIZE); - if (fsdb->fsdb_mdt_index_map) - OBD_FREE(fsdb->fsdb_mdt_index_map, INDEX_MAP_SIZE); - name_destroy(&fsdb->fsdb_clilov); - name_destroy(&fsdb->fsdb_clilmv); - mgs_free_fsdb_srpc(fsdb); - mutex_unlock(&fsdb->fsdb_mutex); - OBD_FREE_PTR(fsdb); + + /* deinitialize fsr */ + if (fsdb->fsdb_mgs) + mgs_ir_fini_fs(mgs, fsdb); + + if (fsdb->fsdb_ost_index_map) + OBD_FREE(fsdb->fsdb_ost_index_map, INDEX_MAP_SIZE); + if (fsdb->fsdb_mdt_index_map) + OBD_FREE(fsdb->fsdb_mdt_index_map, INDEX_MAP_SIZE); + name_destroy(&fsdb->fsdb_clilov); + name_destroy(&fsdb->fsdb_clilmv); + mgs_free_fsdb_srpc(fsdb); + OBD_FREE_PTR(fsdb); +} + +void mgs_put_fsdb(struct mgs_device *mgs, struct fs_db *fsdb) +{ + if (atomic_dec_and_test(&fsdb->fsdb_ref)) + mgs_free_fsdb(mgs, fsdb); } int mgs_init_fsdb_list(struct mgs_device *mgs) @@ -425,62 +537,48 @@ int mgs_cleanup_fsdb_list(struct mgs_device *mgs) mutex_lock(&mgs->mgs_mutex); list_for_each_safe(tmp, tmp2, &mgs->mgs_fs_db_list) { fsdb = list_entry(tmp, struct fs_db, fsdb_list); - mgs_free_fsdb(mgs, fsdb); + list_del_init(&fsdb->fsdb_list); + mgs_put_fsdb(mgs, fsdb); } mutex_unlock(&mgs->mgs_mutex); return 0; } -int mgs_find_or_make_fsdb(const struct lu_env *env, - struct mgs_device *mgs, char *name, - struct fs_db **dbh) +/* The caller must hold mgs->mgs_mutex. */ +int mgs_find_or_make_fsdb_nolock(const struct lu_env *env, + struct mgs_device *mgs, + char *name, struct fs_db **dbh) { - struct fs_db *fsdb; - int rc = 0; - + struct fs_db *fsdb; + int rc = 0; ENTRY; - mutex_lock(&mgs->mgs_mutex); + fsdb = mgs_find_fsdb(mgs, name); - if (fsdb) { - mutex_unlock(&mgs->mgs_mutex); - *dbh = fsdb; - RETURN(0); - } + if (!fsdb) { + fsdb = mgs_new_fsdb(env, mgs, name); + if (IS_ERR(fsdb)) + rc = PTR_ERR(fsdb); - CDEBUG(D_MGS, "Creating new db\n"); - fsdb = mgs_new_fsdb(env, mgs, name); - /* lock fsdb_mutex until the db is loaded from llogs */ - if (!IS_ERR(fsdb)) - mutex_lock(&fsdb->fsdb_mutex); - mutex_unlock(&mgs->mgs_mutex); - if (IS_ERR(fsdb)) - RETURN(PTR_ERR(fsdb)); + CDEBUG(D_MGS, "Created new db: rc = %d\n", rc); + } - if (!test_bit(FSDB_MGS_SELF, &fsdb->fsdb_flags)) { - /* populate the db from the client llog */ - rc = mgs_get_fsdb_from_llog(env, mgs, fsdb); - if (rc) { - CERROR("Can't get db from client log %d\n", rc); - GOTO(out_free, rc); - } - } + if (!rc) + *dbh = fsdb; - /* populate srpc rules from params llog */ - rc = mgs_get_fsdb_srpc_from_llog(env, mgs, fsdb); - if (rc) { - CERROR("Can't get db from params log %d\n", rc); - GOTO(out_free, rc); - } + RETURN(rc); +} - mutex_unlock(&fsdb->fsdb_mutex); - *dbh = fsdb; +int mgs_find_or_make_fsdb(const struct lu_env *env, struct mgs_device *mgs, + char *name, struct fs_db **dbh) +{ + int rc; + ENTRY; - RETURN(0); + mutex_lock(&mgs->mgs_mutex); + rc = mgs_find_or_make_fsdb_nolock(env, mgs, name, dbh); + mutex_unlock(&mgs->mgs_mutex); -out_free: - mutex_unlock(&fsdb->fsdb_mutex); - mgs_free_fsdb(mgs, fsdb); - return rc; + RETURN(rc); } /* 1 = index in use @@ -504,18 +602,23 @@ int mgs_check_index(const struct lu_env *env, } if (test_bit(FSDB_LOG_EMPTY, &fsdb->fsdb_flags)) - RETURN(-1); + GOTO(out, rc = -1); - if (mti->mti_flags & LDD_F_SV_TYPE_OST) - imap = fsdb->fsdb_ost_index_map; - else if (mti->mti_flags & LDD_F_SV_TYPE_MDT) - imap = fsdb->fsdb_mdt_index_map; - else - RETURN(-EINVAL); + if (mti->mti_flags & LDD_F_SV_TYPE_OST) + imap = fsdb->fsdb_ost_index_map; + else if (mti->mti_flags & LDD_F_SV_TYPE_MDT) + imap = fsdb->fsdb_mdt_index_map; + else + GOTO(out, rc = -EINVAL); if (test_bit(mti->mti_stripe_index, imap)) - RETURN(1); - RETURN(0); + GOTO(out, rc = 1); + + GOTO(out, rc = 0); + +out: + mgs_put_fsdb(mgs, fsdb); + return rc; } static __inline__ int next_index(void *index_map, int map_len) @@ -529,6 +632,28 @@ static __inline__ int next_index(void *index_map, int map_len) return -1; } +/* Make the mdt/ost server obd name based on the filesystem name */ +static bool server_make_name(u32 flags, u16 index, const char *fs, + char *name_buf, size_t name_buf_size) +{ + bool invalid_flag = false; + + if (flags & (LDD_F_SV_TYPE_MDT | LDD_F_SV_TYPE_OST)) { + if (!(flags & LDD_F_SV_ALL)) + snprintf(name_buf, name_buf_size, "%.8s%c%s%04x", fs, + (flags & LDD_F_VIRGIN) ? ':' : + ((flags & LDD_F_WRITECONF) ? '=' : '-'), + (flags & LDD_F_SV_TYPE_MDT) ? "MDT" : "OST", + index); + } else if (flags & LDD_F_SV_TYPE_MGS) { + snprintf(name_buf, name_buf_size, "MGS"); + } else { + CERROR("unknown server type %#x\n", flags); + invalid_flag = true; + } + return invalid_flag; +} + /* Return codes: 0 newly marked as in use <0 err @@ -562,8 +687,6 @@ static int mgs_set_index(const struct lu_env *env, if (rc == -1) GOTO(out_up, rc = -ERANGE); mti->mti_stripe_index = rc; - if (mti->mti_flags & LDD_F_SV_TYPE_MDT) - fsdb->fsdb_mdt_count ++; } /* the last index(0xffff) is reserved for default value. */ @@ -588,21 +711,30 @@ static int mgs_set_index(const struct lu_env *env, CDEBUG(D_MGS, "Server %s updating index %d\n", mti->mti_svname, mti->mti_stripe_index); GOTO(out_up, rc = EALREADY); - } - } + } + } else { + set_bit(mti->mti_stripe_index, imap); + if (mti->mti_flags & LDD_F_SV_TYPE_MDT) + fsdb->fsdb_mdt_count++; + } set_bit(mti->mti_stripe_index, imap); clear_bit(FSDB_LOG_EMPTY, &fsdb->fsdb_flags); - mutex_unlock(&fsdb->fsdb_mutex); - server_make_name(mti->mti_flags & ~(LDD_F_VIRGIN | LDD_F_WRITECONF), - mti->mti_stripe_index, mti->mti_fsname, mti->mti_svname); + if (server_make_name(mti->mti_flags & ~(LDD_F_VIRGIN | LDD_F_WRITECONF), + mti->mti_stripe_index, mti->mti_fsname, + mti->mti_svname, sizeof(mti->mti_svname))) { + CERROR("unknown server type %#x\n", mti->mti_flags); + GOTO(out_up, rc = -EINVAL); + } - CDEBUG(D_MGS, "Set index for %s to %d\n", mti->mti_svname, - mti->mti_stripe_index); + CDEBUG(D_MGS, "Set index for %s to %d\n", mti->mti_svname, + mti->mti_stripe_index); + + GOTO(out_up, rc = 0); - RETURN(0); out_up: mutex_unlock(&fsdb->fsdb_mutex); + mgs_put_fsdb(mgs, fsdb); return rc; } @@ -611,6 +743,116 @@ struct mgs_modify_lookup { int mml_modified; }; +static int mgs_check_record_match(const struct lu_env *env, + struct llog_handle *llh, + struct llog_rec_hdr *rec, void *data) +{ + struct cfg_marker *mc_marker = data; + struct cfg_marker *marker; + struct lustre_cfg *lcfg = REC_DATA(rec); + int cfg_len = REC_DATA_LEN(rec); + int rc; + ENTRY; + + + if (rec->lrh_type != OBD_CFG_REC) { + CDEBUG(D_ERROR, "Unhandled lrh_type: %#x\n", rec->lrh_type); + RETURN(-EINVAL); + } + + rc = lustre_cfg_sanity_check(lcfg, cfg_len); + if (rc) { + CDEBUG(D_ERROR, "Insane cfg\n"); + RETURN(rc); + } + + /* We only care about markers */ + if (lcfg->lcfg_command != LCFG_MARKER) + RETURN(0); + + marker = lustre_cfg_buf(lcfg, 1); + + if (marker->cm_flags & CM_SKIP) + RETURN(0); + + if ((strcmp(mc_marker->cm_comment, marker->cm_comment) == 0) && + (strcmp(mc_marker->cm_tgtname, marker->cm_tgtname) == 0)) { + /* Found a non-skipped marker match */ + CDEBUG(D_MGS, "Matched rec %u marker %d flag %x %s %s\n", + rec->lrh_index, marker->cm_step, + marker->cm_flags, marker->cm_tgtname, + marker->cm_comment); + rc = LLOG_PROC_BREAK; + } + + RETURN(rc); +} + +/** + * Check an existing config log record with matching comment and device + * Return code: + * 0 - checked successfully, + * LLOG_PROC_BREAK - record matches + * negative - error + */ +static int mgs_check_marker(const struct lu_env *env, struct mgs_device *mgs, + struct fs_db *fsdb, struct mgs_target_info *mti, + char *logname, char *devname, char *comment) +{ + struct llog_handle *loghandle; + struct llog_ctxt *ctxt; + struct cfg_marker *mc_marker; + int rc; + + ENTRY; + + LASSERT(mutex_is_locked(&fsdb->fsdb_mutex)); + CDEBUG(D_MGS, "mgs check %s/%s/%s\n", logname, devname, comment); + + ctxt = llog_get_context(mgs->mgs_obd, LLOG_CONFIG_ORIG_CTXT); + LASSERT(ctxt != NULL); + rc = llog_open(env, ctxt, &loghandle, NULL, logname, LLOG_OPEN_EXISTS); + if (rc < 0) { + if (rc == -ENOENT) + rc = 0; + GOTO(out_pop, rc); + } + + rc = llog_init_handle(env, loghandle, LLOG_F_IS_PLAIN, NULL); + if (rc) + GOTO(out_close, rc); + + if (llog_get_size(loghandle) <= 1) + GOTO(out_close, rc = 0); + + OBD_ALLOC_PTR(mc_marker); + if (!mc_marker) + GOTO(out_close, rc = -ENOMEM); + if (strlcpy(mc_marker->cm_comment, comment, + sizeof(mc_marker->cm_comment)) >= + sizeof(mc_marker->cm_comment)) + GOTO(out_free, rc = -E2BIG); + if (strlcpy(mc_marker->cm_tgtname, devname, + sizeof(mc_marker->cm_tgtname)) >= + sizeof(mc_marker->cm_tgtname)) + GOTO(out_free, rc = -E2BIG); + + rc = llog_process(env, loghandle, mgs_check_record_match, + (void *)mc_marker, NULL); + +out_free: + OBD_FREE_PTR(mc_marker); + +out_close: + llog_close(env, loghandle); +out_pop: + if (rc && rc != LLOG_PROC_BREAK) + CDEBUG(D_ERROR, "%s: mgs check %s/%s failed: rc = %d\n", + mgs->mgs_obd->obd_name, mti->mti_svname, comment, rc); + llog_ctxt_put(ctxt); + RETURN(rc); +} + static int mgs_modify_handler(const struct lu_env *env, struct llog_handle *llh, struct llog_rec_hdr *rec, void *data) @@ -709,7 +951,7 @@ static int mgs_modify(const struct lu_env *env, struct mgs_device *mgs, GOTO(out_free, rc = -E2BIG); /* Modify mostly means cancel */ mml->mml_marker.cm_flags = flags; - mml->mml_marker.cm_canceltime = flags ? cfs_time_current_sec() : 0; + mml->mml_marker.cm_canceltime = flags ? ktime_get_real_seconds() : 0; mml->mml_modified = 0; rc = llog_process(env, loghandle, mgs_modify_handler, (void *)mml, NULL); @@ -729,18 +971,23 @@ out_pop: RETURN(rc); } +enum replace_state { + REPLACE_COPY = 0, + REPLACE_SKIP, + REPLACE_DONE, + REPLACE_UUID, + REPLACE_SETUP +}; + /** This structure is passed to mgs_replace_handler */ -struct mgs_replace_uuid_lookup { +struct mgs_replace_data { /* Nids are replaced for this target device */ struct mgs_target_info target; /* Temporary modified llog */ struct llog_handle *temp_llh; - /* Flag is set if in target block*/ - int in_target_device; - /* Nids already added. Just skip (multiple nids) */ - int device_nids_added; - /* Flag is set if this block should not be copied */ - int skip_it; + enum replace_state state; + char *failover; + char *nodeuuid; }; /** @@ -748,42 +995,42 @@ struct mgs_replace_uuid_lookup { * b) is it target block * * \param[in] lcfg - * \param[in] mrul + * \param[in] mrd * * \retval 0 should not to be skipped * \retval 1 should to be skipped */ static int check_markers(struct lustre_cfg *lcfg, - struct mgs_replace_uuid_lookup *mrul) + struct mgs_replace_data *mrd) { struct cfg_marker *marker; /* Track markers. Find given device */ if (lcfg->lcfg_command == LCFG_MARKER) { marker = lustre_cfg_buf(lcfg, 1); - /* Clean llog from records marked as CM_EXCLUDE. - CM_SKIP records are used for "active" command + /* Clean llog from records marked as CM_SKIP. + CM_EXCLUDE records are used for "active" command and can be restored if needed */ - if ((marker->cm_flags & (CM_EXCLUDE | CM_START)) == - (CM_EXCLUDE | CM_START)) { - mrul->skip_it = 1; + if ((marker->cm_flags & (CM_SKIP | CM_START)) == + (CM_SKIP | CM_START)) { + mrd->state = REPLACE_SKIP; return 1; } - if ((marker->cm_flags & (CM_EXCLUDE | CM_END)) == - (CM_EXCLUDE | CM_END)) { - mrul->skip_it = 0; + if ((marker->cm_flags & (CM_SKIP | CM_END)) == + (CM_SKIP | CM_END)) { + mrd->state = REPLACE_COPY; return 1; } - if (strcmp(mrul->target.mti_svname, marker->cm_tgtname) == 0) { + if (strcmp(mrd->target.mti_svname, marker->cm_tgtname) == 0) { LASSERT(!(marker->cm_flags & CM_START) || !(marker->cm_flags & CM_END)); if (marker->cm_flags & CM_START) { - mrul->in_target_device = 1; - mrul->device_nids_added = 0; + mrd->state = REPLACE_UUID; + mrd->failover = NULL; } else if (marker->cm_flags & CM_END) - mrul->in_target_device = 0; + mrd->state = REPLACE_COPY; } } @@ -864,57 +1111,117 @@ static inline int record_setup(const struct lu_env *env, * \retval 0 record is not processed. */ static int process_command(const struct lu_env *env, struct lustre_cfg *lcfg, - struct mgs_replace_uuid_lookup *mrul) + struct mgs_replace_data *mrd) { int nids_added = 0; lnet_nid_t nid; char *ptr; - int rc; + int rc = 0; - if (lcfg->lcfg_command == LCFG_ADD_UUID) { + if (mrd->state == REPLACE_UUID && + lcfg->lcfg_command == LCFG_ADD_UUID) { /* LCFG_ADD_UUID command found. Let's skip original command and add passed nids */ - ptr = mrul->target.mti_params; + ptr = mrd->target.mti_params; while (class_parse_nid(ptr, &nid, &ptr) == 0) { + if (!mrd->nodeuuid) { + rc = name_create(&mrd->nodeuuid, + libcfs_nid2str(nid), ""); + if (rc) { + CERROR("Can't create uuid for " + "nid %s, device %s\n", + libcfs_nid2str(nid), + mrd->target.mti_svname); + return rc; + } + } CDEBUG(D_MGS, "add nid %s with uuid %s, " "device %s\n", libcfs_nid2str(nid), - mrul->target.mti_params, - mrul->target.mti_svname); + mrd->target.mti_params, + mrd->nodeuuid); rc = record_add_uuid(env, - mrul->temp_llh, nid, - mrul->target.mti_params); + mrd->temp_llh, nid, + mrd->nodeuuid); if (!rc) nids_added++; + + if (*ptr == ':') { + mrd->failover = ptr; + break; + } } if (nids_added == 0) { CERROR("No new nids were added, nid %s with uuid %s, " "device %s\n", libcfs_nid2str(nid), - mrul->target.mti_params, - mrul->target.mti_svname); - RETURN(-ENXIO); + mrd->nodeuuid ? mrd->nodeuuid : "NULL", + mrd->target.mti_svname); + name_destroy(&mrd->nodeuuid); + return -ENXIO; } else { - mrul->device_nids_added = 1; + mrd->state = REPLACE_SETUP; } return nids_added; } - if (mrul->device_nids_added && lcfg->lcfg_command == LCFG_SETUP) { + if (mrd->state == REPLACE_SETUP && lcfg->lcfg_command == LCFG_SETUP) { /* LCFG_SETUP command found. UUID should be changed */ rc = record_setup(env, - mrul->temp_llh, + mrd->temp_llh, /* devname the same */ lustre_cfg_string(lcfg, 0), /* s1 is not changed */ lustre_cfg_string(lcfg, 1), - /* new uuid should be - the full nidlist */ - mrul->target.mti_params, + mrd->nodeuuid, /* s3 is not changed */ lustre_cfg_string(lcfg, 3), /* s4 is not changed */ lustre_cfg_string(lcfg, 4)); + + name_destroy(&mrd->nodeuuid); + if (rc) + return rc; + + if (mrd->failover) { + ptr = mrd->failover; + while (class_parse_nid(ptr, &nid, &ptr) == 0) { + if (mrd->nodeuuid == NULL) { + rc = name_create(&mrd->nodeuuid, + libcfs_nid2str(nid), + ""); + if (rc) + return rc; + } + + CDEBUG(D_MGS, "add nid %s for failover %s\n", + libcfs_nid2str(nid), mrd->nodeuuid); + rc = record_add_uuid(env, mrd->temp_llh, nid, + mrd->nodeuuid); + if (rc) { + name_destroy(&mrd->nodeuuid); + return rc; + } + if (*ptr == ':') { + rc = record_add_conn(env, + mrd->temp_llh, + lustre_cfg_string(lcfg, 0), + mrd->nodeuuid); + name_destroy(&mrd->nodeuuid); + if (rc) + return rc; + } + } + if (mrd->nodeuuid) { + rc = record_add_conn(env, mrd->temp_llh, + lustre_cfg_string(lcfg, 0), + mrd->nodeuuid); + name_destroy(&mrd->nodeuuid); + if (rc) + return rc; + } + } + mrd->state = REPLACE_DONE; return rc ? rc : 1; } @@ -928,22 +1235,22 @@ static int process_command(const struct lu_env *env, struct lustre_cfg *lcfg, * * \param[in] llh log to be processed * \param[in] rec current record - * \param[in] data mgs_replace_uuid_lookup structure + * \param[in] data mgs_replace_data structure * * \retval 0 success */ -static int mgs_replace_handler(const struct lu_env *env, - struct llog_handle *llh, - struct llog_rec_hdr *rec, - void *data) +static int mgs_replace_nids_handler(const struct lu_env *env, + struct llog_handle *llh, + struct llog_rec_hdr *rec, + void *data) { - struct mgs_replace_uuid_lookup *mrul; + struct mgs_replace_data *mrd; struct lustre_cfg *lcfg = REC_DATA(rec); int cfg_len = REC_DATA_LEN(rec); int rc; ENTRY; - mrul = (struct mgs_replace_uuid_lookup *)data; + mrd = (struct mgs_replace_data *)data; if (rec->lrh_type != OBD_CFG_REC) { CERROR("unhandled lrh_type: %#x, cmd %x %s %s\n", @@ -959,23 +1266,27 @@ static int mgs_replace_handler(const struct lu_env *env, GOTO(skip_out, rc = 0); } - rc = check_markers(lcfg, mrul); - if (rc || mrul->skip_it) + rc = check_markers(lcfg, mrd); + if (rc || mrd->state == REPLACE_SKIP) GOTO(skip_out, rc = 0); /* Write to new log all commands outside target device block */ - if (!mrul->in_target_device) + if (mrd->state == REPLACE_COPY) GOTO(copy_out, rc = 0); - /* Skip all other LCFG_ADD_UUID and LCFG_ADD_CONN records - (failover nids) for this target, assuming that if then - primary is changing then so is the failover */ - if (mrul->device_nids_added && + if (mrd->state == REPLACE_DONE && (lcfg->lcfg_command == LCFG_ADD_UUID || - lcfg->lcfg_command == LCFG_ADD_CONN)) + lcfg->lcfg_command == LCFG_ADD_CONN)) { + if (!mrd->failover) + CWARN("Previous failover is deleted, but new one is " + "not set. This means you configure system " + "without failover or passed wrong replace_nids " + "command parameters. Device %s, passed nids %s\n", + mrd->target.mti_svname, mrd->target.mti_params); GOTO(skip_out, rc = 0); + } - rc = process_command(env, lcfg, mrul); + rc = process_command(env, lcfg, mrd); if (rc < 0) RETURN(rc); @@ -983,7 +1294,7 @@ static int mgs_replace_handler(const struct lu_env *env, RETURN(0); copy_out: /* Record is placed in temporary llog as is */ - rc = llog_write(env, mrul->temp_llh, rec, LLOG_NEXT_IDX); + rc = llog_write(env, mrd->temp_llh, rec, LLOG_NEXT_IDX); CDEBUG(D_MGS, "Copied idx=%d, rc=%d, len=%d, cmd %x %s %s\n", rec->lrh_index, rc, rec->lrh_len, lcfg->lcfg_command, @@ -1011,21 +1322,21 @@ static int mgs_log_is_empty(const struct lu_env *env, return rc; } -static int mgs_replace_nids_log(const struct lu_env *env, - struct obd_device *mgs, struct fs_db *fsdb, - char *logname, char *devname, char *nids) +static int mgs_replace_log(const struct lu_env *env, + struct obd_device *mgs, + char *logname, char *devname, + llog_cb_t replace_handler, void *data) { struct llog_handle *orig_llh, *backup_llh; struct llog_ctxt *ctxt; - struct mgs_replace_uuid_lookup *mrul; + struct mgs_replace_data *mrd; struct mgs_device *mgs_dev = lu2mgs_dev(mgs->obd_lu_dev); static struct obd_uuid cfg_uuid = { .uuid = "config_uuid" }; char *backup; - int rc, rc2; + int rc, rc2, buf_size; + time64_t now; ENTRY; - CDEBUG(D_MGS, "Replace nids for %s in %s\n", devname, logname); - ctxt = llog_get_context(mgs, LLOG_CONFIG_ORIG_CTXT); LASSERT(ctxt != NULL); @@ -1034,11 +1345,15 @@ static int mgs_replace_nids_log(const struct lu_env *env, GOTO(out_put, rc = 0); } - OBD_ALLOC(backup, strlen(logname) + strlen(".bak") + 1); + now = ktime_get_real_seconds(); + + /* max time64_t in decimal fits into 20 bytes long string */ + buf_size = strlen(logname) + 1 + 20 + 1 + strlen(".bak") + 1; + OBD_ALLOC(backup, buf_size); if (backup == NULL) GOTO(out_put, rc = -ENOMEM); - sprintf(backup, "%s.bak", logname); + snprintf(backup, buf_size, "%s.%llu.bak", logname, now); rc = llog_backup(env, mgs, ctxt, ctxt, logname, backup); if (rc == 0) { @@ -1075,20 +1390,23 @@ static int mgs_replace_nids_log(const struct lu_env *env, if (llog_get_size(backup_llh) <= 1) GOTO(out_close, rc = 0); - OBD_ALLOC_PTR(mrul); - if (!mrul) + OBD_ALLOC_PTR(mrd); + if (!mrd) GOTO(out_close, rc = -ENOMEM); /* devname is only needed information to replace UUID records */ - strlcpy(mrul->target.mti_svname, devname, - sizeof(mrul->target.mti_svname)); - /* parse nids later */ - strlcpy(mrul->target.mti_params, nids, sizeof(mrul->target.mti_params)); + if (devname) + strlcpy(mrd->target.mti_svname, devname, + sizeof(mrd->target.mti_svname)); + /* data is parsed in llog callback */ + if (data) + strlcpy(mrd->target.mti_params, data, + sizeof(mrd->target.mti_params)); /* Copy records to this temporary llog */ - mrul->temp_llh = orig_llh; + mrd->temp_llh = orig_llh; - rc = llog_process(env, backup_llh, mgs_replace_handler, - (void *)mrul, NULL); - OBD_FREE_PTR(mrul); + rc = llog_process(env, backup_llh, replace_handler, + (void *)mrd, NULL); + OBD_FREE_PTR(mrd); out_close: rc2 = llog_close(NULL, backup_llh); if (!rc) @@ -1110,30 +1428,55 @@ out_restore: } out_free: - OBD_FREE(backup, strlen(backup) + 1); + OBD_FREE(backup, buf_size); out_put: llog_ctxt_put(ctxt); if (rc) - CERROR("%s: failed to replace nids in log %s: rc = %d\n", + CERROR("%s: failed to replace log %s: rc = %d\n", mgs->obd_name, logname, rc); RETURN(rc); } -/** - * Parse device name and get file system name and/or device index - * - * \param[in] devname device name (ex. lustre-MDT0000) - * \param[out] fsname file system name(optional) - * \param[out] index device index(optional) - * - * \retval 0 success +static int mgs_replace_nids_log(const struct lu_env *env, + struct obd_device *obd, + char *logname, char *devname, char *nids) +{ + CDEBUG(D_MGS, "Replace NIDs for %s in %s\n", devname, logname); + return mgs_replace_log(env, obd, logname, devname, + mgs_replace_nids_handler, nids); +} + +/** + * Parse device name and get file system name and/or device index + * + * @devname device name (ex. lustre-MDT0000) + * @fsname file system name extracted from @devname and returned + * to the caller (optional) + * @index device index extracted from @devname and returned to + * the caller (optional) + * + * RETURN 0 success if we are only interested in + * extracting fsname from devname. + * i.e index is NULL + * + * LDD_F_SV_TYPE_* Besides extracting the fsname the + * user also wants the index. Report to + * the user the type of obd device the + * returned index belongs too. + * + * -EINVAL The obd device name is improper so + * fsname could not be extracted. + * + * -ENXIO Failed to extract the index out of + * the obd device name. Most likely an + * invalid obd device name */ -static int mgs_parse_devname(char *devname, char *fsname, __u32 *index) +static int mgs_parse_devname(char *devname, char *fsname, u32 *index) { - int rc; + int rc = 0; ENTRY; /* Extract fsname */ @@ -1151,11 +1494,12 @@ static int mgs_parse_devname(char *devname, char *fsname, __u32 *index) if (rc < 0) { CDEBUG(D_MGS, "Device name %s with wrong index\n", devname); - RETURN(-EINVAL); + RETURN(-ENXIO); } } - RETURN(0); + /* server_name2index can return LDD_F_SV_TYPE_* so always return rc */ + RETURN(rc); } /* This is only called during replace_nids */ @@ -1217,7 +1561,7 @@ int mgs_replace_nids(const struct lu_env *env, int rc; __u32 index; char *logname; - struct fs_db *fsdb; + struct fs_db *fsdb = NULL; unsigned int i; int conn_state; struct obd_device *mgs_obd = mgs->mgs_obd; @@ -1235,9 +1579,9 @@ int mgs_replace_nids(const struct lu_env *env, GOTO(out, rc = -EINPROGRESS); } - /* Get fsname and index*/ + /* Get fsname and index */ rc = mgs_parse_devname(devname, fsname, &index); - if (rc) + if (rc < 0) GOTO(out, rc); rc = mgs_find_or_make_fsdb(env, mgs, fsname, &fsdb); @@ -1248,7 +1592,7 @@ int mgs_replace_nids(const struct lu_env *env, /* Process client llogs */ name_create(&logname, fsname, "-client"); - rc = mgs_replace_nids_log(env, mgs_obd, fsdb, logname, devname, nids); + rc = mgs_replace_nids_log(env, mgs_obd, logname, devname, nids); name_destroy(&logname); if (rc) { CERROR("%s: error while replacing NIDs for %s: rc = %d\n", @@ -1261,7 +1605,7 @@ int mgs_replace_nids(const struct lu_env *env, if (!test_bit(i, fsdb->fsdb_mdt_index_map)) continue; name_create_mdt(&logname, fsname, i); - rc = mgs_replace_nids_log(env, mgs_obd, fsdb, logname, devname, nids); + rc = mgs_replace_nids_log(env, mgs_obd, logname, devname, nids); name_destroy(&logname); if (rc) GOTO(out, rc); @@ -1272,6 +1616,191 @@ out: mgs_obd->obd_no_conn = conn_state; spin_unlock(&mgs_obd->obd_dev_lock); + if (fsdb) + mgs_put_fsdb(mgs, fsdb); + + RETURN(rc); +} + +/** + * This is called for every record in llog. Some of records are + * skipped, others are copied to new log as is. + * Records to be skipped are + * marker records marked SKIP + * records enclosed between SKIP markers + * + * \param[in] llh log to be processed + * \param[in] rec current record + * \param[in] data mgs_replace_data structure + * + * \retval 0 success + **/ +static int mgs_clear_config_handler(const struct lu_env *env, + struct llog_handle *llh, + struct llog_rec_hdr *rec, void *data) +{ + struct mgs_replace_data *mrd; + struct lustre_cfg *lcfg = REC_DATA(rec); + int cfg_len = REC_DATA_LEN(rec); + int rc; + + ENTRY; + + mrd = (struct mgs_replace_data *)data; + + if (rec->lrh_type != OBD_CFG_REC) { + CDEBUG(D_MGS, "Config llog Name=%s, Record Index=%u, " + "Unhandled Record Type=%#x\n", llh->lgh_name, + rec->lrh_index, rec->lrh_type); + RETURN(-EINVAL); + } + + rc = lustre_cfg_sanity_check(lcfg, cfg_len); + if (rc) { + CDEBUG(D_MGS, "Config llog Name=%s, Invalid config file.", + llh->lgh_name); + RETURN(-EINVAL); + } + + if (lcfg->lcfg_command == LCFG_MARKER) { + struct cfg_marker *marker; + + marker = lustre_cfg_buf(lcfg, 1); + if (marker->cm_flags & CM_SKIP) { + if (marker->cm_flags & CM_START) + mrd->state = REPLACE_SKIP; + if (marker->cm_flags & CM_END) + mrd->state = REPLACE_COPY; + /* SKIP section started or finished */ + CDEBUG(D_MGS, "Skip idx=%d, rc=%d, len=%d, " + "cmd %x %s %s\n", rec->lrh_index, rc, + rec->lrh_len, lcfg->lcfg_command, + lustre_cfg_string(lcfg, 0), + lustre_cfg_string(lcfg, 1)); + RETURN(0); + } + } else { + if (mrd->state == REPLACE_SKIP) { + /* record enclosed between SKIP markers, skip it */ + CDEBUG(D_MGS, "Skip idx=%d, rc=%d, len=%d, " + "cmd %x %s %s\n", rec->lrh_index, rc, + rec->lrh_len, lcfg->lcfg_command, + lustre_cfg_string(lcfg, 0), + lustre_cfg_string(lcfg, 1)); + RETURN(0); + } + } + + /* Record is placed in temporary llog as is */ + rc = llog_write(env, mrd->temp_llh, rec, LLOG_NEXT_IDX); + + CDEBUG(D_MGS, "Copied idx=%d, rc=%d, len=%d, cmd %x %s %s\n", + rec->lrh_index, rc, rec->lrh_len, lcfg->lcfg_command, + lustre_cfg_string(lcfg, 0), lustre_cfg_string(lcfg, 1)); + RETURN(rc); +} + +/* + * Directory CONFIGS/ may contain files which are not config logs to + * be cleared. Skip any llogs with a non-alphanumeric character after + * the last '-'. For example, fsname-MDT0000.sav, fsname-MDT0000.bak, + * fsname-MDT0000.orig, fsname-MDT0000~, fsname-MDT0000.20150516, etc. + */ +static bool config_to_clear(const char *logname) +{ + int i; + char *str; + + str = strrchr(logname, '-'); + if (!str) + return 0; + + i = 0; + while (isalnum(str[++i])); + return str[i] == '\0'; +} + +/** + * Clear config logs for \a name + * + * \param env + * \param mgs MGS device + * \param name name of device or of filesystem + * (ex. lustre-OST0000 or lustre) in later case all logs + * will be cleared + * + * \retval 0 success + */ +int mgs_clear_configs(const struct lu_env *env, + struct mgs_device *mgs, const char *name) +{ + struct list_head dentry_list; + struct mgs_direntry *dirent, *n; + char *namedash; + int conn_state; + struct obd_device *mgs_obd = mgs->mgs_obd; + int rc; + + ENTRY; + + /* Prevent clients and servers from connecting to mgs */ + spin_lock(&mgs_obd->obd_dev_lock); + conn_state = mgs_obd->obd_no_conn; + mgs_obd->obd_no_conn = 1; + spin_unlock(&mgs_obd->obd_dev_lock); + + /* + * config logs cannot be cleaned if anything other than + * MGS is started + */ + if (!only_mgs_is_running(mgs_obd)) { + CERROR("Only MGS is allowed to be started\n"); + GOTO(out, rc = -EBUSY); + } + + /* Find all the logs in the CONFIGS directory */ + rc = class_dentry_readdir(env, mgs, &dentry_list); + if (rc) { + CERROR("%s: cannot read config directory '%s': rc = %d\n", + mgs_obd->obd_name, MOUNT_CONFIGS_DIR, rc); + GOTO(out, rc); + } + + if (list_empty(&dentry_list)) { + CERROR("%s: list empty reading config dir '%s': rc = %d\n", + mgs_obd->obd_name, MOUNT_CONFIGS_DIR, -ENOENT); + GOTO(out, rc = -ENOENT); + } + + OBD_ALLOC(namedash, strlen(name) + 2); + if (namedash == NULL) + GOTO(out, rc = -ENOMEM); + snprintf(namedash, strlen(name) + 2, "%s-", name); + + list_for_each_entry(dirent, &dentry_list, mde_list) { + if (strcmp(name, dirent->mde_name) && + strncmp(namedash, dirent->mde_name, strlen(namedash))) + continue; + if (!config_to_clear(dirent->mde_name)) + continue; + CDEBUG(D_MGS, "%s: Clear config log %s\n", + mgs_obd->obd_name, dirent->mde_name); + rc = mgs_replace_log(env, mgs_obd, dirent->mde_name, NULL, + mgs_clear_config_handler, NULL); + if (rc) + break; + } + + list_for_each_entry_safe(dirent, n, &dentry_list, mde_list) { + list_del_init(&dirent->mde_list); + mgs_direntry_free(dirent); + } + OBD_FREE(namedash, strlen(name) + 2); +out: + spin_lock(&mgs_obd->obd_dev_lock); + mgs_obd->obd_no_conn = conn_state; + spin_unlock(&mgs_obd->obd_dev_lock); + RETURN(rc); } @@ -1362,7 +1891,7 @@ static int record_marker(const struct lu_env *env, sizeof(mgi->mgi_marker.cm_comment)); if (cplen >= sizeof(mgi->mgi_marker.cm_comment)) return -E2BIG; - mgi->mgi_marker.cm_createtime = cfs_time_current_sec(); + mgi->mgi_marker.cm_createtime = ktime_get_real_seconds(); mgi->mgi_marker.cm_canceltime = 0; lustre_cfg_bufs_reset(&mgi->mgi_bufs, NULL); lustre_cfg_bufs_set(&mgi->mgi_bufs, 1, &mgi->mgi_marker, @@ -1681,7 +2210,8 @@ static int mgs_steal_client_llog_handler(const struct lu_env *env, if (lcfg->lcfg_command == LCFG_SPTLRPC_CONF) RETURN(rc); - if (lcfg->lcfg_command == LCFG_ADD_MDC) { + if (lcfg->lcfg_command == LCFG_ADD_MDC && + strstr(lustre_cfg_string(lcfg, 0), "-clilmv") != NULL) { int index; if (sscanf(lustre_cfg_buf(lcfg, 2), "%d", &index) != 1) @@ -2317,17 +2847,14 @@ static int mgs_write_log_mdt(const struct lu_env *env, if (rc) GOTO(out_free, rc); - rc = record_marker(env, llh, fsdb, CM_START, cliname, - "mount opts"); + rc = record_marker(env, llh, fsdb, CM_START, cliname, "mount opts"); if (rc) GOTO(out_end, rc); rc = record_mount_opt(env, llh, cliname, fsdb->fsdb_clilov, fsdb->fsdb_clilmv); if (rc) GOTO(out_end, rc); - rc = record_marker(env, llh, fsdb, CM_END, cliname, - "mount opts"); - + rc = record_marker(env, llh, fsdb, CM_END, cliname, "mount opts"); if (rc) GOTO(out_end, rc); @@ -2577,13 +3104,14 @@ out_end: /* Add ost to all MDT lov defs */ for (i = 0; i < INDEX_MAP_SIZE * 8; i++){ if (test_bit(i, fsdb->fsdb_mdt_index_map)) { - char mdt_index[9]; + char mdt_index[13]; rc = name_create_mdt_and_lov(&logname, &lovname, fsdb, i); if (rc) RETURN(rc); - sprintf(mdt_index, "-MDT%04x", i); + + snprintf(mdt_index, sizeof(mdt_index), "-MDT%04x", i); rc = mgs_write_log_osc_to_lov(env, mgs, fsdb, mti, logname, mdt_index, lovname, LUSTRE_SP_MDT, @@ -2677,7 +3205,8 @@ static int mgs_write_log_add_failnid(const struct lu_env *env, /* FIXME we currently can't erase the failnids * given when a target first registers, since they aren't part of - * an "add uuid" stanza */ + * an "add uuid" stanza + */ /* Verify that we know about this target */ if (mgs_log_is_empty(env, mgs, mti->mti_svname)) { @@ -2697,12 +3226,14 @@ static int mgs_write_log_add_failnid(const struct lu_env *env, } if (rc) RETURN(rc); + /* Add failover nids to the client log */ rc = name_create(&logname, mti->mti_fsname, "-client"); if (rc) { name_destroy(&cliname); RETURN(rc); } + rc = mgs_write_log_failnid_internal(env, mgs, fsdb,mti,logname,cliname); name_destroy(&logname); name_destroy(&cliname); @@ -2787,22 +3318,6 @@ static int mgs_wlp_lcfg(const struct lu_env *env, return rc; } -static int mgs_write_log_param2(const struct lu_env *env, - struct mgs_device *mgs, - struct fs_db *fsdb, - struct mgs_target_info *mti, char *ptr) -{ - struct lustre_cfg_bufs bufs; - int rc = 0; - ENTRY; - - CDEBUG(D_MGS, "next param '%s'\n", ptr); - rc = mgs_wlp_lcfg(env, mgs, fsdb, mti, PARAMS_FILENAME, &bufs, - mti->mti_svname, ptr); - - RETURN(rc); -} - /* write global variable settings into log */ static int mgs_write_log_sys(const struct lu_env *env, struct mgs_device *mgs, struct fs_db *fsdb, @@ -2846,7 +3361,14 @@ static int mgs_write_log_sys(const struct lu_env *env, return -ENOMEM; lcfg = &lcr->lcr_cfg; - lcfg->lcfg_num = convert ? simple_strtoul(tmp, NULL, 0) : 0; + if (convert) { + rc = kstrtouint(tmp, 0, &lcfg->lcfg_num); + if (rc) + GOTO(out_rec_free, rc); + } else { + lcfg->lcfg_num = 0; + } + /* truncate the comment to the parameter name */ ptr = tmp - 1; sep = *ptr; @@ -2870,6 +3392,7 @@ static int mgs_write_log_sys(const struct lu_env *env, } } *ptr = sep; +out_rec_free: lustre_cfg_rec_free(lcr); return rc; } @@ -2899,6 +3422,7 @@ static int mgs_write_log_quota(const struct lu_env *env, struct mgs_device *mgs, CDEBUG(D_MGS, "global '%s'\n", quota); if (strchr(tmp, 'u') == NULL && strchr(tmp, 'g') == NULL && + strchr(tmp, 'p') == NULL && strcmp(tmp, "none") != 0) { CERROR("enable option(%s) isn't supported\n", tmp); return -EINVAL; @@ -3282,6 +3806,79 @@ out: RETURN(rc); } +static int mgs_write_log_param2(const struct lu_env *env, + struct mgs_device *mgs, + struct fs_db *fsdb, + struct mgs_target_info *mti, char *ptr) +{ + struct lustre_cfg_bufs bufs; + int rc; + + ENTRY; + CDEBUG(D_MGS, "next param '%s'\n", ptr); + + /* PARAM_MGSNODE and PARAM_NETWORK are set only when formating + * or during the inital mount. It can never change after that. + */ + if (!class_match_param(ptr, PARAM_MGSNODE, NULL) || + !class_match_param(ptr, PARAM_NETWORK, NULL)) { + rc = 0; + goto end; + } + + /* Processed in mgs_write_log_ost. Another value that can't + * be changed by lctl set_param -P. + */ + if (!class_match_param(ptr, PARAM_FAILMODE, NULL)) { + LCONSOLE_ERROR_MSG(0x169, + "%s can only be changed with tunefs.lustre and --writeconf\n", + ptr); + rc = -EPERM; + goto end; + } + + /* FIXME !!! Support for sptlrpc is incomplete. Currently the change + * doesn't transmit to the client. See LU-7183. + */ + if (!class_match_param(ptr, PARAM_SRPC, NULL)) { + rc = mgs_srpc_set_param(env, mgs, fsdb, mti, ptr); + goto end; + } + + /* Can't use class_match_param since ptr doesn't start with + * PARAM_FAILNODE. So we look for PARAM_FAILNODE contained in ptr. + */ + if (strstr(ptr, PARAM_FAILNODE)) { + /* Add a failover nidlist. We already processed failovers + * params for new targets in mgs_write_log_target. + */ + const char *param; + + /* can't use wildcards with failover.node */ + if (strchr(ptr, '*')) { + rc = -ENODEV; + goto end; + } + + param = strstr(ptr, PARAM_FAILNODE); + if (strlcpy(mti->mti_params, param, sizeof(mti->mti_params)) >= + sizeof(mti->mti_params)) { + rc = -E2BIG; + goto end; + } + + CDEBUG(D_MGS, "Adding failnode with param %s\n", + mti->mti_params); + rc = mgs_write_log_add_failnid(env, mgs, fsdb, mti); + goto end; + } + + rc = mgs_wlp_lcfg(env, mgs, fsdb, mti, PARAMS_FILENAME, &bufs, + mti->mti_svname, ptr); +end: + RETURN(rc); +} + /* Permanent settings of all parameters by writing into the appropriate * configuration logs. * A parameter with null value ("='\0'") means to erase it out of @@ -3369,7 +3966,7 @@ static int mgs_write_log_param(const struct lu_env *env, LCONSOLE_ERROR_MSG(0x144, "%s: MDC0 can not be" " (de)activated.\n", mti->mti_svname); - GOTO(end, rc = -EINVAL); + GOTO(end, rc = -EPERM); } } @@ -3697,6 +4294,7 @@ active_err: /* All mdd., ost. and osd. params in proc */ if ((class_match_param(ptr, PARAM_MDD, NULL) == 0) || + (class_match_param(ptr, PARAM_LOD, NULL) == 0) || (class_match_param(ptr, PARAM_OST, NULL) == 0) || (class_match_param(ptr, PARAM_OSD, NULL) == 0)) { CDEBUG(D_MGS, "%.3s param %s\n", ptr, ptr + 4); @@ -3747,27 +4345,26 @@ int mgs_write_log_target(const struct lu_env *env, struct mgs_device *mgs, mutex_lock(&fsdb->fsdb_mutex); - if (mti->mti_flags & - (LDD_F_VIRGIN | LDD_F_UPGRADE14 | LDD_F_WRITECONF)) { - /* Generate a log from scratch */ - if (mti->mti_flags & LDD_F_SV_TYPE_MDT) { + if (mti->mti_flags & (LDD_F_VIRGIN | LDD_F_WRITECONF)) { + /* Generate a log from scratch */ + if (mti->mti_flags & LDD_F_SV_TYPE_MDT) { rc = mgs_write_log_mdt(env, mgs, fsdb, mti); - } else if (mti->mti_flags & LDD_F_SV_TYPE_OST) { + } else if (mti->mti_flags & LDD_F_SV_TYPE_OST) { rc = mgs_write_log_ost(env, mgs, fsdb, mti); - } else { - CERROR("Unknown target type %#x, can't create log for " - "%s\n", mti->mti_flags, mti->mti_svname); - } - if (rc) { - CERROR("Can't write logs for %s (%d)\n", - mti->mti_svname, rc); - GOTO(out_up, rc); - } - } else { - /* Just update the params from tunefs in mgs_write_log_params */ - CDEBUG(D_MGS, "Update params for %s\n", mti->mti_svname); - mti->mti_flags |= LDD_F_PARAM; - } + } else { + CERROR("Unknown target type %#x, can't create log for %s\n", + mti->mti_flags, mti->mti_svname); + } + if (rc) { + CERROR("Can't write logs for %s (%d)\n", + mti->mti_svname, rc); + GOTO(out_up, rc); + } + } else { + /* Just update the params from tunefs in mgs_write_log_params */ + CDEBUG(D_MGS, "Update params for %s\n", mti->mti_svname); + mti->mti_flags |= LDD_F_PARAM; + } /* allocate temporary buffer, where class_get_next_param will make copy of a current parameter */ @@ -3824,27 +4421,37 @@ int mgs_erase_log(const struct lu_env *env, struct mgs_device *mgs, char *name) } /* erase all logs for the given fs */ -int mgs_erase_logs(const struct lu_env *env, struct mgs_device *mgs, char *fsname) +int mgs_erase_logs(const struct lu_env *env, struct mgs_device *mgs, + const char *fsname) { - struct fs_db *fsdb; struct list_head log_list; struct mgs_direntry *dirent, *n; - int rc, len = strlen(fsname); + char barrier_name[20] = {}; char *suffix; + int count = 0; + int rc, len = strlen(fsname); ENTRY; + mutex_lock(&mgs->mgs_mutex); + /* Find all the logs in the CONFIGS directory */ rc = class_dentry_readdir(env, mgs, &log_list); - if (rc) + if (rc) { + mutex_unlock(&mgs->mgs_mutex); RETURN(rc); + } - mutex_lock(&mgs->mgs_mutex); - - /* Delete the fs db */ - fsdb = mgs_find_fsdb(mgs, fsname); - if (fsdb) - mgs_free_fsdb(mgs, fsdb); + if (list_empty(&log_list)) { + mutex_unlock(&mgs->mgs_mutex); + RETURN(-ENOENT); + } + snprintf(barrier_name, sizeof(barrier_name) - 1, "%s-%s", + fsname, BARRIER_FILENAME); + /* Delete the barrier fsdb */ + mgs_remove_fsdb_by_name(mgs, barrier_name); + /* Delete the fs db */ + mgs_remove_fsdb_by_name(mgs, fsname); mutex_unlock(&mgs->mgs_mutex); list_for_each_entry_safe(dirent, n, &log_list, mde_list) { @@ -3856,12 +4463,16 @@ int mgs_erase_logs(const struct lu_env *env, struct mgs_device *mgs, char *fsnam CDEBUG(D_MGS, "Removing log %s\n", dirent->mde_name); mgs_erase_log(env, mgs, dirent->mde_name); + count++; } } mgs_direntry_free(dirent); } - RETURN(rc); + if (count == 0) + rc = -ENOENT; + + RETURN(rc); } /* list all logs for the given fs */ @@ -3886,7 +4497,7 @@ int mgs_list_logs(const struct lu_env *env, struct mgs_device *mgs, list_del_init(&dirent->mde_list); suffix = strrchr(dirent->mde_name, '-'); if (suffix != NULL) { - l = snprintf(out, remains, "config log: $%s\n", + l = snprintf(out, remains, "config_log: %s\n", dirent->mde_name); out += l; remains -= l; @@ -3898,179 +4509,860 @@ int mgs_list_logs(const struct lu_env *env, struct mgs_device *mgs, RETURN(rc); } -/* from llog_swab */ -static void print_lustre_cfg(struct lustre_cfg *lcfg) +struct mgs_lcfg_fork_data { + struct lustre_cfg_bufs mlfd_bufs; + struct mgs_device *mlfd_mgs; + struct llog_handle *mlfd_llh; + const char *mlfd_oldname; + const char *mlfd_newname; + char mlfd_data[0]; +}; + +static bool contain_valid_fsname(char *buf, const char *fsname, + int buflen, int namelen) { - int i; - ENTRY; + if (buflen < namelen) + return false; - CDEBUG(D_MGS, "lustre_cfg: %p\n", lcfg); - CDEBUG(D_MGS, "\tlcfg->lcfg_version: %#x\n", lcfg->lcfg_version); + if (memcmp(buf, fsname, namelen) != 0) + return false; - CDEBUG(D_MGS, "\tlcfg->lcfg_command: %#x\n", lcfg->lcfg_command); - CDEBUG(D_MGS, "\tlcfg->lcfg_num: %#x\n", lcfg->lcfg_num); - CDEBUG(D_MGS, "\tlcfg->lcfg_flags: %#x\n", lcfg->lcfg_flags); - CDEBUG(D_MGS, "\tlcfg->lcfg_nid: %s\n", libcfs_nid2str(lcfg->lcfg_nid)); + if (buf[namelen] != '\0' && buf[namelen] != '-') + return false; - CDEBUG(D_MGS, "\tlcfg->lcfg_bufcount: %d\n", lcfg->lcfg_bufcount); - if (lcfg->lcfg_bufcount < LUSTRE_CFG_MAX_BUFCOUNT) - for (i = 0; i < lcfg->lcfg_bufcount; i++) { - CDEBUG(D_MGS, "\tlcfg->lcfg_buflens[%d]: %d %s\n", - i, lcfg->lcfg_buflens[i], - lustre_cfg_string(lcfg, i)); - } - EXIT; + return true; } -/* Setup _mgs fsdb and log - */ -int mgs__mgs_fsdb_setup(const struct lu_env *env, struct mgs_device *mgs, - struct fs_db *fsdb) +static int mgs_lcfg_fork_handler(const struct lu_env *env, + struct llog_handle *o_llh, + struct llog_rec_hdr *o_rec, void *data) { - int rc; + struct mgs_lcfg_fork_data *mlfd = data; + struct lustre_cfg_bufs *n_bufs = &mlfd->mlfd_bufs; + struct lustre_cfg *o_lcfg = (struct lustre_cfg *)(o_rec + 1); + struct llog_cfg_rec *lcr; + char *o_buf; + char *n_buf = mlfd->mlfd_data; + int o_buflen; + int o_namelen = strlen(mlfd->mlfd_oldname); + int n_namelen = strlen(mlfd->mlfd_newname); + int diff = n_namelen - o_namelen; + __u32 cmd = o_lcfg->lcfg_command; + __u32 cnt = o_lcfg->lcfg_bufcount; + int rc; + int i; ENTRY; - rc = mgs_find_or_make_fsdb(env, mgs, MGSSELF_NAME, &fsdb); + /* buf[0] */ + o_buf = lustre_cfg_buf(o_lcfg, 0); + o_buflen = o_lcfg->lcfg_buflens[0]; + if (contain_valid_fsname(o_buf, mlfd->mlfd_oldname, o_buflen, + o_namelen)) { + memcpy(n_buf, mlfd->mlfd_newname, n_namelen); + memcpy(n_buf + n_namelen, o_buf + o_namelen, + o_buflen - o_namelen); + lustre_cfg_bufs_reset(n_bufs, n_buf); + n_buf += cfs_size_round(o_buflen + diff); + } else { + lustre_cfg_bufs_reset(n_bufs, o_buflen != 0 ? o_buf : NULL); + } - RETURN(rc); -} + switch (cmd) { + case LCFG_MARKER: { + struct cfg_marker *o_marker; + struct cfg_marker *n_marker; + int tgt_namelen; + + if (cnt != 2) { + CDEBUG(D_MGS, "Unknown cfg marker entry with %d " + "buffers\n", cnt); + RETURN(-EINVAL); + } -/* Setup params fsdb and log - */ -int mgs_params_fsdb_setup(const struct lu_env *env, struct mgs_device *mgs, - struct fs_db *fsdb) -{ - struct llog_handle *params_llh = NULL; - int rc; - ENTRY; + /* buf[1] is marker */ + o_buf = lustre_cfg_buf(o_lcfg, 1); + o_buflen = o_lcfg->lcfg_buflens[1]; + o_marker = (struct cfg_marker *)o_buf; + if (!contain_valid_fsname(o_marker->cm_tgtname, + mlfd->mlfd_oldname, + sizeof(o_marker->cm_tgtname), + o_namelen)) { + lustre_cfg_bufs_set(n_bufs, 1, o_marker, + sizeof(*o_marker)); + break; + } - rc = mgs_find_or_make_fsdb(env, mgs, PARAMS_FILENAME, &fsdb); - if (fsdb != NULL) { - mutex_lock(&fsdb->fsdb_mutex); - rc = record_start_log(env, mgs, ¶ms_llh, PARAMS_FILENAME); - if (rc == 0) - rc = record_end_log(env, ¶ms_llh); - mutex_unlock(&fsdb->fsdb_mutex); + n_marker = (struct cfg_marker *)n_buf; + *n_marker = *o_marker; + memcpy(n_marker->cm_tgtname, mlfd->mlfd_newname, n_namelen); + tgt_namelen = strlen(o_marker->cm_tgtname); + if (tgt_namelen > o_namelen) + memcpy(n_marker->cm_tgtname + n_namelen, + o_marker->cm_tgtname + o_namelen, + tgt_namelen - o_namelen); + n_marker->cm_tgtname[tgt_namelen + diff] = '\0'; + lustre_cfg_bufs_set(n_bufs, 1, n_marker, sizeof(*n_marker)); + break; + } + case LCFG_PARAM: + case LCFG_SET_PARAM: { + for (i = 1; i < cnt; i++) + /* buf[i] is the param value, reuse it directly */ + lustre_cfg_bufs_set(n_bufs, i, + lustre_cfg_buf(o_lcfg, i), + o_lcfg->lcfg_buflens[i]); + break; } + case LCFG_POOL_NEW: + case LCFG_POOL_ADD: + case LCFG_POOL_REM: + case LCFG_POOL_DEL: { + if (cnt < 3 || cnt > 4) { + CDEBUG(D_MGS, "Unknown cfg pool (%x) entry with %d " + "buffers\n", cmd, cnt); + RETURN(-EINVAL); + } - RETURN(rc); -} + /* buf[1] is fsname */ + o_buf = lustre_cfg_buf(o_lcfg, 1); + o_buflen = o_lcfg->lcfg_buflens[1]; + memcpy(n_buf, mlfd->mlfd_newname, n_namelen); + memcpy(n_buf + n_namelen, o_buf + o_namelen, + o_buflen - o_namelen); + lustre_cfg_bufs_set(n_bufs, 1, n_buf, o_buflen + diff); + n_buf += cfs_size_round(o_buflen + diff); -/* Cleanup params fsdb and log - */ -int mgs_params_fsdb_cleanup(const struct lu_env *env, struct mgs_device *mgs) -{ - return mgs_erase_logs(env, mgs, PARAMS_FILENAME); -} + /* buf[2] is the pool name, reuse it directly */ + lustre_cfg_bufs_set(n_bufs, 2, lustre_cfg_buf(o_lcfg, 2), + o_lcfg->lcfg_buflens[2]); -/* Set a permanent (config log) param for a target or fs - * \param lcfg buf0 may contain the device (testfs-MDT0000) name - * buf1 contains the single parameter - */ -int mgs_setparam(const struct lu_env *env, struct mgs_device *mgs, - struct lustre_cfg *lcfg, char *fsname) -{ - struct fs_db *fsdb; - struct mgs_target_info *mti; - char *devname, *param; - char *ptr; - const char *tmp; - __u32 index; + if (cnt == 3) + break; + + /* buf[3] is ostname */ + o_buf = lustre_cfg_buf(o_lcfg, 3); + o_buflen = o_lcfg->lcfg_buflens[3]; + memcpy(n_buf, mlfd->mlfd_newname, n_namelen); + memcpy(n_buf + n_namelen, o_buf + o_namelen, + o_buflen - o_namelen); + lustre_cfg_bufs_set(n_bufs, 3, n_buf, o_buflen + diff); + break; + } + case LCFG_SETUP: { + if (cnt == 2) { + o_buflen = o_lcfg->lcfg_buflens[1]; + if (o_buflen == sizeof(struct lov_desc) || + o_buflen == sizeof(struct lmv_desc)) { + char *o_uuid; + char *n_uuid; + int uuid_len; + + /* buf[1] */ + o_buf = lustre_cfg_buf(o_lcfg, 1); + if (o_buflen == sizeof(struct lov_desc)) { + struct lov_desc *o_desc = + (struct lov_desc *)o_buf; + struct lov_desc *n_desc = + (struct lov_desc *)n_buf; + + *n_desc = *o_desc; + o_uuid = o_desc->ld_uuid.uuid; + n_uuid = n_desc->ld_uuid.uuid; + uuid_len = sizeof(o_desc->ld_uuid.uuid); + } else { + struct lmv_desc *o_desc = + (struct lmv_desc *)o_buf; + struct lmv_desc *n_desc = + (struct lmv_desc *)n_buf; + + *n_desc = *o_desc; + o_uuid = o_desc->ld_uuid.uuid; + n_uuid = n_desc->ld_uuid.uuid; + uuid_len = sizeof(o_desc->ld_uuid.uuid); + } + + if (unlikely(!contain_valid_fsname(o_uuid, + mlfd->mlfd_oldname, uuid_len, + o_namelen))) { + lustre_cfg_bufs_set(n_bufs, 1, o_buf, + o_buflen); + break; + } + + memcpy(n_uuid, mlfd->mlfd_newname, n_namelen); + uuid_len = strlen(o_uuid); + if (uuid_len > o_namelen) + memcpy(n_uuid + n_namelen, + o_uuid + o_namelen, + uuid_len - o_namelen); + n_uuid[uuid_len + diff] = '\0'; + lustre_cfg_bufs_set(n_bufs, 1, n_buf, o_buflen); + break; + } /* else case fall through */ + } /* else case fall through */ + } + default: { + for (i = 1; i < cnt; i++) { + o_buflen = o_lcfg->lcfg_buflens[i]; + if (o_buflen == 0) + continue; + + o_buf = lustre_cfg_buf(o_lcfg, i); + if (!contain_valid_fsname(o_buf, mlfd->mlfd_oldname, + o_buflen, o_namelen)) { + lustre_cfg_bufs_set(n_bufs, i, o_buf, o_buflen); + continue; + } + + memcpy(n_buf, mlfd->mlfd_newname, n_namelen); + if (o_buflen == o_namelen) { + lustre_cfg_bufs_set(n_bufs, i, n_buf, + n_namelen); + n_buf += cfs_size_round(n_namelen); + continue; + } + + memcpy(n_buf + n_namelen, o_buf + o_namelen, + o_buflen - o_namelen); + lustre_cfg_bufs_set(n_bufs, i, n_buf, o_buflen + diff); + n_buf += cfs_size_round(o_buflen + diff); + } + break; + } + } + + lcr = lustre_cfg_rec_new(cmd, n_bufs); + if (!lcr) + RETURN(-ENOMEM); + + lcr->lcr_cfg = *o_lcfg; + rc = llog_write(env, mlfd->mlfd_llh, &lcr->lcr_hdr, LLOG_NEXT_IDX); + lustre_cfg_rec_free(lcr); + + RETURN(rc); +} + +static int mgs_lcfg_fork_one(const struct lu_env *env, struct mgs_device *mgs, + struct mgs_direntry *mde, const char *oldname, + const char *newname) +{ + struct llog_handle *old_llh = NULL; + struct llog_handle *new_llh = NULL; + struct llog_ctxt *ctxt = NULL; + struct mgs_lcfg_fork_data *mlfd = NULL; + char *name_buf = NULL; + int name_buflen; + int old_namelen = strlen(oldname); + int new_namelen = strlen(newname); + int rc; + ENTRY; + + name_buflen = mde->mde_len + new_namelen - old_namelen; + OBD_ALLOC(name_buf, name_buflen); + if (!name_buf) + RETURN(-ENOMEM); + + memcpy(name_buf, newname, new_namelen); + memcpy(name_buf + new_namelen, mde->mde_name + old_namelen, + mde->mde_len - old_namelen); + + CDEBUG(D_MGS, "Fork the config-log from %s to %s\n", + mde->mde_name, name_buf); + + ctxt = llog_get_context(mgs->mgs_obd, LLOG_CONFIG_ORIG_CTXT); + LASSERT(ctxt); + + rc = llog_open_create(env, ctxt, &new_llh, NULL, name_buf); + if (rc) + GOTO(out, rc); + + rc = llog_init_handle(env, new_llh, LLOG_F_IS_PLAIN, NULL); + if (rc) + GOTO(out, rc); + + if (unlikely(mgs_log_is_empty(env, mgs, mde->mde_name))) + GOTO(out, rc = 0); + + rc = llog_open(env, ctxt, &old_llh, NULL, mde->mde_name, + LLOG_OPEN_EXISTS); + if (rc) + GOTO(out, rc); + + rc = llog_init_handle(env, old_llh, LLOG_F_IS_PLAIN, NULL); + if (rc) + GOTO(out, rc); + + new_llh->lgh_hdr->llh_tgtuuid = old_llh->lgh_hdr->llh_tgtuuid; + + OBD_ALLOC(mlfd, LLOG_MIN_CHUNK_SIZE); + if (!mlfd) + GOTO(out, rc = -ENOMEM); + + mlfd->mlfd_mgs = mgs; + mlfd->mlfd_llh = new_llh; + mlfd->mlfd_oldname = oldname; + mlfd->mlfd_newname = newname; + + rc = llog_process(env, old_llh, mgs_lcfg_fork_handler, mlfd, NULL); + OBD_FREE(mlfd, LLOG_MIN_CHUNK_SIZE); + + GOTO(out, rc); + +out: + if (old_llh) + llog_close(env, old_llh); + if (new_llh) + llog_close(env, new_llh); + if (name_buf) + OBD_FREE(name_buf, name_buflen); + if (ctxt) + llog_ctxt_put(ctxt); + + return rc; +} + +int mgs_lcfg_fork(const struct lu_env *env, struct mgs_device *mgs, + const char *oldname, const char *newname) +{ + struct list_head log_list; + struct mgs_direntry *dirent, *n; + int olen = strlen(oldname); + int nlen = strlen(newname); + int count = 0; int rc = 0; ENTRY; - print_lustre_cfg(lcfg); + if (unlikely(!oldname || oldname[0] == '\0' || + !newname || newname[0] == '\0')) + RETURN(-EINVAL); - /* lustre, lustre-mdtlov, lustre-client, lustre-MDT0000 */ - devname = lustre_cfg_string(lcfg, 0); - param = lustre_cfg_string(lcfg, 1); - if (!devname) { - /* Assume device name embedded in param: - lustre-OST0000.osc.max_dirty_mb=32 */ - ptr = strchr(param, '.'); - if (ptr) { - devname = param; - *ptr = 0; - param = ptr + 1; - } - } - if (!devname) { - LCONSOLE_ERROR_MSG(0x14d, "No target specified: %s\n", param); - RETURN(-ENOSYS); - } + if (strcmp(oldname, newname) == 0) + RETURN(-EINVAL); - rc = mgs_parse_devname(devname, fsname, NULL); - if (rc == 0 && !mgs_parse_devname(devname, NULL, &index)) { - /* param related to llite isn't allowed to set by OST or MDT */ - if (rc == 0 && strncmp(param, PARAM_LLITE, - sizeof(PARAM_LLITE) - 1) == 0) - RETURN(-EINVAL); - } else { - /* assume devname is the fsname */ - strlcpy(fsname, devname, MTI_NAME_MAXLEN); - } - CDEBUG(D_MGS, "setparam fs='%s' device='%s'\n", fsname, devname); + /* lock it to prevent fork/erase/register in parallel. */ + mutex_lock(&mgs->mgs_mutex); + + rc = class_dentry_readdir(env, mgs, &log_list); + if (rc) { + mutex_unlock(&mgs->mgs_mutex); + RETURN(rc); + } + + if (list_empty(&log_list)) { + mutex_unlock(&mgs->mgs_mutex); + RETURN(-ENOENT); + } + + list_for_each_entry_safe(dirent, n, &log_list, mde_list) { + char *ptr; + + ptr = strrchr(dirent->mde_name, '-'); + if (ptr) { + int tlen = ptr - dirent->mde_name; + + if (tlen == nlen && + strncmp(newname, dirent->mde_name, tlen) == 0) + GOTO(out, rc = -EEXIST); + + if (tlen == olen && + strncmp(oldname, dirent->mde_name, tlen) == 0) + continue; + } + + list_del_init(&dirent->mde_list); + mgs_direntry_free(dirent); + } + + if (list_empty(&log_list)) { + mutex_unlock(&mgs->mgs_mutex); + RETURN(-ENOENT); + } + + list_for_each_entry(dirent, &log_list, mde_list) { + rc = mgs_lcfg_fork_one(env, mgs, dirent, oldname, newname); + if (rc) + break; + + count++; + } + +out: + mutex_unlock(&mgs->mgs_mutex); + + list_for_each_entry_safe(dirent, n, &log_list, mde_list) { + list_del_init(&dirent->mde_list); + mgs_direntry_free(dirent); + } + + if (rc && count > 0) + mgs_erase_logs(env, mgs, newname); + + RETURN(rc); +} + +int mgs_lcfg_erase(const struct lu_env *env, struct mgs_device *mgs, + const char *fsname) +{ + int rc; + ENTRY; + + if (unlikely(!fsname || fsname[0] == '\0')) + RETURN(-EINVAL); - rc = mgs_find_or_make_fsdb(env, mgs, - lcfg->lcfg_command == LCFG_SET_PARAM ? - PARAMS_FILENAME : fsname, &fsdb); + rc = mgs_erase_logs(env, mgs, fsname); + + RETURN(rc); +} + +static int mgs_xattr_del(const struct lu_env *env, struct dt_object *obj) +{ + struct dt_device *dev; + struct thandle *th = NULL; + int rc = 0; + + ENTRY; + + dev = container_of0(obj->do_lu.lo_dev, struct dt_device, dd_lu_dev); + th = dt_trans_create(env, dev); + if (IS_ERR(th)) + RETURN(PTR_ERR(th)); + + rc = dt_declare_xattr_del(env, obj, XATTR_TARGET_RENAME, th); + if (rc) + GOTO(stop, rc); + + rc = dt_trans_start_local(env, dev, th); + if (rc) + GOTO(stop, rc); + + dt_write_lock(env, obj, 0); + rc = dt_xattr_del(env, obj, XATTR_TARGET_RENAME, th); + + GOTO(unlock, rc); + +unlock: + dt_write_unlock(env, obj); + +stop: + dt_trans_stop(env, dev, th); + + return rc; +} + +int mgs_lcfg_rename(const struct lu_env *env, struct mgs_device *mgs) +{ + struct list_head log_list; + struct mgs_direntry *dirent, *n; + char fsname[16]; + struct lu_buf buf = { + .lb_buf = fsname, + .lb_len = sizeof(fsname) + }; + int rc = 0; + + ENTRY; + + rc = class_dentry_readdir(env, mgs, &log_list); if (rc) RETURN(rc); - if (lcfg->lcfg_command != LCFG_SET_PARAM && - !test_bit(FSDB_MGS_SELF, &fsdb->fsdb_flags) && - test_bit(FSDB_LOG_EMPTY, &fsdb->fsdb_flags)) { - CERROR("No filesystem targets for %s. cfg_device from lctl " - "is '%s'\n", fsname, devname); - mgs_free_fsdb(mgs, fsdb); - RETURN(-EINVAL); - } + if (list_empty(&log_list)) + RETURN(0); - /* Create a fake mti to hold everything */ - OBD_ALLOC_PTR(mti); - if (!mti) - GOTO(out, rc = -ENOMEM); - if (strlcpy(mti->mti_fsname, fsname, sizeof(mti->mti_fsname)) - >= sizeof(mti->mti_fsname)) - GOTO(out, rc = -E2BIG); - if (strlcpy(mti->mti_svname, devname, sizeof(mti->mti_svname)) - >= sizeof(mti->mti_svname)) - GOTO(out, rc = -E2BIG); - if (strlcpy(mti->mti_params, param, sizeof(mti->mti_params)) - >= sizeof(mti->mti_params)) + list_for_each_entry_safe(dirent, n, &log_list, mde_list) { + struct dt_object *o = NULL; + char oldname[16]; + char *ptr; + int len; + + list_del_init(&dirent->mde_list); + ptr = strrchr(dirent->mde_name, '-'); + if (!ptr) + goto next; + + len = ptr - dirent->mde_name; + if (unlikely(len >= sizeof(oldname))) { + CDEBUG(D_MGS, "Skip invalid configuration file %s\n", + dirent->mde_name); + goto next; + } + + o = local_file_find(env, mgs->mgs_los, mgs->mgs_configs_dir, + dirent->mde_name); + if (IS_ERR(o)) { + rc = PTR_ERR(o); + CDEBUG(D_MGS, "Fail to locate file %s: rc = %d\n", + dirent->mde_name, rc); + goto next; + } + + rc = dt_xattr_get(env, o, &buf, XATTR_TARGET_RENAME); + if (rc < 0) { + if (rc == -ENODATA) + rc = 0; + else + CDEBUG(D_MGS, + "Fail to get EA for %s: rc = %d\n", + dirent->mde_name, rc); + goto next; + } + + if (unlikely(rc == len && + memcmp(fsname, dirent->mde_name, len) == 0)) { + /* The new fsname is the same as the old one. */ + rc = mgs_xattr_del(env, o); + goto next; + } + + memcpy(oldname, dirent->mde_name, len); + oldname[len] = '\0'; + fsname[rc] = '\0'; + rc = mgs_lcfg_fork_one(env, mgs, dirent, oldname, fsname); + if (rc && rc != -EEXIST) { + CDEBUG(D_MGS, "Fail to fork %s: rc = %d\n", + dirent->mde_name, rc); + goto next; + } + + rc = mgs_erase_log(env, mgs, dirent->mde_name); + if (rc) { + CDEBUG(D_MGS, "Fail to erase old %s: rc = %d\n", + dirent->mde_name, rc); + /* keep it there if failed to remove it. */ + rc = 0; + } + +next: + if (o && !IS_ERR(o)) + lu_object_put(env, &o->do_lu); + + mgs_direntry_free(dirent); + if (rc) + break; + } + + list_for_each_entry_safe(dirent, n, &log_list, mde_list) { + list_del_init(&dirent->mde_list); + mgs_direntry_free(dirent); + } + + RETURN(rc); +} + +/* Setup _mgs fsdb and log + */ +int mgs__mgs_fsdb_setup(const struct lu_env *env, struct mgs_device *mgs) +{ + struct fs_db *fsdb = NULL; + int rc; + ENTRY; + + rc = mgs_find_or_make_fsdb(env, mgs, MGSSELF_NAME, &fsdb); + if (!rc) + mgs_put_fsdb(mgs, fsdb); + + RETURN(rc); +} + +/* Setup params fsdb and log + */ +int mgs_params_fsdb_setup(const struct lu_env *env, struct mgs_device *mgs) +{ + struct fs_db *fsdb = NULL; + struct llog_handle *params_llh = NULL; + int rc; + ENTRY; + + rc = mgs_find_or_make_fsdb(env, mgs, PARAMS_FILENAME, &fsdb); + if (!rc) { + mutex_lock(&fsdb->fsdb_mutex); + rc = record_start_log(env, mgs, ¶ms_llh, PARAMS_FILENAME); + if (!rc) + rc = record_end_log(env, ¶ms_llh); + mutex_unlock(&fsdb->fsdb_mutex); + mgs_put_fsdb(mgs, fsdb); + } + + RETURN(rc); +} + +/* Cleanup params fsdb and log + */ +int mgs_params_fsdb_cleanup(const struct lu_env *env, struct mgs_device *mgs) +{ + int rc; + + rc = mgs_erase_logs(env, mgs, PARAMS_FILENAME); + return rc == -ENOENT ? 0 : rc; +} + +/** + * Fill in the mgs_target_info based on data devname and param provide. + * + * @env thread context + * @mgs mgs device + * @mti mgs target info. We want to set this based other paramters + * passed to this function. Once setup we write it to the config + * logs. + * @devname optional OBD device name + * @param string that contains both what tunable to set and the value to + * set it to. + * + * RETURN 0 for success + * negative error number on failure + **/ +static int mgs_set_conf_param(const struct lu_env *env, struct mgs_device *mgs, + struct mgs_target_info *mti, const char *devname, + const char *param) +{ + struct fs_db *fsdb = NULL; + int dev_type; + int rc = 0; + + ENTRY; + /* lustre, lustre-mdtlov, lustre-client, lustre-MDT0000 */ + if (!devname) { + size_t len; + + /* We have two possible cases here: + * + * 1) the device name embedded in the param: + * lustre-OST0000.osc.max_dirty_mb=32 + * + * 2) the file system name is embedded in + * the param: lustre.sys.at.min=0 + */ + len = strcspn(param, ".="); + if (!len || param[len] == '=') + RETURN(-EINVAL); + + if (len >= sizeof(mti->mti_svname)) + RETURN(-E2BIG); + + snprintf(mti->mti_svname, sizeof(mti->mti_svname), + "%.*s", (int)len, param); + param += len + 1; + } else { + if (strlcpy(mti->mti_svname, devname, sizeof(mti->mti_svname)) >= + sizeof(mti->mti_svname)) + RETURN(-E2BIG); + } + + if (!strlen(mti->mti_svname)) { + LCONSOLE_ERROR_MSG(0x14d, "No target specified: %s\n", param); + RETURN(-ENOSYS); + } + + dev_type = mgs_parse_devname(mti->mti_svname, mti->mti_fsname, + &mti->mti_stripe_index); + switch (dev_type) { + /* For this case we have an invalid obd device name */ + case -ENXIO: + CDEBUG(D_MGS, "%s don't contain an index\n", mti->mti_svname); + strlcpy(mti->mti_fsname, mti->mti_svname, MTI_NAME_MAXLEN); + dev_type = 0; + break; + /* Not an obd device, assume devname is the fsname. + * User might of only provided fsname and not obd device + */ + case -EINVAL: + CDEBUG(D_MGS, "%s is seen as a file system name\n", mti->mti_svname); + strlcpy(mti->mti_fsname, mti->mti_svname, MTI_NAME_MAXLEN); + dev_type = 0; + break; + default: + if (dev_type < 0) + GOTO(out, rc = dev_type); + + /* param related to llite isn't allowed to set by OST or MDT */ + if (dev_type & LDD_F_SV_TYPE_OST || + dev_type & LDD_F_SV_TYPE_MDT) { + /* param related to llite isn't allowed to set by OST + * or MDT + */ + if (!strncmp(param, PARAM_LLITE, + sizeof(PARAM_LLITE) - 1)) + GOTO(out, rc = -EINVAL); + + /* Strip -osc or -mdc suffix from svname */ + if (server_make_name(dev_type, mti->mti_stripe_index, + mti->mti_fsname, mti->mti_svname, + sizeof(mti->mti_svname))) + GOTO(out, rc = -EINVAL); + } + break; + } + + if (strlcpy(mti->mti_params, param, sizeof(mti->mti_params)) >= + sizeof(mti->mti_params)) GOTO(out, rc = -E2BIG); - rc = server_name2index(mti->mti_svname, &mti->mti_stripe_index, &tmp); - if (rc < 0) - /* Not a valid server; may be only fsname */ - rc = 0; - else - /* Strip -osc or -mdc suffix from svname */ - if (server_make_name(rc, mti->mti_stripe_index, mti->mti_fsname, - mti->mti_svname)) - GOTO(out, rc = -EINVAL); + + CDEBUG(D_MGS, "set_conf_param fs='%s' device='%s' param='%s'\n", + mti->mti_fsname, mti->mti_svname, mti->mti_params); + + rc = mgs_find_or_make_fsdb(env, mgs, mti->mti_fsname, &fsdb); + if (rc) + GOTO(out, rc); + + if (!test_bit(FSDB_MGS_SELF, &fsdb->fsdb_flags) && + test_bit(FSDB_LOG_EMPTY, &fsdb->fsdb_flags)) { + CERROR("No filesystem targets for %s. cfg_device from lctl " + "is '%s'\n", mti->mti_fsname, mti->mti_svname); + mgs_unlink_fsdb(mgs, fsdb); + GOTO(out, rc = -EINVAL); + } + /* * 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). */ - if (lcfg->lcfg_command == LCFG_SET_PARAM) { - mti->mti_flags = rc | LDD_F_PARAM2; - mutex_lock(&fsdb->fsdb_mutex); - rc = mgs_write_log_param2(env, mgs, fsdb, mti, mti->mti_params); - mutex_unlock(&fsdb->fsdb_mutex); - mgs_revoke_lock(mgs, fsdb, CONFIG_T_PARAMS); + mti->mti_flags = dev_type | LDD_F_PARAM; + mutex_lock(&fsdb->fsdb_mutex); + rc = mgs_write_log_param(env, mgs, fsdb, mti, mti->mti_params); + mutex_unlock(&fsdb->fsdb_mutex); + mgs_revoke_lock(mgs, fsdb, CONFIG_T_CONFIG); + +out: + if (fsdb) + mgs_put_fsdb(mgs, fsdb); + + RETURN(rc); +} + +static int mgs_set_param2(const struct lu_env *env, struct mgs_device *mgs, + struct mgs_target_info *mti, const char *param) +{ + struct fs_db *fsdb = NULL; + int dev_type; + size_t len; + int rc; + + if (strlcpy(mti->mti_params, param, sizeof(mti->mti_params)) >= + sizeof(mti->mti_params)) + GOTO(out, rc = -E2BIG); + + len = strcspn(param, ".="); + if (len && param[len] != '=') { + struct list_head *tmp; + char *ptr; + + param += len + 1; + ptr = strchr(param, '.'); + + len = strlen(param); + if (ptr) + len -= strlen(ptr); + if (len >= sizeof(mti->mti_svname)) + GOTO(out, rc = -E2BIG); + + snprintf(mti->mti_svname, sizeof(mti->mti_svname), "%.*s", + (int)len, param); + + mutex_lock(&mgs->mgs_mutex); + if (unlikely(list_empty(&mgs->mgs_fs_db_list))) { + mutex_unlock(&mgs->mgs_mutex); + GOTO(out, rc = -ENODEV); + } + + list_for_each(tmp, &mgs->mgs_fs_db_list) { + fsdb = list_entry(tmp, struct fs_db, fsdb_list); + if (fsdb->fsdb_has_lproc_entry && + strcmp(fsdb->fsdb_name, "params") != 0 && + strstr(param, fsdb->fsdb_name)) { + snprintf(mti->mti_svname, + sizeof(mti->mti_svname), "%s", + fsdb->fsdb_name); + break; + } + fsdb = NULL; + } + + if (!fsdb) { + snprintf(mti->mti_svname, sizeof(mti->mti_svname), + "general"); + } + mutex_unlock(&mgs->mgs_mutex); } else { - mti->mti_flags = rc | LDD_F_PARAM; - mutex_lock(&fsdb->fsdb_mutex); - rc = mgs_write_log_param(env, mgs, fsdb, mti, mti->mti_params); - mutex_unlock(&fsdb->fsdb_mutex); - mgs_revoke_lock(mgs, fsdb, CONFIG_T_CONFIG); + snprintf(mti->mti_svname, sizeof(mti->mti_svname), "general"); } + CDEBUG(D_MGS, "set_param2 fs='%s' device='%s' param='%s'\n", + mti->mti_fsname, mti->mti_svname, mti->mti_params); + + /* The return value should be the device type i.e LDD_F_SV_TYPE_XXX. + * A returned error tells us we don't have a target obd device. + */ + dev_type = server_name2index(mti->mti_svname, &mti->mti_stripe_index, + NULL); + if (dev_type < 0) + dev_type = 0; + + /* the return value should be the device type i.e LDD_F_SV_TYPE_XXX. + * Strip -osc or -mdc suffix from svname + */ + if ((dev_type & LDD_F_SV_TYPE_OST || dev_type & LDD_F_SV_TYPE_MDT) && + server_make_name(dev_type, mti->mti_stripe_index, + mti->mti_fsname, mti->mti_svname, + sizeof(mti->mti_svname))) + GOTO(out, rc = -EINVAL); + + rc = mgs_find_or_make_fsdb(env, mgs, PARAMS_FILENAME, &fsdb); + if (rc) + GOTO(out, 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). + */ + mti->mti_flags = dev_type | LDD_F_PARAM2; + mutex_lock(&fsdb->fsdb_mutex); + rc = mgs_write_log_param2(env, mgs, fsdb, mti, mti->mti_params); + mutex_unlock(&fsdb->fsdb_mutex); + mgs_revoke_lock(mgs, fsdb, CONFIG_T_PARAMS); + mgs_put_fsdb(mgs, fsdb); out: - OBD_FREE_PTR(mti); - RETURN(rc); + RETURN(rc); +} + +/* Set a permanent (config log) param for a target or fs + * + * @lcfg buf0 may contain the device (testfs-MDT0000) name + * buf1 contains the single parameter + */ +int mgs_set_param(const struct lu_env *env, struct mgs_device *mgs, + struct lustre_cfg *lcfg) +{ + const char *param = lustre_cfg_string(lcfg, 1); + struct mgs_target_info *mti; + int rc; + + /* Create a fake mti to hold everything */ + OBD_ALLOC_PTR(mti); + if (!mti) + return -ENOMEM; + + print_lustre_cfg(lcfg); + + if (lcfg->lcfg_command == LCFG_PARAM) { + /* For the case of lctl conf_param devname can be + * lustre, lustre-mdtlov, lustre-client, lustre-MDT0000 + */ + const char *devname = lustre_cfg_string(lcfg, 0); + + rc = mgs_set_conf_param(env, mgs, mti, devname, param); + } else { + /* In the case of lctl set_param -P lcfg[0] will always + * be 'general'. At least for now. + */ + rc = mgs_set_param2(env, mgs, mti, param); + } + + OBD_FREE_PTR(mti); + + return rc; } static int mgs_write_log_pool(const struct lu_env *env, @@ -4103,13 +5395,13 @@ int mgs_nodemap_cmd(const struct lu_env *env, struct mgs_device *mgs, enum lcfg_command_type cmd, const char *nodemap_name, char *param) { - lnet_nid_t nid[2]; - __u32 idmap[2]; - bool bool_switch; - __u32 int_id; - int rc = 0; - ENTRY; + lnet_nid_t nid[2]; + u32 idmap[2]; + bool bool_switch; + u32 int_id; + int rc = 0; + ENTRY; switch (cmd) { case LCFG_NODEMAP_ADD: rc = nodemap_add(nodemap_name); @@ -4130,23 +5422,51 @@ int mgs_nodemap_cmd(const struct lu_env *env, struct mgs_device *mgs, rc = nodemap_del_range(nodemap_name, nid); break; case LCFG_NODEMAP_ADMIN: - bool_switch = simple_strtoul(param, NULL, 10); + rc = kstrtobool(param, &bool_switch); + if (rc) + break; rc = nodemap_set_allow_root(nodemap_name, bool_switch); break; case LCFG_NODEMAP_DENY_UNKNOWN: - bool_switch = simple_strtoul(param, NULL, 10); + rc = kstrtobool(param, &bool_switch); + if (rc) + break; rc = nodemap_set_deny_unknown(nodemap_name, bool_switch); break; + case LCFG_NODEMAP_AUDIT_MODE: + rc = kstrtoul(param, 10, (unsigned long *)&bool_switch); + if (rc == 0) + rc = nodemap_set_audit_mode(nodemap_name, bool_switch); + break; + case LCFG_NODEMAP_MAP_MODE: + if (strcmp("both", param) == 0) + rc = nodemap_set_mapping_mode(nodemap_name, + NODEMAP_MAP_BOTH); + else if (strcmp("uid_only", param) == 0) + rc = nodemap_set_mapping_mode(nodemap_name, + NODEMAP_MAP_UID_ONLY); + else if (strcmp("gid_only", param) == 0) + rc = nodemap_set_mapping_mode(nodemap_name, + NODEMAP_MAP_GID_ONLY); + else + rc = -EINVAL; + break; case LCFG_NODEMAP_TRUSTED: - bool_switch = simple_strtoul(param, NULL, 10); + rc = kstrtobool(param, &bool_switch); + if (rc) + break; rc = nodemap_set_trust_client_ids(nodemap_name, bool_switch); break; case LCFG_NODEMAP_SQUASH_UID: - int_id = simple_strtoul(param, NULL, 10); + rc = kstrtouint(param, 10, &int_id); + if (rc) + break; rc = nodemap_set_squash_uid(nodemap_name, int_id); break; case LCFG_NODEMAP_SQUASH_GID: - int_id = simple_strtoul(param, NULL, 10); + rc = kstrtouint(param, 10, &int_id); + if (rc) + break; rc = nodemap_set_squash_gid(nodemap_name, int_id); break; case LCFG_NODEMAP_ADD_UIDMAP: @@ -4176,6 +5496,9 @@ int mgs_nodemap_cmd(const struct lu_env *env, struct mgs_device *mgs, case LCFG_NODEMAP_SET_FILESET: rc = nodemap_set_fileset(nodemap_name, param); break; + case LCFG_NODEMAP_SET_SEPOL: + rc = nodemap_set_sepol(nodemap_name, param); + break; default: rc = -EINVAL; } @@ -4193,18 +5516,21 @@ int mgs_pool_cmd(const struct lu_env *env, struct mgs_device *mgs, char *label = NULL, *canceled_label = NULL; int label_sz; struct mgs_target_info *mti = NULL; - int rc, i; - ENTRY; + bool checked = false; + bool locked = false; + bool free = false; + int rc, i; + ENTRY; rc = mgs_find_or_make_fsdb(env, mgs, fsname, &fsdb); - if (rc) { - CERROR("Can't get db for %s\n", fsname); - RETURN(rc); - } + if (rc) { + CERROR("Can't get db for %s\n", fsname); + RETURN(rc); + } if (test_bit(FSDB_LOG_EMPTY, &fsdb->fsdb_flags)) { - CERROR("%s is not defined\n", fsname); - mgs_free_fsdb(mgs, fsdb); - RETURN(-EINVAL); + CERROR("%s is not defined\n", fsname); + free = true; + GOTO(out_fsdb, rc = -EINVAL); } label_sz = 10 + strlen(fsname) + strlen(poolname); @@ -4221,8 +5547,8 @@ int mgs_pool_cmd(const struct lu_env *env, struct mgs_device *mgs, } OBD_ALLOC(label, label_sz); - if (label == NULL) - RETURN(-ENOMEM); + if (!label) + GOTO(out_fsdb, rc = -ENOMEM); switch(cmd) { case LCFG_POOL_NEW: @@ -4255,53 +5581,67 @@ int mgs_pool_cmd(const struct lu_env *env, struct mgs_device *mgs, break; } - if (canceled_label != NULL) { - OBD_ALLOC_PTR(mti); - if (mti == NULL) - GOTO(out_cancel, rc = -ENOMEM); - } + OBD_ALLOC_PTR(mti); + if (mti == NULL) + GOTO(out_cancel, rc = -ENOMEM); + strncpy(mti->mti_svname, "lov pool", sizeof(mti->mti_svname)); mutex_lock(&fsdb->fsdb_mutex); - /* write pool def to all MDT logs */ - for (i = 0; i < INDEX_MAP_SIZE * 8; i++) { + locked = true; + /* write pool def to all MDT logs */ + for (i = 0; i < INDEX_MAP_SIZE * 8; i++) { if (test_bit(i, fsdb->fsdb_mdt_index_map)) { rc = name_create_mdt_and_lov(&logname, &lovname, fsdb, i); - if (rc) { - mutex_unlock(&fsdb->fsdb_mutex); + if (rc) GOTO(out_mti, rc); + + if (!checked && (canceled_label == NULL)) { + rc = mgs_check_marker(env, mgs, fsdb, mti, + logname, lovname, label); + if (rc) { + name_destroy(&logname); + name_destroy(&lovname); + GOTO(out_mti, + rc = (rc == LLOG_PROC_BREAK ? + -EEXIST : rc)); + } + checked = true; } - if (canceled_label != NULL) { - strcpy(mti->mti_svname, "lov pool"); + if (canceled_label != NULL) rc = mgs_modify(env, mgs, fsdb, mti, logname, lovname, canceled_label, CM_SKIP); - } if (rc >= 0) rc = mgs_write_log_pool(env, mgs, logname, fsdb, lovname, cmd, fsname, poolname, ostname, label); - name_destroy(&logname); - name_destroy(&lovname); - if (rc) { - mutex_unlock(&fsdb->fsdb_mutex); + name_destroy(&logname); + name_destroy(&lovname); + if (rc) GOTO(out_mti, rc); - } - } - } + } + } rc = name_create(&logname, fsname, "-client"); - if (rc) { - mutex_unlock(&fsdb->fsdb_mutex); + if (rc) GOTO(out_mti, rc); + + if (!checked && (canceled_label == NULL)) { + rc = mgs_check_marker(env, mgs, fsdb, mti, logname, + fsdb->fsdb_clilov, label); + if (rc) { + name_destroy(&logname); + GOTO(out_mti, rc = (rc == LLOG_PROC_BREAK ? + -EEXIST : rc)); + } } if (canceled_label != NULL) { rc = mgs_modify(env, mgs, fsdb, mti, logname, fsdb->fsdb_clilov, canceled_label, CM_SKIP); if (rc < 0) { - mutex_unlock(&fsdb->fsdb_mutex); name_destroy(&logname); GOTO(out_mti, rc); } @@ -4310,18 +5650,27 @@ int mgs_pool_cmd(const struct lu_env *env, struct mgs_device *mgs, rc = mgs_write_log_pool(env, mgs, logname, fsdb, fsdb->fsdb_clilov, cmd, fsname, poolname, ostname, label); mutex_unlock(&fsdb->fsdb_mutex); + locked = false; name_destroy(&logname); - /* request for update */ + /* request for update */ mgs_revoke_lock(mgs, fsdb, CONFIG_T_CONFIG); - EXIT; + GOTO(out_mti, rc); + out_mti: - if (mti != NULL) - OBD_FREE_PTR(mti); + if (locked) + mutex_unlock(&fsdb->fsdb_mutex); + if (mti != NULL) + OBD_FREE_PTR(mti); out_cancel: if (canceled_label != NULL) OBD_FREE(canceled_label, label_sz); out_label: OBD_FREE(label, label_sz); - return rc; +out_fsdb: + if (free) + mgs_unlink_fsdb(mgs, fsdb); + mgs_put_fsdb(mgs, fsdb); + + return rc; }