From 7dc8aa7e7848f800c54eb18ecd59d665484ce822 Mon Sep 17 00:00:00 2001 From: Li Dongyang Date: Fri, 21 Feb 2020 13:36:26 +1100 Subject: [PATCH] LU-13241 utils: use libext2fs for ldiskfs operations Instead of using debugfs to stat and read the CONFIGS/mountdata, we can switch to libext2fs and control the flags used when opening the ldiskfs, to reduce the mount time on huge targets. Change-Id: I9da8fc1c77d149fe5cf3bd19b0ff76d892620101 Signed-off-by: Li Dongyang Reviewed-on: https://review.whamcloud.com/37656 Reviewed-by: Andreas Dilger Reviewed-by: Li Xi Tested-by: jenkins Tested-by: Maloo Reviewed-by: Oleg Drokin --- lustre.spec.in | 2 + lustre/autoconf/lustre-core.m4 | 10 +- lustre/utils/Makefile.am | 7 +- lustre/utils/libmount_utils_ldiskfs.c | 188 ++++++++++++++-------------------- 4 files changed, 91 insertions(+), 116 deletions(-) diff --git a/lustre.spec.in b/lustre.spec.in index f23dca2..48cb0f7 100644 --- a/lustre.spec.in +++ b/lustre.spec.in @@ -213,6 +213,8 @@ echo $TMPFILE %if %{with lustre_utils} %package osd-ldiskfs-mount Summary: osd-ldiskfs-mount contains mount's ldiskfs specific dso. +BuildRequires: e2fsprogs-devel +Requires: ldiskfsprogs Provides: lustre-osd-mount = %{version} Group: System Environment/Kernel diff --git a/lustre/autoconf/lustre-core.m4 b/lustre/autoconf/lustre-core.m4 index 8dc06cb..0c3c3db 100644 --- a/lustre/autoconf/lustre-core.m4 +++ b/lustre/autoconf/lustre-core.m4 @@ -2517,8 +2517,14 @@ LC_MDS_MAX_THREADS AC_CHECK_HEADERS([netdb.h endian.h]) AC_CHECK_FUNCS([gethostbyname]) -# lustre/utils/llverfs.c -AC_CHECK_HEADERS([ext2fs/ext2fs.h]) +# lustre/utils/llverfs.c lustre/utils/libmount_utils_ldiskfs.c +AC_CHECK_HEADERS([ext2fs/ext2fs.h], [], [ + AS_IF([test "x$enable_utils" = xyes -a "x$enable_ldiskfs" = xyes], [ + AC_MSG_ERROR([ +ext2fs.h not found. Please install e2fsprogs development package. + ]) + ]) +]) # lustre/utils/lfs.c AS_IF([test "$enable_dist" = "no"], [ diff --git a/lustre/utils/Makefile.am b/lustre/utils/Makefile.am index 609261e..118a719 100644 --- a/lustre/utils/Makefile.am +++ b/lustre/utils/Makefile.am @@ -140,6 +140,8 @@ if PLUGINS MNTMODLDFLAGS := -rdynamic MNTMODLIBS := -ldl MNTMODCFLAGS := -DPLUGIN_DIR=\"${pkglibdir}\" +else +MNTMODLIBS := endif # PLUGINS if ZFS_ENABLED @@ -157,7 +159,7 @@ libmount_utils_zfs.la : libmount_utils_zfs.a $(MNTMODLIBS) $(ZFS_LIBZFS_LIBS) else MNTMODLDFLAGS := $(ZFS_LIBZFS_LDFLAGS) -MNTMODLIBS := $(ZFS_LIBZFS_LIBS) +MNTMODLIBS += $(ZFS_LIBZFS_LIBS) PLUGIN_LIB += libmount_utils_zfs.a endif # PLUGINS endif # ZFS_ENABLED @@ -171,11 +173,12 @@ libmount_utils_ldiskfs_a_CPPFLAGS := if PLUGINS lib_LTLIBRARIES += libmount_utils_ldiskfs.la libmount_utils_ldiskfs.la : libmount_utils_ldiskfs.a - $(CC) $(LDFLAGS) $(MNTMODLDFLAGS) -shared -export-dynamic \ + $(CC) $(LDFLAGS) $(MNTMODLDFLAGS) -shared -export-dynamic -lext2fs \ -o mount_osd_ldiskfs.so \ `$(AR) -t libmount_utils_ldiskfs.a` \ $(MNTMODLIBS) else +MNTMODLIBS += -lext2fs PLUGIN_LIB += libmount_utils_ldiskfs.a endif # PLUGINS endif # LDISKFS_ENABLED diff --git a/lustre/utils/libmount_utils_ldiskfs.c b/lustre/utils/libmount_utils_ldiskfs.c index 1ee3612..7532d11 100644 --- a/lustre/utils/libmount_utils_ldiskfs.c +++ b/lustre/utils/libmount_utils_ldiskfs.c @@ -64,6 +64,8 @@ #include #include +#include + #ifndef BLKGETSIZE64 #include /* for BLKGETSIZE64 */ #endif @@ -85,6 +87,10 @@ extern char *progname; +static ext2_filsys backfs; +static int open_flags = EXT2_FLAG_64BITS | EXT2_FLAG_SKIP_MMP | + EXT2_FLAG_IGNORE_SB_ERRORS | EXT2_FLAG_SUPER_ONLY; + /* keep it less than LL_FID_NAMELEN */ #define DUMMY_FILE_NAME_LEN 25 #define EXT3_DIRENT_SIZE DUMMY_FILE_NAME_LEN @@ -132,33 +138,6 @@ out: return ret; } -static int is_feature_enabled(const char *feature, const char *devpath) -{ - char cmd[PATH_MAX]; - FILE *fp; - char enabled_features[4096] = ""; - int ret = 1; - - snprintf(cmd, sizeof(cmd), "%s -c -R features %s 2>&1", - DEBUGFS, devpath); - - /* Using popen() instead of run_command() since debugfs does - * not return proper error code if command is not supported */ - fp = popen(cmd, "r"); - if (!fp) { - fprintf(stderr, "%s: %s\n", progname, strerror(errno)); - return 0; - } - - ret = fread(enabled_features, 1, sizeof(enabled_features) - 1, fp); - enabled_features[ret] = '\0'; - pclose(fp); - - if (strstr(enabled_features, feature)) - return 1; - return 0; -} - /* Write the server config files */ int ldiskfs_write_ldd(struct mkfs_opts *mop) { @@ -181,20 +160,31 @@ int ldiskfs_write_ldd(struct mkfs_opts *mop) dev = mop->mo_loopdev; /* Multiple mount protection enabled if failover node specified */ - if (mop->mo_flags & MO_FAILOVER && - !is_feature_enabled("mmp", dev)) { - if (is_e2fsprogs_feature_supp("-O mmp")) { - char *command = filepnm; - - snprintf(command, sizeof(filepnm), - TUNE2FS" -O mmp '%s' >/dev/null 2>&1", dev); - ret = run_command(command, sizeof(filepnm)); - if (ret) - fprintf(stderr, - "%s: Unable to set 'mmp' on %s: %d\n", - progname, dev, ret); - } else { - disp_old_e2fsprogs_msg("mmp", 1); + if (mop->mo_flags & MO_FAILOVER) { + if (!backfs) + ext2fs_open(dev, open_flags, 0, 0, + unix_io_manager, &backfs); + if (!backfs || !ext2fs_has_feature_mmp(backfs->super)) { + if (is_e2fsprogs_feature_supp("-O mmp")) { + char *command = filepnm; + + snprintf(command, sizeof(filepnm), + TUNE2FS" -O mmp '%s' >/dev/null 2>&1", + dev); + ret = run_command(command, sizeof(filepnm)); + if (ret) + fprintf(stderr, + "%s: Unable to set 'mmp' " + "on %s: %d\n", + progname, dev, ret); + } else { + disp_old_e2fsprogs_msg("mmp", 1); + } + /* avoid stale cache after following operations */ + if (backfs) { + ext2fs_close(backfs); + backfs = NULL; + } } } @@ -271,51 +261,37 @@ static int readcmd(char *cmd, char *buf, int len) int ldiskfs_read_ldd(char *dev, struct lustre_disk_data *mo_ldd) { - char tmpdir[] = "/tmp/dirXXXXXX"; + errcode_t retval; + ext2_ino_t ino; + ext2_file_t file; + unsigned int got; char cmd[PATH_MAX]; - char filepnm[128]; - FILE *filep; int ret = 0; - int cmdsz = sizeof(cmd); - - /* Make a temporary directory to hold Lustre data files. */ - if (!mkdtemp(tmpdir)) { - fprintf(stderr, "%s: Can't create temporary directory %s: %s\n", - progname, tmpdir, strerror(errno)); - return errno; - } - - /* TODO: it's worth observing the get_mountdata() function that is - in mount_utils.c for getting the mountdata out of the - filesystem */ - /* Construct debugfs command line. */ - snprintf(cmd, cmdsz, "%s -c -R 'dump /%s %s/mountdata' '%s'", - DEBUGFS, MOUNT_DATA_FILE, tmpdir, dev); - - ret = run_command(cmd, cmdsz); - if (ret) - verrprint("%s: Unable to dump %s dir (%d)\n", - progname, MOUNT_CONFIGS_DIR, ret); - - sprintf(filepnm, "%s/mountdata", tmpdir); - filep = fopen(filepnm, "r"); - if (filep) { - size_t num_read; - vprint("Reading %s\n", MOUNT_DATA_FILE); - num_read = fread(mo_ldd, sizeof(*mo_ldd), 1, filep); - if (num_read < 1 && ferror(filep)) { - fprintf(stderr, "%s: Unable to read from file %s: %s\n", - progname, filepnm, strerror(errno)); + if (!backfs) { + retval = ext2fs_open(dev, open_flags, 0, 0, + unix_io_manager, &backfs); + if (retval) { + fprintf(stderr, "Unable to open fs on %s\n", dev); + goto read_label; } - fclose(filep); } - - snprintf(cmd, cmdsz, "rm -rf %s", tmpdir); - run_command(cmd, cmdsz); - if (ret) - verrprint("Failed to read old data (%d)\n", ret); - + retval = ext2fs_namei(backfs, EXT2_ROOT_INO, EXT2_ROOT_INO, + MOUNT_DATA_FILE, &ino); + if (retval) { + fprintf(stderr, "Error while looking up %s\n", MOUNT_DATA_FILE); + goto read_label; + } + retval = ext2fs_file_open(backfs, ino, 0, &file); + if (retval) { + fprintf(stderr, "Error while opening file %s\n", + MOUNT_DATA_FILE); + goto read_label; + } + retval = ext2fs_file_read(file, mo_ldd, sizeof(*mo_ldd), &got); + if (retval || got == 0) + fprintf(stderr, "Failed to read file %s\n", MOUNT_DATA_FILE); +read_label: /* As long as we at least have the label, we're good to go */ snprintf(cmd, sizeof(cmd), E2LABEL" %s", dev); ret = readcmd(cmd, mo_ldd->ldd_svname, sizeof(mo_ldd->ldd_svname) - 1); @@ -364,37 +340,20 @@ static void disp_old_e2fsprogs_msg(const char *feature, int make_backfs) /* Check whether the file exists in the device */ static int file_in_dev(char *file_name, char *dev_name) { - FILE *fp; - char debugfs_cmd[256]; - unsigned int inode_num; - int i; - - /* Construct debugfs command line. */ - snprintf(debugfs_cmd, sizeof(debugfs_cmd), - "%s -c -R 'stat %s' '%s' 2>&1 | egrep '(Inode|unsupported)'", - DEBUGFS, file_name, dev_name); - - fp = popen(debugfs_cmd, "r"); - if (!fp) { - fprintf(stderr, "%s: %s\n", progname, strerror(errno)); - return 0; - } + ext2_ino_t ino; + errcode_t retval; - if (fscanf(fp, "Inode: %u", &inode_num) == 1) { /* exist */ - pclose(fp); - return 1; - } - i = fread(debugfs_cmd, 1, sizeof(debugfs_cmd) - 1, fp); - if (i) { - debugfs_cmd[i] = 0; - fprintf(stderr, "%s", debugfs_cmd); - if (strstr(debugfs_cmd, "unsupported feature")) { - disp_old_e2fsprogs_msg("an unknown", 0); - } - pclose(fp); - return -1; + if (!backfs) { + retval = ext2fs_open(dev_name, open_flags, 0, 0, + unix_io_manager, &backfs); + if (retval) + return 0; } - pclose(fp); + retval = ext2fs_namei(backfs, EXT2_ROOT_INO, EXT2_ROOT_INO, + file_name, &ino); + if (!retval) + return 1; + return 0; } @@ -1422,7 +1381,9 @@ int ldiskfs_enable_quota(struct mkfs_opts *mop) dev = mop->mo_loopdev; /* Quota feature is already enabled? */ - if (is_feature_enabled("quota", dev)) { + if (!backfs) + ext2fs_open(dev, open_flags, 0, 0, unix_io_manager, &backfs); + if (backfs && ext2fs_has_feature_quota(backfs->super)) { vprint("Quota feature is already enabled.\n"); return 0; } @@ -1446,7 +1407,10 @@ int ldiskfs_init(void) void ldiskfs_fini(void) { - return; + if (backfs) { + ext2fs_close(backfs); + backfs = NULL; + } } #ifndef PLUGIN_DIR -- 1.8.3.1