LU-1279 utils: mount.lustre load ptlrpc module if necessary

[fs/lustre-release.git] / lustre / utils / mount_lustre.c

diff --git a/lustre/utils/mount_lustre.c b/lustre/utils/mount_lustre.c
index 4364ea4..374815e 100644 (file)
--- 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 <stdlib.h>
 #include <stdio.h>
 #include <unistd.h>
@@ -52,7 +53,6 @@
 #include <lustre_ver.h>
 #include <ctype.h>
 #include <limits.h>
-#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, ":/");
@@ -499,6 +514,12 @@ int main(int argc, char *const argv[])
        progname = strrchr(argv[0], '/');
        progname = progname ? progname + 1 : argv[0];
 
+       /*
+        * LU-1279. When LNET modules have not loaded, and mounting multiple
+        * targets at the same time could fail.
+        */
+       rc = system("/sbin/modprobe ptlrpc 2>&1 > /dev/null");
+
        set_defaults(&mop);
 
        rc = osd_init();
@@ -620,6 +641,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 "
@@ -672,9 +696,13 @@ int main(int argc, char *const argv[])
                                       mop.mo_orig_options, 0,0,0);
 
                /* change label from <fsname>:<index> to <fsname>-<index>
-                * to indicate the device has been registered. */
-               if (mop.mo_ldd.ldd_flags & LDD_F_VIRGIN)
-                       (void) osd_label_lustre(&mop);
+                * 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);