X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre%2Fmgs%2Fmgs_llog.c;h=e307e16e534f81cfe02bf96a914eb051845351da;hp=b835aa51feab0408352e541836b7aa99a63a2486;hb=0bb49b2624827490ca3ea6a146d96cf7cf2b402f;hpb=5b6d23d7fb8de7ae44ca369381a128c78f78bf21 diff --git a/lustre/mgs/mgs_llog.c b/lustre/mgs/mgs_llog.c index b835aa5..e307e16 100644 --- a/lustre/mgs/mgs_llog.c +++ b/lustre/mgs/mgs_llog.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, 2014, Intel Corporation. + * Copyright (c) 2011, 2015, Intel Corporation. */ /* * This file is part of Lustre, http://www.lustre.org/ @@ -100,6 +100,15 @@ int class_dentry_readdir(const struct lu_env *env, goto next; } + /* filter out ".bak" files */ + /* sizeof(".bak") - 1 == 3 */ + if (key_sz >= 3 && + !memcmp(".bak", key + key_sz - 3, 3)) { + CDEBUG(D_MGS, "Skipping backup file %.*s\n", + key_sz, key); + goto next; + } + de = mgs_direntry_alloc(key_sz + 1); if (de == NULL) { rc = -ENOMEM; @@ -114,7 +123,8 @@ int class_dentry_readdir(const struct lu_env *env, next: rc = iops->next(env, it); } while (rc == 0); - rc = 0; + if (rc > 0) + rc = 0; iops->put(env, it); @@ -348,6 +358,7 @@ static struct fs_db *mgs_new_fsdb(const struct lu_env *env, 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); @@ -2154,8 +2165,7 @@ static int mgs_write_log_osp_to_mdt(const struct lu_env *env, GOTO(out_end, rc); /* Add mdc(osp) to lod */ - snprintf(index_str, sizeof(mti->mti_stripe_index), "%d", - mti->mti_stripe_index); + snprintf(index_str, sizeof(index_str), "%d", mti->mti_stripe_index); rc = record_base(env, llh, lovname, 0, LCFG_ADD_MDC, mti->mti_uuid, index_str, "1", NULL); if (rc) @@ -2293,34 +2303,34 @@ static int mgs_write_log_mdt(const struct lu_env *env, #14 L mount_option 0: 1:client 2:lov1 3:MDC_uml1_mdsA_MNT_client */ - /* copy client info about lov/lmv */ - mgi->mgi_comp.comp_mti = mti; - mgi->mgi_comp.comp_fsdb = fsdb; + /* copy client info about lov/lmv */ + mgi->mgi_comp.comp_mti = mti; + mgi->mgi_comp.comp_fsdb = fsdb; - rc = mgs_steal_llog_for_mdt_from_client(env, mgs, cliname, - &mgi->mgi_comp); - if (rc) - GOTO(out_free, rc); - rc = mgs_write_log_mdc_to_lmv(env, mgs, fsdb, mti, cliname, - fsdb->fsdb_clilmv); - if (rc) - GOTO(out_free, rc); + rc = mgs_steal_llog_for_mdt_from_client(env, mgs, cliname, + &mgi->mgi_comp); + if (rc) + GOTO(out_free, rc); + rc = mgs_write_log_mdc_to_lmv(env, mgs, fsdb, mti, cliname, + fsdb->fsdb_clilmv); + if (rc) + GOTO(out_free, rc); - /* add mountopts */ - rc = record_start_log(env, mgs, &llh, cliname); - if (rc) - GOTO(out_free, rc); + /* add mountopts */ + rc = record_start_log(env, mgs, &llh, cliname); + if (rc) + GOTO(out_free, rc); - 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_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"); if (rc) GOTO(out_end, rc); @@ -2335,8 +2345,34 @@ static int mgs_write_log_mdt(const struct lu_env *env, if (rc) GOTO(out_end, rc); - rc = mgs_write_log_osp_to_mdt(env, mgs, fsdb, mti, - i, logname); + /* NB: If the log for the MDT is empty, it means + * the MDT is only added to the index + * map, and not being process yet, i.e. this + * is an unregistered MDT, see mgs_write_log_target(). + * so we should skip it. Otherwise + * + * 1. MGS get register request for MDT1 and MDT2. + * + * 2. Then both MDT1 and MDT2 are added into + * fsdb_mdt_index_map. (see mgs_set_index()). + * + * 3. Then MDT1 get the lock of fsdb_mutex, then + * generate the config log, here, it will regard MDT2 + * as an existent MDT, and generate "add osp" for + * lustre-MDT0001-osp-MDT0002. Note: at the moment + * MDT0002 config log is still empty, so it will + * add "add osp" even before "lov setup", which + * will definitly cause trouble. + * + * 4. MDT1 registeration finished, fsdb_mutex is + * released, then MDT2 get in, then in above + * mgs_steal_llog_for_mdt_from_client(), it will + * add another osp log for lustre-MDT0001-osp-MDT0002, + * which will cause another trouble.*/ + if (!mgs_log_is_empty(env, mgs, logname)) + rc = mgs_write_log_osp_to_mdt(env, mgs, fsdb, + mti, i, logname); + name_destroy(&logname); if (rc) GOTO(out_end, rc); @@ -2579,7 +2615,7 @@ out_end: GOTO(out_free, rc); } rc = mgs_write_log_osc_to_lov(env, mgs, fsdb, mti, logname, "", - fsdb->fsdb_clilov, LUSTRE_SP_CLI, 0); + fsdb->fsdb_clilov, LUSTRE_SP_CLI, flags); out_free: name_destroy(&logname); RETURN(rc); @@ -3072,6 +3108,9 @@ static int mgs_srpc_set_param_mem(struct fs_db *fsdb, } rset = &tgtconf->mtsc_rset; + } else if (strcmp(svname, MGSSELF_NAME) == 0) { + /* put _mgs related srpc rule directly in mgs ruleset */ + rset = &fsdb->fsdb_mgs->mgs_lut.lut_sptlrpc_rset; } else { rset = &fsdb->fsdb_srpc_gen; } @@ -3315,61 +3354,77 @@ static int mgs_write_log_param(const struct lu_env *env, GOTO(end, rc); } - if (class_match_param(ptr, PARAM_OSC""PARAM_ACTIVE, &tmp) == 0) { - /* active=0 means off, anything else means on */ - int flag = (*tmp == '0') ? CM_EXCLUDE : 0; - int i; + if (class_match_param(ptr, PARAM_OSC PARAM_ACTIVE, &tmp) == 0 || + class_match_param(ptr, PARAM_MDC PARAM_ACTIVE, &tmp) == 0) { + /* active=0 means off, anything else means on */ + int flag = (*tmp == '0') ? CM_EXCLUDE : 0; + bool deactive_osc = memcmp(ptr, PARAM_OSC PARAM_ACTIVE, + strlen(PARAM_OSC PARAM_ACTIVE)) == 0; + int i; - if (!(mti->mti_flags & LDD_F_SV_TYPE_OST)) { - LCONSOLE_ERROR_MSG(0x144, "%s: Only OSCs can " - "be (de)activated.\n", - mti->mti_svname); - GOTO(end, rc = -EINVAL); - } - LCONSOLE_WARN("Permanently %sactivating %s\n", - flag ? "de": "re", mti->mti_svname); - /* Modify clilov */ + if (!deactive_osc) { + __u32 index; + + rc = server_name2index(mti->mti_svname, &index, NULL); + if (rc < 0) + GOTO(end, rc); + + if (index == 0) { + LCONSOLE_ERROR_MSG(0x144, "%s: MDC0 can not be" + " (de)activated.\n", + mti->mti_svname); + GOTO(end, rc = -EINVAL); + } + } + + LCONSOLE_WARN("Permanently %sactivating %s\n", + flag ? "de" : "re", mti->mti_svname); + /* Modify clilov */ rc = name_create(&logname, mti->mti_fsname, "-client"); - if (rc) + if (rc < 0) GOTO(end, rc); rc = mgs_modify(env, mgs, fsdb, mti, logname, - mti->mti_svname, "add osc", flag); - name_destroy(&logname); - if (rc) - goto active_err; - /* Modify mdtlov */ - /* Add to all MDT logs for CMD */ - for (i = 0; i < INDEX_MAP_SIZE * 8; i++) { + mti->mti_svname, + deactive_osc ? "add osc" : "add mdc", flag); + name_destroy(&logname); + if (rc < 0) + goto active_err; + + /* Modify mdtlov */ + /* Add to all MDT logs for DNE */ + for (i = 0; i < INDEX_MAP_SIZE * 8; i++) { if (!test_bit(i, fsdb->fsdb_mdt_index_map)) - continue; + continue; rc = name_create_mdt(&logname, mti->mti_fsname, i); - if (rc) + if (rc < 0) GOTO(end, rc); rc = mgs_modify(env, mgs, fsdb, mti, logname, - mti->mti_svname, "add osc", flag); - name_destroy(&logname); - if (rc) - goto active_err; - } - active_err: - if (rc) { - LCONSOLE_ERROR_MSG(0x145, "Couldn't find %s in" - "log (%d). No permanent " - "changes were made to the " - "config log.\n", - mti->mti_svname, rc); + mti->mti_svname, + deactive_osc ? "add osc" : "add osp", + flag); + name_destroy(&logname); + if (rc < 0) + goto active_err; + } +active_err: + if (rc < 0) { + LCONSOLE_ERROR_MSG(0x145, "Couldn't find %s in" + "log (%d). No permanent " + "changes were made to the " + "config log.\n", + mti->mti_svname, rc); if (test_bit(FSDB_OLDLOG14, &fsdb->fsdb_flags)) - LCONSOLE_ERROR_MSG(0x146, "This may be" - " because the log" - "is in the old 1.4" - "style. Consider " - " --writeconf to " - "update the logs.\n"); - GOTO(end, rc); - } - /* Fall through to osc proc for deactivating live OSC - on running MDT / clients. */ - } + LCONSOLE_ERROR_MSG(0x146, "This may be" + " because the log" + "is in the old 1.4" + "style. Consider " + " --writeconf to " + "update the logs.\n"); + GOTO(end, rc); + } + /* Fall through to osc/mdc proc for deactivating live + OSC/OSP on running MDT / clients. */ + } /* Below here, let obd's XXX_process_config methods handle it */ /* All lov. in proc */ @@ -3489,6 +3544,78 @@ static int mgs_write_log_param(const struct lu_env *env, } } } + + /* For mdc activate/deactivate, it affects OSP on MDT as well */ + if (class_match_param(ptr, PARAM_MDC PARAM_ACTIVE, &tmp) == 0 && + rc == 0) { + char suffix[16]; + char *lodname = NULL; + char *param_str = NULL; + int i; + int index; + + /* replace mdc with osp */ + memcpy(ptr, PARAM_OSP, strlen(PARAM_OSP)); + rc = server_name2index(mti->mti_svname, &index, NULL); + if (rc < 0) { + memcpy(ptr, PARAM_MDC, strlen(PARAM_MDC)); + GOTO(end, rc); + } + + for (i = 0; i < INDEX_MAP_SIZE * 8; i++) { + if (!test_bit(i, fsdb->fsdb_mdt_index_map)) + continue; + + if (i == index) + continue; + + name_destroy(&logname); + rc = name_create_mdt(&logname, mti->mti_fsname, + i); + if (rc < 0) + break; + + if (mgs_log_is_empty(env, mgs, logname)) + continue; + + snprintf(suffix, sizeof(suffix), "-osp-MDT%04x", + i); + name_destroy(&cname); + rc = name_create(&cname, mti->mti_svname, + suffix); + if (rc < 0) + break; + + rc = mgs_wlp_lcfg(env, mgs, fsdb, mti, logname, + &mgi->mgi_bufs, cname, ptr); + if (rc < 0) + break; + + /* Add configuration log for noitfying LOD + * to active/deactive the OSP. */ + name_destroy(¶m_str); + rc = name_create(¶m_str, cname, + (*tmp == '0') ? ".active=0" : + ".active=1"); + if (rc < 0) + break; + + name_destroy(&lodname); + rc = name_create(&lodname, logname, "-mdtlov"); + if (rc < 0) + break; + + rc = mgs_wlp_lcfg(env, mgs, fsdb, mti, logname, + &mgi->mgi_bufs, lodname, + param_str); + if (rc < 0) + break; + } + memcpy(ptr, PARAM_MDC, strlen(PARAM_MDC)); + name_destroy(&lodname); + name_destroy(¶m_str); + } + name_destroy(&logname); name_destroy(&cname); GOTO(end, rc); @@ -3595,40 +3722,6 @@ end: RETURN(rc ?: rc2); } -/* Not implementing automatic failover nid addition at this time. */ -int mgs_check_failnid(const struct lu_env *env, struct mgs_device *mgs, - struct mgs_target_info *mti) -{ -#if 0 - struct fs_db *fsdb; - int rc; - ENTRY; - - rc = mgs_find_or_make_fsdb(obd, fsname, &fsdb); - if (rc) - RETURN(rc); - - if (mgs_log_is_empty(obd, mti->mti_svname)) - /* should never happen */ - RETURN(-ENOENT); - - CDEBUG(D_MGS, "Checking for new failnids for %s\n", mti->mti_svname); - - /* FIXME We can just check mti->params to see if we're already in - the failover list. Modify mti->params for rewriting back at - server_register_target(). */ - - mutex_lock(&fsdb->fsdb_mutex); - rc = mgs_write_log_add_failnid(obd, fsdb, mti); - mutex_unlock(&fsdb->fsdb_mutex); - char *buf, *params; - int rc = -EINVAL; - - RETURN(rc); -#endif - return 0; -} - int mgs_write_log_target(const struct lu_env *env, struct mgs_device *mgs, struct mgs_target_info *mti, struct fs_db *fsdb) { @@ -3654,6 +3747,9 @@ int mgs_write_log_target(const struct lu_env *env, struct mgs_device *mgs, rc = 0; } + OBD_FAIL_TIMEOUT(OBD_FAIL_MGS_WRITE_TARGET_DELAY, cfs_fail_val > 0 ? + cfs_fail_val : 10); + mutex_lock(&fsdb->fsdb_mutex); if (mti->mti_flags & @@ -3831,6 +3927,19 @@ static void print_lustre_cfg(struct lustre_cfg *lcfg) EXIT; } +/* Setup _mgs fsdb and log + */ +int mgs__mgs_fsdb_setup(const struct lu_env *env, struct mgs_device *mgs, + struct fs_db *fsdb) +{ + int rc; + ENTRY; + + rc = mgs_find_or_make_fsdb(env, mgs, MGSSELF_NAME, &fsdb); + + RETURN(rc); +} + /* Setup params fsdb and log */ int mgs_params_fsdb_setup(const struct lu_env *env, struct mgs_device *mgs, @@ -4029,6 +4138,10 @@ int mgs_nodemap_cmd(const struct lu_env *env, struct mgs_device *mgs, bool_switch = simple_strtoul(param, NULL, 10); rc = nodemap_set_allow_root(nodemap_name, bool_switch); break; + case LCFG_NODEMAP_DENY_UNKNOWN: + bool_switch = simple_strtoul(param, NULL, 10); + rc = nodemap_set_deny_unknown(nodemap_name, bool_switch); + break; case LCFG_NODEMAP_TRUSTED: bool_switch = simple_strtoul(param, NULL, 10); rc = nodemap_set_trust_client_ids(nodemap_name, bool_switch); @@ -4065,6 +4178,9 @@ int mgs_nodemap_cmd(const struct lu_env *env, struct mgs_device *mgs, rc = nodemap_del_idmap(nodemap_name, NODEMAP_GID, idmap); break; + case LCFG_NODEMAP_SET_FILESET: + rc = nodemap_set_fileset(nodemap_name, param); + break; default: rc = -EINVAL; }