X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Fobdclass%2Fobd_mount.c;h=85314640462e9c06dd1dd9d847d90d0d9fb16fa2;hb=68989b14793aa384a6db4fcb9504bc01b17c0311;hp=b8c7e7deae0bf8086925cdd7b06a66b8abdfcf9a;hpb=4f4ff2c5725e60a99aa8d1df83c1574f1ade99e3;p=fs%2Flustre-release.git diff --git a/lustre/obdclass/obd_mount.c b/lustre/obdclass/obd_mount.c index b8c7e7d..8531464 100644 --- a/lustre/obdclass/obd_mount.c +++ b/lustre/obdclass/obd_mount.c @@ -26,7 +26,7 @@ * GPL HEADER END */ /* - * Copyright 2008 Sun Microsystems, Inc. All rights reserved + * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved. * Use is subject to license terms. */ /* @@ -377,11 +377,18 @@ out: /**************** config llog ********************/ -/* Get a config log from the MGS and process it. - This func is called for both clients and servers. - Continue to process new statements appended to the logs - (whenever the config lock is revoked) until lustre_end_log - is called. */ +/** Get a config log from the MGS and process it. + * This func is called for both clients and servers. + * Continue to process new statements appended to the logs + * (whenever the config lock is revoked) until lustre_end_log + * is called. + * @param sb The superblock is used by the MGC to write to the local copy of + * the config log + * @param logname The name of the llog to replicate from the MGS + * @param cfg Since the same mgc may be used to follow multiple config logs + * (e.g. ost1, ost2, client), the config_llog_instance keeps the state for + * this log, and is added to the mgc's list of logs to follow. + */ int lustre_process_log(struct super_block *sb, char *logname, struct config_llog_instance *cfg) { @@ -451,6 +458,9 @@ int lustre_end_log(struct super_block *sb, char *logname, /**************** obd start *******************/ +/** lustre_cfg_bufs are a holdover from 1.4; we can still set these up from + * lctl (and do for echo cli/srv. + */ int do_lcfg(char *cfgname, lnet_nid_t nid, int cmd, char *s1, char *s2, char *s3, char *s4) { @@ -478,6 +488,9 @@ int do_lcfg(char *cfgname, lnet_nid_t nid, int cmd, return(rc); } +/** Call class_attach and class_setup. These methods in turn call + * obd type-specific methods. + */ static int lustre_start_simple(char *obdname, char *type, char *uuid, char *s1, char *s2) { @@ -766,7 +779,7 @@ static int lustre_start_mgc(struct super_block *sb) if (data == NULL) GOTO(out, rc = -ENOMEM); data->ocd_connect_flags = OBD_CONNECT_VERSION | OBD_CONNECT_FID | - OBD_CONNECT_AT; + OBD_CONNECT_AT | OBD_CONNECT_FULL20; data->ocd_version = LUSTRE_VERSION_CODE; rc = obd_connect(NULL, &exp, obd, &(obd->obd_uuid), data, NULL); OBD_FREE_PTR(data); @@ -951,7 +964,7 @@ static int server_sb2mti(struct super_block *sb, struct mgs_target_info *mti) struct lustre_sb_info *lsi = s2lsi(sb); struct lustre_disk_data *ldd = lsi->lsi_ldd; lnet_process_id_t id; - int i = 0; + int i = 0; ENTRY; if (!(lsi->lsi_flags & LSI_SERVER)) @@ -966,6 +979,14 @@ static int server_sb2mti(struct super_block *sb, struct mgs_target_info *mti) while (LNetGetId(i++, &id) != -ENOENT) { if (LNET_NETTYP(LNET_NIDNET(id.nid)) == LOLND) continue; + + if (class_find_param(ldd->ldd_params, + PARAM_NETWORK, NULL) == 0 && + !class_match_net(ldd->ldd_params, id.nid)) { + /* can't match specified network */ + continue; + } + mti->mti_nids[mti->mti_nid_count] = id.nid; mti->mti_nid_count++; if (mti->mti_nid_count >= MTI_NIDS_MAX) { @@ -1058,7 +1079,8 @@ out: RETURN(rc); } -/* Start targets */ +/** Start server targets: MDTs and OSTs + */ static int server_start_targets(struct super_block *sb, struct vfsmount *mnt) { struct obd_device *obd; @@ -1110,8 +1132,8 @@ static int server_start_targets(struct super_block *sb, struct vfsmount *mnt) cfs_mutex_up(&server_start_lock); } - /* Set the mgc fs to our server disk. This allows the MGC - to read and write configs locally. */ + /* Set the mgc fs to our server disk. This allows the MGC to + * read and write configs locally, in case it can't talk to the MGS. */ rc = server_mgc_set_fs(lsi->lsi_mgc, sb); if (rc) RETURN(rc); @@ -1199,6 +1221,8 @@ struct lustre_sb_info *lustre_init_lsi(struct super_block *sb) } lsi->lsi_lmd->lmd_exclude_count = 0; + lsi->lsi_lmd->lmd_recovery_time_soft = 0; + lsi->lsi_lmd->lmd_recovery_time_hard = 0; s2lsi_nocast(sb) = lsi; /* we take 1 extra ref for our setup */ cfs_atomic_set(&lsi->lsi_mounts, 1); @@ -1269,7 +1293,11 @@ static int lustre_put_lsi(struct super_block *sb) /*************** server mount ******************/ -/* Kernel mount using mount options in MOUNT_DATA_FILE */ +/** Kernel mount using mount options in MOUNT_DATA_FILE. + * Since this file lives on the disk, we pre-mount using a common + * type, read the file, then re-mount using the type specified in the + * file. + */ static struct vfsmount *server_kernel_mount(struct super_block *sb) { struct lvfs_run_ctxt mount_ctxt; @@ -1374,7 +1402,7 @@ out_free: RETURN(ERR_PTR(rc)); } -/* Wait here forever until the mount refcount is 0 before completing umount, +/** Wait here forever until the mount refcount is 0 before completing umount, * else we risk dereferencing a null pointer. * LNET may take e.g. 165s before killing zombies. */ @@ -1412,6 +1440,8 @@ static void server_wait_finished(struct vfsmount *mnt) } } +/** Start the shutdown of servers at umount. + */ static void server_put_super(struct super_block *sb) { struct lustre_sb_info *lsi = s2lsi(sb); @@ -1503,6 +1533,8 @@ static void server_put_super(struct super_block *sb) EXIT; } +/** Called only for 'umount -f' + */ #ifdef HAVE_UMOUNTBEGIN_VFSMOUNT static void server_umount_begin(struct vfsmount *vfsmnt, int flags) { @@ -1565,6 +1597,9 @@ static int server_statfs (struct dentry *dentry, cfs_kstatfs_t *buf) RETURN(0); } +/** The operations we support directly on the superblock: + * mount, umount, and df. + */ static struct super_operations server_ops = { .put_super = server_put_super, @@ -1610,6 +1645,11 @@ static int server_fill_super_common(struct super_block *sb) RETURN(0); } +/** Fill in the superblock info for a Lustre server. + * Mount the device with the correct options. + * Read the on-disk config file. + * Start the services. + */ static int server_fill_super(struct super_block *sb) { struct lustre_sb_info *lsi = s2lsi(sb); @@ -1650,6 +1690,7 @@ static int server_fill_super(struct super_block *sb) GOTO(out_mnt, rc); } + /* Start MGC before servers */ rc = lustre_start_mgc(sb); if (rc) GOTO(out_mnt, rc); @@ -1748,7 +1789,6 @@ int lustre_common_put_super(struct super_block *sb) RETURN(rc); } -#if 0 static void lmd_print(struct lustre_mount_data *lmd) { int i; @@ -1758,14 +1798,23 @@ static void lmd_print(struct lustre_mount_data *lmd) PRINT_CMD(PRINT_MASK, "profile: %s\n", lmd->lmd_profile); PRINT_CMD(PRINT_MASK, "device: %s\n", lmd->lmd_dev); PRINT_CMD(PRINT_MASK, "flags: %x\n", lmd->lmd_flags); + if (lmd->lmd_opts) PRINT_CMD(PRINT_MASK, "options: %s\n", lmd->lmd_opts); + + if (lmd->lmd_recovery_time_soft) + PRINT_CMD(PRINT_MASK, "recovery time soft: %d\n", + lmd->lmd_recovery_time_soft); + + if (lmd->lmd_recovery_time_hard) + PRINT_CMD(PRINT_MASK, "recovery time hard: %d\n", + lmd->lmd_recovery_time_hard); + for (i = 0; i < lmd->lmd_exclude_count; i++) { PRINT_CMD(PRINT_MASK, "exclude %d: OST%04x\n", i, lmd->lmd_exclude[i]); } } -#endif /* Is this server on the exclusion list */ int lustre_check_exclusion(struct super_block *sb, char *svname) @@ -1873,7 +1922,10 @@ static int lmd_parse_mgssec(struct lustre_mount_data *lmd, char *ptr) return 0; } -/* mount -v -t lustre uml1:uml2:/lustre-client /mnt/lustre */ +/** Parse mount line options + * e.g. mount -v -t lustre -o abort_recov uml1:uml2:/lustre-client /mnt/lustre + * dev is passed as device=uml1:/lustre by mount.lustre + */ static int lmd_parse(char *options, struct lustre_mount_data *lmd) { char *s1, *s2, *devname = NULL; @@ -1902,6 +1954,9 @@ static int lmd_parse(char *options, struct lustre_mount_data *lmd) s1 = options; while (*s1) { int clear = 0; + int time_min = 2 * (CONNECTION_SWITCH_MAX + + 2 * INITIAL_CONNECT_TIMEOUT); + /* Skip whitespace and extra commas */ while (*s1 == ' ' || *s1 == ',') s1++; @@ -1914,6 +1969,14 @@ static int lmd_parse(char *options, struct lustre_mount_data *lmd) if (strncmp(s1, "abort_recov", 11) == 0) { lmd->lmd_flags |= LMD_FLG_ABORT_RECOV; clear++; + } else if (strncmp(s1, "recovery_time_soft=", 19) == 0) { + lmd->lmd_recovery_time_soft = max_t(int, + simple_strtoul(s1 + 19, NULL, 10), time_min); + clear++; + } else if (strncmp(s1, "recovery_time_hard=", 19) == 0) { + lmd->lmd_recovery_time_hard = max_t(int, + simple_strtoul(s1 + 19, NULL, 10), time_min); + clear++; } else if (strncmp(s1, "nosvc", 5) == 0) { lmd->lmd_flags |= LMD_FLG_NOSVC; clear++; @@ -1993,6 +2056,7 @@ static int lmd_parse(char *options, struct lustre_mount_data *lmd) strcpy(lmd->lmd_opts, options); } + lmd_print(lmd); lmd->lmd_magic = LMD_MAGIC; RETURN(rc); @@ -2003,7 +2067,11 @@ invalid: } -/* Common mount */ +/** This is the entry point for the mount call into Lustre. + * This is called when a server or client is mounted, + * and this is where we start setting things up. + * @param data Mount options (e.g. -o flock,abort_recov) + */ int lustre_fill_super(struct super_block *sb, void *data, int silent) { struct lustre_mount_data *lmd; @@ -2114,6 +2182,8 @@ void lustre_kill_super(struct super_block *sb) kill_anon_super(sb); } +/** Register the "lustre" fs type + */ struct file_system_type lustre_fs_type = { .owner = THIS_MODULE, .name = "lustre",