X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Futils%2Fmount_lustre.c;h=042fac10c32980968067c20fb0eb221f70921746;hb=c2ddf78e51e7a674c3bf9e40559c5b7ca2bfe120;hp=09e1bddbf38d1eddc15eded3913cd69ffb244d03;hpb=9e7b2d9cb8563c30152c6a4cbebbc568e042e9c8;p=fs%2Flustre-release.git

diff --git a/lustre/utils/mount_lustre.c b/lustre/utils/mount_lustre.c
index 09e1bdd..042fac1 100644
--- a/lustre/utils/mount_lustre.c
+++ b/lustre/utils/mount_lustre.c
@@ -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;
@@ -261,10 +264,36 @@ int parse_options(struct mount_opts *mop, char *orig_options, int *flagp)
         return 0;
 }
 
+/* Add mgsnids from ldd params */
+static int add_mgsnids(struct mount_opts *mop, char *options,
+		       const char *params)
+{
+	char *ptr = (char *)params;
+	char tmp, *sep;
+
+	while ((ptr = strstr(ptr, PARAM_MGSNODE)) != NULL) {
+		sep = strchr(ptr, ' ');
+		if (sep != NULL) {
+			tmp = *sep;
+			*sep = '\0';
+		}
+		append_option(options, ptr);
+		mop->mo_have_mgsnid++;
+		if (sep) {
+			*sep = tmp;
+			ptr = sep;
+		} else {
+			break;
+		}
+	}
+
+	return 0;
+}
 
 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);
@@ -275,6 +304,92 @@ static int parse_ldd(char *source, struct mount_opts *mop, char *options)
 		return ENODEV;
 	}
 
+	rc = osd_read_ldd(source, ldd);
+	if (rc) {
+		fprintf(stderr, "%s: %s failed to read permanent mount"
+			" data: %s\n", progname, source, strerror(rc));
+		return rc;
+	}
+
+	if (ldd->ldd_flags & LDD_F_NEED_INDEX) {
+		fprintf(stderr, "%s: %s has no index assigned "
+			"(probably formatted with old mkfs)\n",
+			progname, source);
+		return EINVAL;
+	}
+
+	if (ldd->ldd_flags & LDD_F_UPGRADE14) {
+		fprintf(stderr, "%s: we cannot upgrade %s from this (very old) "
+			"Lustre version\n", progname, source);
+		return EINVAL;
+	}
+
+	/* Since we never rewrite ldd, ignore temp flags */
+	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 */
+	append_option(options, "osd=");
+	strcat(options, mt_type(ldd->ldd_mount_type));
+
+	append_option(options, ldd->ldd_mount_opts);
+
+	if (!mop->mo_have_mgsnid) {
+		/* Only use disk data if mount -o mgsnode=nid wasn't
+		 * specified */
+		if (ldd->ldd_flags & LDD_F_SV_TYPE_MGS) {
+			append_option(options, "mgs");
+			mop->mo_have_mgsnid++;
+		} else {
+			add_mgsnids(mop, options, ldd->ldd_params);
+		}
+	}
+	/* Better have an mgsnid by now */
+	if (!mop->mo_have_mgsnid) {
+		fprintf(stderr, "%s: missing option mgsnode=<nid>\n",
+			progname);
+		return EINVAL;
+	}
+
+	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);
+
 	return 0;
 }
 
@@ -290,6 +405,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)
@@ -357,8 +473,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);
@@ -371,11 +485,16 @@ static int parse_opts(int argc, char *const argv[], struct mount_opts *mop)
 				fclose(f);
 			}
 		}
+		mop->mo_usource = strdup(real_path);
 	}
 
-	mop->mo_source = convert_hostnames(mop->mo_usource);
-	if (!mop->mo_source) {
-		usage(stderr);
+	ptr = strstr(mop->mo_usource, ":/");
+	if (ptr != NULL) {
+		mop->mo_source = convert_hostnames(mop->mo_usource);
+		if (!mop->mo_source)
+			usage(stderr);
+	} else {
+		mop->mo_source = strdup(mop->mo_usource);
 	}
 
 	if (realpath(argv[optind + 1], mop->mo_target) == NULL) {
@@ -518,6 +637,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 "
@@ -568,6 +690,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 <fsname>:<index> to <fsname>-<index>
+		 * 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);