X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Futils%2Fmount_lustre.c;h=fe1920ff03fe0784182b7192239b5c4d87303efe;hb=c7d8ce29cc95e9141df7c227afc65f88602a966f;hp=263f5d29db639bb2a5153123b9103ad6778457bd;hpb=f251f3201d59c0fe0d5b2c6f96dfc7594583e0d8;p=fs%2Flustre-release.git diff --git a/lustre/utils/mount_lustre.c b/lustre/utils/mount_lustre.c index 263f5d2..fe1920f 100644 --- a/lustre/utils/mount_lustre.c +++ b/lustre/utils/mount_lustre.c @@ -42,6 +42,7 @@ #ifndef _GNU_SOURCE #define _GNU_SOURCE #endif +#include "mount_utils.h" #include #include #include @@ -52,7 +53,6 @@ #include #include #include -#include "mount_utils.h" #define MAXOPT 4096 #define MAX_RETRIES 99 @@ -241,6 +241,9 @@ int parse_options(struct mount_opts *mop, char *orig_options, int *flagp) mop->mo_retry = 0; } else if (val && strncmp(arg, "mgssec", 6) == 0) { append_option(options, opt); + } else if (strncmp(arg, "nosvc", 5) == 0) { + mop->mo_nosvc = 1; + append_option(options, opt); } else if (strcmp(opt, "force") == 0) { //XXX special check for 'force' option ++mop->mo_force; @@ -290,6 +293,7 @@ static int add_mgsnids(struct mount_opts *mop, char *options, static int parse_ldd(char *source, struct mount_opts *mop, char *options) { struct lustre_disk_data *ldd = &mop->mo_ldd; + char *cur, *start; int rc; rc = osd_is_lustre(source, &ldd->ldd_mount_type); @@ -300,15 +304,6 @@ static int parse_ldd(char *source, struct mount_opts *mop, char *options) return ENODEV; } - /* for new backends (i.e. ZFS) we will be parsing mount data - * in the userspace and pass it in the form of mount options. - * to adopt this schema smoothly we're still doing old way - * (parsing mount data within the kernel) for ldiskfs */ - if (ldd->ldd_mount_type == LDD_MT_EXT3 || - ldd->ldd_mount_type == LDD_MT_LDISKFS || - ldd->ldd_mount_type == LDD_MT_LDISKFS2) - return 0; - rc = osd_read_ldd(source, ldd); if (rc) { fprintf(stderr, "%s: %s failed to read permanent mount" @@ -330,13 +325,16 @@ static int parse_ldd(char *source, struct mount_opts *mop, char *options) } /* Since we never rewrite ldd, ignore temp flags */ - ldd->ldd_flags &= ~(LDD_F_VIRGIN | LDD_F_UPDATE); + ldd->ldd_flags &= ~(LDD_F_VIRGIN | LDD_F_UPDATE | LDD_F_WRITECONF); /* svname of the form lustre:OST1234 means never registered */ rc = strlen(ldd->ldd_svname); if (ldd->ldd_svname[rc - 8] == ':') { ldd->ldd_svname[rc - 8] = '-'; ldd->ldd_flags |= LDD_F_VIRGIN; + } else if (ldd->ldd_svname[rc - 8] == '=') { + ldd->ldd_svname[rc - 8] = '-'; + ldd->ldd_flags |= LDD_F_WRITECONF; } /* backend osd type */ @@ -362,13 +360,30 @@ static int parse_ldd(char *source, struct mount_opts *mop, char *options) return EINVAL; } - if (ldd->ldd_flags & (LDD_F_VIRGIN | LDD_F_WRITECONF)) + if (ldd->ldd_flags & LDD_F_VIRGIN) + append_option(options, "virgin"); + if (ldd->ldd_flags & LDD_F_WRITECONF) append_option(options, "writeconf"); - if (ldd->ldd_flags & LDD_F_IAM_DIR) - append_option(options, "iam"); if (ldd->ldd_flags & LDD_F_NO_PRIMNODE) append_option(options, "noprimnode"); + /* prefix every lustre parameter with param= so that in-kernel + * mount can recognize them properly and send to MGS at registration */ + start = ldd->ldd_params; + while (start && *start != '\0') { + while (*start == ' ') start++; + if (*start == '\0') + break; + cur = start; + start = strchr(cur, ' '); + if (start) { + *start = '\0'; + start++; + } + append_option(options, "param="); + strcat(options, cur); + } + /* svname must be last option */ append_option(options, "svname="); strcat(options, ldd->ldd_svname); @@ -388,6 +403,7 @@ static void set_defaults(struct mount_opts *mop) mop->mo_have_mgsnid = 0; mop->mo_md_stripe_cache_size = 16384; mop->mo_orig_options = ""; + mop->mo_nosvc = 0; } static int parse_opts(int argc, char *const argv[], struct mount_opts *mop) @@ -455,8 +471,6 @@ static int parse_opts(int argc, char *const argv[], struct mount_opts *mop) * symbolic link for instance */ if (realpath(mop->mo_usource, real_path) != NULL) { - mop->mo_usource = strdup(real_path); - ptr = strrchr(real_path, '/'); if (ptr && strncmp(ptr, "/dm-", 4) == 0 && isdigit(*(ptr + 4))) { snprintf(path, sizeof(path), "/sys/block/%s/dm/name", ptr+1); @@ -469,6 +483,7 @@ static int parse_opts(int argc, char *const argv[], struct mount_opts *mop) fclose(f); } } + mop->mo_usource = strdup(real_path); } ptr = strstr(mop->mo_usource, ":/"); @@ -620,6 +635,9 @@ int main(int argc, char *const argv[]) fprintf(stderr, "%s: mount %s at %s failed: %s\n", progname, mop.mo_usource, mop.mo_target, strerror(errno)); + if (errno == EBUSY) + fprintf(stderr, "Is the backend filesystem mounted?\n" + "Check /etc/mtab and /proc/mounts\n"); if (errno == ENODEV) fprintf(stderr, "Are the lustre modules loaded?\n" "Check /etc/modprobe.conf and " @@ -670,6 +688,15 @@ int main(int argc, char *const argv[]) } else if (!mop.mo_nomtab) { rc = update_mtab_entry(mop.mo_usource, mop.mo_target, "lustre", mop.mo_orig_options, 0,0,0); + + /* change label from : to - + * to indicate the device has been registered. + * only if the label is supposed to be changed and + * target service is supposed to start */ + if (mop.mo_ldd.ldd_flags & (LDD_F_VIRGIN | LDD_F_WRITECONF)) { + if (mop.mo_nosvc == 0 ) + (void) osd_label_lustre(&mop); + } } free(options);