/* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*-
* vim:expandtab:shiftwidth=8:tabstop=8:
*
- * Copyright (C) 2002 Cluster File Systems, Inc.
- * Author: Robert Read <rread@clusterfs.com>
- * Author: Nathan Rutman <nathan@clusterfs.com>
+ * GPL HEADER START
*
- * This file is part of Lustre, http://www.lustre.org.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Lustre is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 only,
+ * as published by the Free Software Foundation.
*
- * Lustre is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License version 2 for more details (a copy is included
+ * in the LICENSE file that accompanied this code).
*
- * You should have received a copy of the GNU General Public License
- * along with Lustre; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * You should have received a copy of the GNU General Public License
+ * version 2 along with this program; If not, see
+ * http://www.sun.com/software/products/lustre/docs/GPLv2.pdf
*
+ * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ *
+ * GPL HEADER END
+ */
+/*
+ * Copyright 2008 Sun Microsystems, Inc. All rights reserved
+ * Use is subject to license terms.
+ */
+/*
+ * This file is part of Lustre, http://www.lustre.org/
+ * Lustre is a trademark of Sun Microsystems, Inc.
+ *
+ * lustre/utils/mount_lustre.c
+ *
+ * Author: Robert Read <rread@clusterfs.com>
+ * Author: Nathan Rutman <nathan@clusterfs.com>
*/
-
+#ifndef _GNU_SOURCE
#define _GNU_SOURCE
+#endif
#include <stdlib.h>
#include <stdio.h>
#include <unistd.h>
#include <sys/mount.h>
#include <mntent.h>
#include <getopt.h>
-#include <sys/utsname.h>
#include "obdctl.h"
#include <lustre_ver.h>
#include <glob.h>
#include <ctype.h>
+#include <limits.h>
+#include "mount_utils.h"
#define MAX_HW_SECTORS_KB_PATH "queue/max_hw_sectors_kb"
#define MAX_SECTORS_KB_PATH "queue/max_sectors_kb"
+#define MAX_RETRIES 99
int verbose = 0;
int nomtab = 0;
int fake = 0;
int force = 0;
-static char *progname = NULL;
+int retry = 0;
+char *progname = NULL;
void usage(FILE *out)
{
"\t-v|--verbose: print verbose config settings\n"
"\t<mntopt>: one or more comma separated of:\n"
"\t\t(no)flock,(no)user_xattr,(no)acl\n"
+ "\t\tabort_recov: abort server recovery handling\n"
"\t\tnosvc: only start MGC/MGS obds\n"
+ "\t\tnomgs: only start target obds, using existing MGS\n"
"\t\texclude=<ostname>[:<ostname>] : colon-separated list of "
"inactive OSTs (e.g. lustre-OST0001)\n"
+ "\t\tretry=<num>: number of times mount is retried by client\n"
);
exit((out != stdout) ? EINVAL : 0);
}
-static int check_mtab_entry(char *spec, char *mtpt, char *type)
+static int check_mtab_entry(char *spec1, char *spec2, char *mtpt, char *type)
{
FILE *fp;
struct mntent *mnt;
return(0);
while ((mnt = getmntent(fp)) != NULL) {
- if (strcmp(mnt->mnt_fsname, spec) == 0 &&
+ if ((strcmp(mnt->mnt_fsname, spec1) == 0 ||
+ strcmp(mnt->mnt_fsname, spec2) == 0) &&
strcmp(mnt->mnt_dir, mtpt) == 0 &&
strcmp(mnt->mnt_type, type) == 0) {
endmntent(fp);
{ "nodev", 0, MS_NODEV }, /* don't interpret devices */
{ "sync", 0, MS_SYNCHRONOUS}, /* synchronous I/O */
{ "async", 1, MS_SYNCHRONOUS}, /* asynchronous I/O */
+ { "atime", 1, MS_NOATIME }, /* set file access time on read */
+ { "noatime", 0, MS_NOATIME }, /* do not set file access time on read */
+#ifdef MS_NODIRATIME
+ { "diratime", 1, MS_NODIRATIME }, /* set file access time on read */
+ { "nodiratime",0,MS_NODIRATIME }, /* do not set file access time on read */
+#endif
+#ifdef MS_RELATIME
+ { "relatime", 0, MS_RELATIME }, /* set file access time on read */
+ { "norelatime",1,MS_RELATIME }, /* do not set file access time on read */
+#endif
{ "auto", 0, 0 }, /* Can be mounted using -a */
{ "noauto", 0, 0 }, /* Can only be mounted explicitly */
{ "nousers", 1, 0 }, /* Forbid ordinary user to mount */
{ "nouser", 1, 0 }, /* Forbid ordinary user to mount */
{ "noowner", 1, 0 }, /* Device owner has no special privs */
{ "_netdev", 0, 0 }, /* Device accessible only via network */
+ { "loop", 0, 0 },
{ NULL, 0, 0 }
};
/****************************************************************************/
fill in mount flags */
int parse_options(char *orig_options, int *flagp)
{
- char *options, *opt, *nextopt;
+ char *options, *opt, *nextopt, *arg, *val;
options = calloc(strlen(orig_options) + 1, 1);
*flagp = 0;
if (!*opt)
/* empty option */
continue;
- if (parse_one_option(opt, flagp) == 0) {
+
+ /* Handle retries in a slightly different
+ * manner */
+ arg = opt;
+ val = strchr(opt, '=');
+ if (val != NULL && strncmp(arg, "retry", 5) == 0) {
+ retry = atoi(val + 1);
+ if (retry > MAX_RETRIES)
+ retry = MAX_RETRIES;
+ else if (retry < 0)
+ retry = 0;
+ }
+ else if (parse_one_option(opt, flagp) == 0) {
/* pass this on as an option */
if (*options)
strcat(options, ",");
struct stat stat_buf;
char *chk_major, *chk_minor;
char *savept, *dev, *s2 = 0;
- char buf[PATH_MAX], path[PATH_MAX];
+ char *ret_path;
+ char buf[PATH_MAX] = {'\0'}, path[PATH_MAX] = {'\0'};
+ char real_path[PATH_MAX] = {'\0'};
int i, rc = 0;
int major, minor;
if (!source)
return -EINVAL;
- if (strncmp(source, "/dev/loop", 9) == 0)
+ ret_path = realpath(source, real_path);
+ if (ret_path == NULL) {
+ if (verbose)
+ fprintf(stderr, "warning: %s: cannot resolve: %s\n",
+ source, strerror(errno));
+ return -EINVAL;
+ }
+
+ src_len = sizeof(real_path);
+
+ if (strncmp(real_path, "/dev/loop", 9) == 0)
return 0;
- if ((*source != '/') && ((s2 = strpbrk(source, ",:")) != NULL))
+ if ((real_path[0] != '/') && ((s2 = strpbrk(real_path, ",:")) != NULL))
return 0;
- dev = source + src_len - 1;
- while (dev > source && (*dev != '/')) {
+ dev = real_path + src_len - 1;
+ while (dev > real_path && (*dev != '/')) {
if (isdigit(*dev))
*dev = 0;
dev--;
* match any entry under /sys/block/. In that case we need to
* match the major/minor number to find the entry under
* sys/block corresponding to /dev/X */
- dev = source + src_len - 1;
- while (dev > source) {
+ dev = real_path + src_len - 1;
+ while (dev > real_path) {
if (isdigit(*dev))
*dev = 0;
dev--;
if (i == glob_info.gl_pathc) {
if (verbose)
fprintf(stderr,"warning: device %s does not match any "
- "entry under /sys/block\n", source);
- return -EINVAL;
+ "entry under /sys/block\n", real_path);
+ rc = -EINVAL;
+ goto out;
}
snprintf(path, sizeof(path), "%s/%s", glob_info.gl_pathv[i],
if (verbose)
fprintf(stderr, "warning: opening %s: %s\n",
path, strerror(errno));
- return rc;
+ goto out;
}
if (strlen(buf) - 1 > 0) {
fprintf(stderr, "warning: writing to %s: %s\n",
path, strerror(errno));
}
+
+out:
+ globfree(&glob_info);
return rc;
}
if (verbose) {
for (i = 0; i < argc; i++)
printf("arg[%d] = %s\n", i, argv[i]);
- printf("source = %s (%s), target = %s\n", usource, source, target);
+ printf("source = %s (%s), target = %s\n", usource, source,
+ target);
printf("options = %s\n", orig_options);
}
}
if (!force) {
- rc = check_mtab_entry(usource, target, "lustre");
+ rc = check_mtab_entry(usource, source, target, "lustre");
if (rc && !(flags & MS_REMOUNT)) {
fprintf(stderr, "%s: according to %s %s is "
"already mounted on %s\n",
printf("mounting device %s at %s, flags=%#x options=%s\n",
source, target, flags, optcopy);
- if (set_tunables(source, strlen(source)) && verbose)
+ if (!strstr(usource, ":/") && set_tunables(source, strlen(source)) &&
+ verbose)
fprintf(stderr, "%s: unable to set tunables for %s"
- " (may cause reduced IO performance)",
+ " (may cause reduced IO performance)\n",
argv[0], source);
- if (!fake)
+ register_service_tags(usource, source, target);
+
+ if (!fake) {
/* flags and target get to lustre_get_sb, but not
lustre_fill_super. Lustre ignores the flags, but mount
does not. */
- rc = mount(source, target, "lustre", flags, (void *)optcopy);
+ for (i = 0, rc = -EAGAIN; i <= retry && rc != 0; i++) {
+ rc = mount(source, target, "lustre", flags,
+ (void *)optcopy);
+ if (rc) {
+ if (verbose) {
+ fprintf(stderr, "%s: mount %s at %s "
+ "failed: %s retries left: "
+ "%d\n", basename(progname),
+ usource, target,
+ strerror(errno), retry-i);
+ }
+
+ if (retry) {
+ sleep(1 << max((i/2), 5));
+ }
+ else {
+ rc = errno;
+ }
+ }
+ }
+ }
if (rc) {
char *cli;
git://git.whamcloud.com / fs / lustre-release.git / blobdiff