X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;ds=sidebyside;f=lustre%2Futils%2Fmkfs_lustre.c;h=2b9e5a61d9581bdf9014a404fce94c9b5389dda1;hb=f625f670afbe954030ff81f0f8522137d6cdd335;hp=6d49c568518895cc3fdcaba999a6d053761c9e42;hpb=08aa217ce49aba1ded52e0f7adb8a607035123fd;p=fs%2Flustre-release.git diff --git a/lustre/utils/mkfs_lustre.c b/lustre/utils/mkfs_lustre.c index 6d49c56..2b9e5a6 100644 --- a/lustre/utils/mkfs_lustre.c +++ b/lustre/utils/mkfs_lustre.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, 2012, Intel Corporation. + * Copyright (c) 2011, 2014, Intel Corporation. */ /* * This file is part of Lustre, http://www.lustre.org/ @@ -64,7 +64,7 @@ #include #include #include - +#include #include #include #include @@ -76,8 +76,8 @@ char *progname; int verbose = 1; +int version; static int print_only = 0; -static int upgrade_to_18 = 0; #ifdef HAVE_LDISKFS_OSD #define FSLIST_LDISKFS "ldiskfs" @@ -104,7 +104,6 @@ static int upgrade_to_18 = 0; void usage(FILE *out) { - fprintf(out, "%s v"LUSTRE_VERSION_STRING"\n", progname); fprintf(out, "usage: %s [--backfstype="FSLIST"] " "--fsname=\n" "\t--index= [options] \n", progname); @@ -152,6 +151,7 @@ void usage(FILE *out) "\t\t--device-size=#N(KB): device size for loop devices\n" "\t\t--mkfsoptions=: format options\n" "\t\t--reformat: overwrite an existing disk\n" + "\t\t--replace: replace an old target with the same index\n" "\t\t--stripe-count-hint=#N: for optimizing MDT inode size\n" #else "\t\t--erase-params: erase all old parameter settings\n" @@ -162,6 +162,8 @@ void usage(FILE *out) "\t\t--comment=: arbitrary string (%d bytes)\n" "\t\t--dryrun: report what we would do; don't write to disk\n" "\t\t--verbose: e.g. show mkfs progress\n" + "\t\t-V|--version: output build version of the utility and\n" + "\t\t\texit\n" "\t\t--quiet\n", (int)sizeof(((struct lustre_disk_data *)0)->ldd_userdata)); return; @@ -248,8 +250,8 @@ static char *convert_hostnames(char *s1) *s2 = sep; if (nid == LNET_NID_ANY) { - fprintf(stderr, "%s: Can't parse NID '%s'\n", - progname, s1); + fprintf(stderr, "%s: Cannot resolve hostname '%s'.\n", + progname, s1); free(converted); return NULL; } @@ -273,44 +275,46 @@ static char *convert_hostnames(char *s1) int parse_opts(int argc, char *const argv[], struct mkfs_opts *mop, char **mountopts) { - static struct option long_opt[] = { - {"backfstype", 1, 0, 'b'}, - {"stripe-count-hint", 1, 0, 'c'}, - {"comment", 1, 0, 'u'}, - {"configdev", 1, 0, 'C'}, - {"device-size", 1, 0, 'd'}, - {"dryrun", 0, 0, 'n'}, - {"erase-params", 0, 0, 'e'}, - {"failnode", 1, 0, 'f'}, - {"failover", 1, 0, 'f'}, - {"mgs", 0, 0, 'G'}, - {"help", 0, 0, 'h'}, - {"index", 1, 0, 'i'}, - {"mkfsoptions", 1, 0, 'k'}, - {"mgsnode", 1, 0, 'm'}, - {"mgsnid", 1, 0, 'm'}, - {"mdt", 0, 0, 'M'}, - {"fsname",1, 0, 'L'}, - {"noformat", 0, 0, 'n'}, - {"nomgs", 0, 0, 'N'}, - {"mountfsoptions", 1, 0, 'o'}, - {"ost", 0, 0, 'O'}, - {"param", 1, 0, 'p'}, - {"print", 0, 0, 'n'}, - {"quiet", 0, 0, 'q'}, - {"reformat", 0, 0, 'r'}, - {"servicenode", 1, 0, 's'}, - {"verbose", 0, 0, 'v'}, - {"writeconf", 0, 0, 'w'}, - {"upgrade_to_18", 0, 0, 'U'}, - {"network", 1, 0, 't'}, - {"quota", 0, 0, 'Q'}, - {0, 0, 0, 0} - }; - char *optstring = "b:c:C:d:ef:Ghi:k:L:m:MnNo:Op:Pqrs:t:Uu:vw"; - int opt; - int rc, longidx; - int failnode_set = 0, servicenode_set = 0; + static struct option long_opt[] = { + { "backfstype", required_argument, NULL, 'b' }, + { "stripe-count-hint", required_argument, NULL, 'c' }, + { "comment", required_argument, NULL, 'u' }, + { "configdev", required_argument, NULL, 'C' }, + { "device-size", required_argument, NULL, 'd' }, + { "dryrun", no_argument, NULL, 'n' }, + { "erase-params", no_argument, NULL, 'e' }, + { "failnode", required_argument, NULL, 'f' }, + { "failover", required_argument, NULL, 'f' }, + { "mgs", no_argument, NULL, 'G' }, + { "help", no_argument, NULL, 'h' }, + { "index", required_argument, NULL, 'i' }, + { "mkfsoptions", required_argument, NULL, 'k' }, + { "mgsnode", required_argument, NULL, 'm' }, + { "mgsnid", required_argument, NULL, 'm' }, + { "mdt", no_argument, NULL, 'M' }, + { "fsname", required_argument, NULL, 'L' }, + { "noformat", no_argument, NULL, 'n' }, + { "nomgs", no_argument, NULL, 'N' }, + { "mountfsoptions", required_argument, NULL, 'o' }, + { "ost", no_argument, NULL, 'O' }, + { "param", required_argument, NULL, 'p' }, + { "print", no_argument, NULL, 'n' }, + { "quiet", no_argument, NULL, 'q' }, + { "quota", no_argument, NULL, 'Q' }, + { "reformat", no_argument, NULL, 'r' }, + { "replace", no_argument, NULL, 'R' }, + { "servicenode", required_argument, NULL, 's' }, + { "network", required_argument, NULL, 't' }, + { "verbose", no_argument, NULL, 'v' }, + { "version", no_argument, NULL, 'V' }, + { "writeconf", no_argument, NULL, 'w' }, + { 0, 0, NULL, 0 } + }; + char *optstring = "b:c:C:d:ef:Ghi:k:L:m:MnNo:Op:PqrRs:t:Uu:vVw"; + int opt; + int rc, longidx; + int failnode_set = 0, servicenode_set = 0; + int replace = 0; while ((opt = getopt_long(argc, argv, optstring, long_opt, &longidx)) != EOF) { @@ -349,9 +353,9 @@ int parse_opts(int argc, char *const argv[], struct mkfs_opts *mop, //FIXME printf("Configdev not implemented\n"); return 1; - case 'd': - mop->mo_device_sz = atol(optarg); - break; + case 'd': + mop->mo_device_kb = atol(optarg); + break; case 'e': mop->mo_ldd.ldd_params[0] = '\0'; /* Must update the mgs logs */ @@ -372,8 +376,8 @@ int parse_opts(int argc, char *const argv[], struct mkfs_opts *mop, nids = convert_hostnames(optarg); if (!nids) return 1; - rc = add_param(mop->mo_ldd.ldd_params, PARAM_FAILNODE, - nids); + rc = append_param(mop->mo_ldd.ldd_params, + PARAM_FAILNODE, nids, ':'); free(nids); if (rc) return rc; @@ -402,13 +406,16 @@ int parse_opts(int argc, char *const argv[], struct mkfs_opts *mop, " a registered target\n", progname); return 1; } - if (IS_MDT(&mop->mo_ldd) || IS_OST(&mop->mo_ldd)) { - mop->mo_ldd.ldd_svindex = atol(optarg); - mop->mo_ldd.ldd_flags &= ~LDD_F_NEED_INDEX; - } else { - badopt(long_opt[longidx].name, "MDT,OST"); - return 1; - } + /* LU-2374: check whether it is OST/MDT later */ + mop->mo_ldd.ldd_svindex = atol(optarg); + if (mop->mo_ldd.ldd_svindex >= INDEX_UNASSIGNED) { + fprintf(stderr, "%s: wrong index %u. " + "Target index must be less than %u.\n", + progname, mop->mo_ldd.ldd_svindex, + INDEX_UNASSIGNED); + return 1; + } + mop->mo_ldd.ldd_flags &= ~LDD_F_NEED_INDEX; break; case 'k': strscpy(mop->mo_mkfsopts, optarg, @@ -442,8 +449,8 @@ int parse_opts(int argc, char *const argv[], struct mkfs_opts *mop, char *nids = convert_hostnames(optarg); if (!nids) return 1; - rc = add_param(mop->mo_ldd.ldd_params, PARAM_MGSNODE, - nids); + rc = append_param(mop->mo_ldd.ldd_params, + PARAM_MGSNODE, nids, ':'); free(nids); if (rc) return rc; @@ -478,6 +485,9 @@ int parse_opts(int argc, char *const argv[], struct mkfs_opts *mop, case 'r': mop->mo_flags |= MO_FORCEFORMAT; break; + case 'R': + replace = 1; + break; case 't': if (!IS_MDT(&mop->mo_ldd) && !IS_OST(&mop->mo_ldd)) { badopt(long_opt[longidx].name, "MDT,OST"); @@ -498,15 +508,17 @@ int parse_opts(int argc, char *const argv[], struct mkfs_opts *mop, strscpy(mop->mo_ldd.ldd_userdata, optarg, sizeof(mop->mo_ldd.ldd_userdata)); break; - case 'v': - verbose++; - break; - case 'w': - mop->mo_ldd.ldd_flags |= LDD_F_WRITECONF; - break; - case 'U': - upgrade_to_18 = 1; - break; + case 'v': + verbose++; + break; + case 'V': + ++version; + fprintf(stdout, "%s %s\n", progname, + LUSTRE_VERSION_STRING); + return 0; + case 'w': + mop->mo_ldd.ldd_flags |= LDD_F_WRITECONF; + break; case 'Q': mop->mo_flags |= MO_QUOTA; break; @@ -519,6 +531,10 @@ int parse_opts(int argc, char *const argv[], struct mkfs_opts *mop, } }//while + /* Need to clear this flag after parsing 'L' and 'i' options. */ + if (replace) + mop->mo_ldd.ldd_flags &= ~LDD_F_VIRGIN; + if (optind == argc) { /* The user didn't specify device name */ fatal(); @@ -539,13 +555,14 @@ int parse_opts(int argc, char *const argv[], struct mkfs_opts *mop, int main(int argc, char *const argv[]) { - struct mkfs_opts mop; - struct lustre_disk_data *ldd; - char *mountopts = NULL; - char always_mountopts[512] = ""; - char default_mountopts[512] = ""; + struct mkfs_opts mop; + struct lustre_disk_data *ldd; + char *mountopts = NULL; + char always_mountopts[512] = ""; + char default_mountopts[512] = ""; unsigned mount_type; - int ret = 0; + int ret = 0; + int ret2 = 0; if ((progname = strrchr(argv[0], '/')) != NULL) progname++; @@ -591,16 +608,26 @@ int main(int argc, char *const argv[]) } mop.mo_ldd.ldd_flags &= ~(LDD_F_WRITECONF | LDD_F_VIRGIN); - if (strstr(mop.mo_ldd.ldd_params, PARAM_MGSNODE)) - mop.mo_mgs_failnodes++; + /* svname of the form lustre:OST1234 means never registered */ + ret = strlen(mop.mo_ldd.ldd_svname); + if (mop.mo_ldd.ldd_svname[ret - 8] == ':') { + mop.mo_ldd.ldd_svname[ret - 8] = '-'; + mop.mo_ldd.ldd_flags |= LDD_F_VIRGIN; + } else if (mop.mo_ldd.ldd_svname[ret - 8] == '=') { + mop.mo_ldd.ldd_svname[ret - 8] = '-'; + mop.mo_ldd.ldd_flags |= LDD_F_WRITECONF; + } + + if (strstr(mop.mo_ldd.ldd_params, PARAM_MGSNODE)) + mop.mo_mgs_failnodes++; - if (verbose > 0) - print_ldd("Read previous values", &(mop.mo_ldd)); + if (verbose > 0) + print_ldd("Read previous values", &(mop.mo_ldd)); #endif - ret = parse_opts(argc, argv, &mop, &mountopts); - if (ret) - goto out; + ret = parse_opts(argc, argv, &mop, &mountopts); + if (ret || version) + goto out; ldd = &mop.mo_ldd; @@ -618,9 +645,17 @@ int main(int argc, char *const argv[]) goto out; } - /* Stand alone MGS doesn't need a index */ - if (!IS_MDT(ldd) && IS_MGS(ldd)) + /* Stand alone MGS doesn't need an index */ + if (!IS_MDT(ldd) && IS_MGS(ldd)) { +#ifndef TUNEFS /* mkfs.lustre */ + /* But if --index was specified flag an error */ + if (!(mop.mo_ldd.ldd_flags & LDD_F_NEED_INDEX)) { + badopt("index", "MDT,OST"); + goto out; + } +#endif mop.mo_ldd.ldd_flags &= ~LDD_F_NEED_INDEX; + } if ((mop.mo_ldd.ldd_flags & (LDD_F_NEED_INDEX | LDD_F_UPGRADE14)) == (LDD_F_NEED_INDEX | LDD_F_UPGRADE14)) { @@ -641,27 +676,15 @@ int main(int argc, char *const argv[]) mop.mo_ldd.ldd_flags &= ~LDD_F_NEED_INDEX; mop.mo_ldd.ldd_svindex = 0; } - -#if 0 - /* - * Comment out these 2 checks temporarily, since for multi-MDSes - * in single node only 1 mds node could have mgs service - */ - if (IS_MDT(ldd) && !IS_MGS(ldd) && (mop.mo_mgs_failnodes == 0)) { - verrprint("No management node specified, adding MGS to this " - "MDT\n"); - ldd->ldd_flags |= LDD_F_SV_TYPE_MGS; - } - if (!IS_MGS(ldd) && (mop.mo_mgs_failnodes == 0)) { - fatal(); - if (IS_MDT(ldd)) - fprintf(stderr, "Must specify --mgs or --mgsnode=\n"); - else - fprintf(stderr, "Must specify --mgsnode=\n"); - ret = EINVAL; - goto out; - } -#endif + if (!IS_MGS(ldd) && (mop.mo_mgs_failnodes == 0)) { + fatal(); + if (IS_MDT(ldd)) + fprintf(stderr, "Must specify --mgs or --mgsnode\n"); + else + fprintf(stderr, "Must specify --mgsnode\n"); + ret = EINVAL; + goto out; + } if ((IS_MDT(ldd) || IS_OST(ldd)) && mop.mo_ldd.ldd_fsname[0] == '\0') { fatal(); fprintf(stderr, "Must specify --fsname for MDT/OST device\n"); @@ -783,8 +806,10 @@ int main(int argc, char *const argv[]) } out: - loop_cleanup(&mop); osd_fini(); + ret2 = loop_cleanup(&mop); + if (ret == 0) + ret = ret2; /* Fix any crazy return values from system() */ if (ret && ((ret & 255) == 0))