-/* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*-
- * vim:expandtab:shiftwidth=8:tabstop=8:
+/*
+ * GPL HEADER START
*
- * Lustre Light common routines
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright (c) 2002-2004 Cluster File Systems, Inc.
+ * 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.
*
- * This file is part of Lustre, http://www.lustre.org.
+ * 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).
*
- * 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.
+ * 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
*
- * 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.
+ * 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.
*
- * 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.
+ * GPL HEADER END
+ */
+/*
+ * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Use is subject to license terms.
+ *
+ * Copyright (c) 2012, Intel Corporation.
+ */
+/*
+ * This file is part of Lustre, http://www.lustre.org/
+ * Lustre is a trademark of Sun Microsystems, Inc.
+ *
+ * lustre/liblustre/llite_lib.c
+ *
+ * Lustre Light common routines
*/
+#include <errno.h>
+#include <stdio.h>
#include <stdlib.h>
#include <string.h>
-#include <assert.h>
-#include <signal.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <sys/queue.h>
-
-#ifdef HAVE_XTIO_H
-#include <xtio.h>
-#endif
-#include <sysio.h>
-#include <fs.h>
-#include <mount.h>
-#include <inode.h>
-#ifdef HAVE_FILE_H
-#include <file.h>
-#endif
-
-/* both sys/queue.h (libsysio require it) and portals/lists.h have definition
- * of 'LIST_HEAD'. undef it to suppress warnings
- */
-#undef LIST_HEAD
-#include <lnet/lnetctl.h> /* needed for parse_dump */
-
-#include "lutil.h"
+#include <unistd.h>
+#include <sys/mount.h>
+#include <libcfs/libcfs.h>
+#include <lustre/lustre_idl.h>
+#include <liblustre.h>
+#include <lnet/lnet.h>
+#include <lustre_cfg.h>
+#include <lustre_export.h>
+#include <lustre_log.h>
+#include <lustre_ver.h>
+#include <obd.h>
+#include <obd_class.h>
+#include <obd_support.h>
#include "llite_lib.h"
+#include "lutil.h"
static int lllib_init(void)
{
init_obdclass() ||
ptlrpc_init() ||
mgc_init() ||
+ lmv_init() ||
mdc_init() ||
lov_init() ||
- osc_init())
+ osc_init() ||
+ slp_global_init())
return -1;
return _sysio_fssw_register("lustre", &llu_fssw_ops);
struct lustre_cfg *lcfg;
char *peer = "MGS_UUID";
struct obd_device *obd;
- struct lustre_handle mgc_conn = {0, };
struct obd_export *exp;
char *name = "mgc_dev";
class_uuid_t uuid;
struct obd_connect_data *ocd = NULL;
ENTRY;
- generate_random_uuid(uuid);
+ ll_generate_random_uuid(uuid);
class_uuid_unparse(uuid, &mgc_uuid);
nid = libcfs_str2nid(mgsnid);
if (ocd == NULL)
GOTO(out_cleanup, rc = -ENOMEM);
- ocd->ocd_connect_flags = OBD_CONNECT_VERSION;
+ ocd->ocd_connect_flags = OBD_CONNECT_VERSION | OBD_CONNECT_AT |
+ OBD_CONNECT_FULL20;
ocd->ocd_version = LUSTRE_VERSION_CODE;
- rc = obd_connect(&mgc_conn, obd, &mgc_uuid, ocd);
+ rc = obd_connect(NULL, &exp, obd, &mgc_uuid, ocd, NULL);
if (rc) {
CERROR("cannot connect to %s at %s: rc = %d\n",
LUSTRE_MGS_OBDNAME, mgsnid, rc);
GOTO(out_cleanup, rc);
}
- exp = class_conn2export(&mgc_conn);
-
- ctxt = exp->exp_obd->obd_llog_ctxt[LLOG_CONFIG_REPL_CTXT];
+ ctxt = llog_get_context(exp->exp_obd, LLOG_CONFIG_REPL_CTXT);
cfg->cfg_flags |= CFG_F_COMPAT146;
- rc = class_config_parse_llog(ctxt, profile, cfg);
+ rc = class_config_parse_llog(NULL, ctxt, profile, cfg);
+ llog_ctxt_put(ctxt);
if (rc) {
CERROR("class_config_parse_llog failed: rc = %d\n", rc);
}
err = class_process_config(lcfg);
lustre_cfg_free(lcfg);
if (err)
- CERROR("mdc_cleanup failed: rc = %d\n", err);
+ CERROR("md_cleanup failed: rc = %d\n", err);
out_detach:
lustre_cfg_bufs_reset(&bufs, name);
err = class_process_config(lcfg);
lustre_cfg_free(lcfg);
if (err)
- CERROR("mdc_detach failed: rc = %d\n", err);
+ CERROR("md_detach failed: rc = %d\n", err);
out_del_uuid:
lustre_cfg_bufs_reset(&bufs, name);
* to enable libsysio's processing of namespace init strings containing
* lustre filesystem operations
*/
-int _sysio_lustre_init(void)
+static int _sysio_lustre_init(void)
{
int err;
- char *timeout = NULL;
+ char *envstr;
#ifndef INIT_SYSIO
extern void __liblustre_cleanup_(void);
#endif
perror("init llite driver");
return err;
}
- timeout = getenv("LIBLUSTRE_TIMEOUT");
- if (timeout) {
- obd_timeout = (unsigned int) strtol(timeout, NULL, 0);
- printf("LibLustre: set obd timeout as %u seconds\n",
+
+ envstr = getenv("LIBLUSTRE_TIMEOUT");
+ if (envstr != NULL) {
+ obd_timeout = (unsigned int)strtol(envstr, NULL, 0);
+ printf("LibLustre: obd timeout=%u seconds\n",
obd_timeout);
}
+ /* debug peer on timeout? */
+ envstr = getenv("LIBLUSTRE_DEBUG_PEER_ON_TIMEOUT");
+ if (envstr != NULL) {
+ obd_debug_peer_on_timeout =
+ (unsigned int)strtol(envstr, NULL, 0);
+ printf("LibLustre: debug peer on timeout=%d\n",
+ obd_debug_peer_on_timeout ? 0 : 1);
+ }
+
#ifndef INIT_SYSIO
(void)atexit(__liblustre_cleanup_);
#endif
}
extern int _sysio_native_init();
-extern unsigned int obd_timeout;
+
+static int mnt_retry = 0;
char *lustre_path = NULL;
void __liblustre_setup_(void)
{
char *target = NULL;
- char *root_driver = "native";
char *lustre_driver = "lustre";
- char *root_path = "/";
unsigned mntflgs = 0;
- int err;
+ int err, count;
lustre_path = getenv("LIBLUSTRE_MOUNT_POINT");
if (!lustre_path) {
lustre_path = "/mnt/lustre";
}
+ target = getenv("LIBLUSTRE_MOUNT_RETRY");
+ if (target) {
+ mnt_retry = atoi(target);
+ if (mnt_retry < 0)
+ mnt_retry = 0;
+ }
+
/* mount target */
target = getenv("LIBLUSTRE_MOUNT_TARGET");
if (!target) {
}
_sysio_native_init();
- err = _sysio_mount_root(root_path, root_driver, mntflgs, NULL);
+ err = _sysio_mount_root("/", "native", mntflgs, NULL);
if (err) {
fprintf(stderr, "sysio mount failed: %s\n", strerror(errno));
exit(1);
exit(1);
#endif /* INIT_SYSIO */
- err = mount(target, lustre_path, lustre_driver, mntflgs, NULL);
+ count = mnt_retry;
+ do {
+ err = mount(target, lustre_path, lustre_driver, mntflgs, NULL);
+ if (err && mnt_retry && (-- count)) {
+ fprintf(stderr, "Lustre mount failed: %s. "
+ "Will retry %d more times\n",
+ strerror(errno), mnt_retry - count );
+ sleep(2);
+ }
+ } while (err && count > 0);
if (err) {
fprintf(stderr, "Lustre mount failed: %s\n", strerror(errno));
exit(1);
* but it can't fix the situation that liblustre is mounted
* at "/".
*/
- chdir("/");
+ if (!chdir("/")) {}
#if 0
umount(lustre_path);
#endif
git://git.whamcloud.com / fs / lustre-release.git / blobdiff