X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Futils%2Flustre_lfsck.c;h=e48600040788a539fc16ee6879eaf3bef3a657ff;hb=5b468e20ecc0b77460444393d1bb41867d99899d;hp=7937ca1c4940026b57862e7e634bf6fca2c34fbe;hpb=9f0a59237e9ed5ffa56d6e6bb7ea95fb3d232bea;p=fs%2Flustre-release.git diff --git a/lustre/utils/lustre_lfsck.c b/lustre/utils/lustre_lfsck.c index 7937ca1..e486000 100644 --- a/lustre/utils/lustre_lfsck.c +++ b/lustre/utils/lustre_lfsck.c @@ -20,7 +20,7 @@ * GPL HEADER END */ /* - * Copyright (c) 2012, 2015, Intel Corporation. + * Copyright (c) 2012, 2017, Intel Corporation. */ /* * lustre/utils/lustre_lfsck.c @@ -40,60 +40,62 @@ #include #include "obdctl.h" +#include "lustreapi_internal.h" -#include -#include -#include +#include +#include +#include /* Needs to be last to avoid clashes */ #include +#include static struct option long_opt_start[] = { - {"device", required_argument, 0, 'M'}, - {"all", no_argument, 0, 'A'}, - {"create_ostobj", optional_argument, 0, 'c'}, - {"create-ostobj", optional_argument, 0, 'c'}, - {"create_mdtobj", optional_argument, 0, 'C'}, - {"create-mdtobj", optional_argument, 0, 'C'}, - {"error", required_argument, 0, 'e'}, - {"help", no_argument, 0, 'h'}, - {"dryrun", optional_argument, 0, 'n'}, - {"orphan", no_argument, 0, 'o'}, - {"reset", no_argument, 0, 'r'}, - {"speed", required_argument, 0, 's'}, - {"type", required_argument, 0, 't'}, - {"window_size", required_argument, 0, 'w'}, - {"window-size", required_argument, 0, 'w'}, - {0, 0, 0, 0 } -}; +{ .val = 'A', .name = "all", .has_arg = no_argument }, +{ .val = 'c', .name = "create_ostobj", .has_arg = optional_argument }, +{ .val = 'c', .name = "create-ostobj", .has_arg = optional_argument }, +{ .val = 'C', .name = "create_mdtobj", .has_arg = optional_argument }, +{ .val = 'C', .name = "create-mdtobj", .has_arg = optional_argument }, +{ .val = 'd', .name = "delay_create_ostobj", .has_arg = optional_argument }, +{ .val = 'd', .name = "delay-create-ostobj", .has_arg = optional_argument }, +{ .val = 'e', .name = "error", .has_arg = required_argument }, +{ .val = 'h', .name = "help", .has_arg = no_argument }, +{ .val = 'M', .name = "device", .has_arg = required_argument }, +{ .val = 'n', .name = "dryrun", .has_arg = optional_argument }, +{ .val = 'o', .name = "orphan", .has_arg = no_argument }, +{ .val = 'r', .name = "reset", .has_arg = no_argument }, +{ .val = 's', .name = "speed", .has_arg = required_argument }, +{ .val = 't', .name = "type", .has_arg = required_argument }, +{ .val = 'w', .name = "window_size", .has_arg = required_argument }, +{ .val = 'w', .name = "window-size", .has_arg = required_argument }, +{ .name = NULL } }; static struct option long_opt_stop[] = { - {"device", required_argument, 0, 'M'}, - {"all", no_argument, 0, 'A'}, - {"help", no_argument, 0, 'h'}, - {0, 0, 0, 0 } -}; + { .val = 'A', .name = "all", .has_arg = no_argument }, + { .val = 'h', .name = "help", .has_arg = no_argument }, + { .val = 'M', .name = "device", .has_arg = required_argument }, + { .name = NULL } }; static struct option long_opt_query[] = { - {"device", required_argument, 0, 'M'}, - {"type", required_argument, 0, 't'}, - {"help", no_argument, 0, 'h'}, - {"wait", no_argument, 0, 'w'}, - {0, 0, 0, 0 } -}; + { .val = 'h', .name = "help", .has_arg = no_argument }, + { .val = 'M', .name = "device", .has_arg = required_argument }, + { .val = 't', .name = "type", .has_arg = required_argument }, + { .val = 'w', .name = "wait", .has_arg = no_argument }, + { .name = NULL } }; struct lfsck_type_name { char *ltn_name; enum lfsck_type ltn_type; }; +/* Note types must be in order of increasing value so we can iterate through + * this correctly. See enum lfsck_type for values. LU-9894. */ static struct lfsck_type_name lfsck_types_names[] = { - { "scrub", LFSCK_TYPE_SCRUB }, - { "layout", LFSCK_TYPE_LAYOUT }, - { "namespace", LFSCK_TYPE_NAMESPACE }, - { "default", LFSCK_TYPES_DEF }, - { "all", LFSCK_TYPES_SUPPORTED }, - { NULL, 0 } -}; + { .ltn_name = "layout", .ltn_type = LFSCK_TYPE_LAYOUT }, + { .ltn_name = "namespace", .ltn_type = LFSCK_TYPE_NAMESPACE }, + { .ltn_name = "scrub", .ltn_type = LFSCK_TYPE_SCRUB }, + { .ltn_name = "all", .ltn_type = LFSCK_TYPES_SUPPORTED }, + { .ltn_name = "default", .ltn_type = LFSCK_TYPES_DEF }, + { .ltn_name = NULL } }; static enum lfsck_type lfsck_name2type(const char *name) { @@ -120,11 +122,12 @@ static const char *lfsck_type2name(__u16 type) static void usage_start(void) { - fprintf(stderr, "start LFSCK\n" + fprintf(stdout, "start LFSCK\n" "usage:\n" - "lfsck_start <-M | --device {MDT,OST}_device>\n" + "lfsck_start [-M | --device {MDT,OST}_device]\n" " [-A | --all] [-c | --create_ostobj [on | off]]\n" " [-C | --create_mdtobj [on | off]]\n" + " [-d | --delay_create_ostobj [on | off]]\n" " [-e | --error {continue | abort}] [-h | --help]\n" " [-n | --dryrun [on | off]] [-o | --orphan]\n" " [-r | --reset] [-s | --speed ops_per_sec_limit]\n" @@ -138,6 +141,8 @@ static void usage_start(void) "(default 'off', or 'on')\n" "-C: create the lost MDT-object for dangling name entry " "(default 'off', or 'on')\n" + "-d: delay create the lost OST-object for dangling LOV EA " + "until orphan OST-objects handled (default 'off', or 'on')\n" "-e: error handle mode (default 'continue', or 'abort')\n" "-h: this help message\n" "-n: check with no modification (default 'off', or 'on')\n" @@ -152,9 +157,9 @@ static void usage_start(void) static void usage_stop(void) { - fprintf(stderr, "stop LFSCK\n" + fprintf(stdout, "stop LFSCK\n" "usage:\n" - "lfsck_stop <-M | --device {MDT,OST}_device>\n" + "lfsck_stop [-M | --device {MDT,OST}_device]\n" " [-A | --all] [-h | --help]\n" "options:\n" "-M: device to stop LFSCK/scrub on\n" @@ -165,9 +170,9 @@ static void usage_stop(void) static void usage_query(void) { - fprintf(stderr, "check the LFSCK global status\n" + fprintf(stdout, "check the LFSCK global status\n" "usage:\n" - "lfsck_query <-M | --device MDT_device> [-h | --help]\n" + "lfsck_query [-M | --device MDT_device] [-h | --help]\n" " [-t | --type check_type[,check_type...]]\n" " [-t | --wait]\n" "options:\n" @@ -194,13 +199,87 @@ static int lfsck_pack_dev(struct obd_ioctl_data *data, char *device, char *arg) return 0; } +static int lfsck_get_dev_name(struct obd_ioctl_data *data, char *device, + int types, bool multipe_devices) +{ + glob_t param = { 0 }; + char *ptr; + int rc; + int i; + + rc = cfs_get_param_paths(¶m, "mdd/*-MDT*"); + if (rc) { + if (multipe_devices || errno != ENOENT || + types & LFSCK_TYPE_NAMESPACE) { + fprintf(stderr, "Fail to get device name: rc = %d\n." + "You can specify the device explicitly " + "via '-M' option.\n", rc); + return rc; + } + + rc = cfs_get_param_paths(¶m, "obdfilter/*-OST*"); + if (rc) { + fprintf(stderr, "Fail to get device name: rc = %d\n." + "You can specify the device explicitly " + "via '-M' option.\n", rc); + return rc; + } + } + + if (param.gl_pathc == 1) + goto pack; + + if (!multipe_devices) { + fprintf(stderr, + "Detect multiple devices on current node. " + "Please specify the device explicitly " + "via '-M' option or '-A' option for all.\n"); + rc = -EINVAL; + goto out; + } + + ptr = strrchr(param.gl_pathv[0], '-'); + if (ptr == NULL) { + rc = -EINVAL; + goto out; + } + + for (i = 1; i < param.gl_pathc; i++) { + char *ptr2 = strrchr(param.gl_pathv[i], '-'); + + if (ptr2 == NULL) { + rc = -EINVAL; + goto out; + } + + if ((ptr - param.gl_pathv[0]) != (ptr2 - param.gl_pathv[i]) || + strncmp(param.gl_pathv[0], param.gl_pathv[i], + (ptr - param.gl_pathv[0])) != 0) { + fprintf(stderr, + "Detect multiple filesystems on current node. " + "Please specify the device explicitly " + "via '-M' option.\n"); + rc = -EINVAL; + goto out; + } + } + +pack: + rc = lfsck_pack_dev(data, device, basename(param.gl_pathv[0])); + +out: + cfs_free_param_data(¶m); + + return rc; +} + int jt_lfsck_start(int argc, char **argv) { struct obd_ioctl_data data; char rawbuf[MAX_IOC_BUFLEN], *buf = rawbuf; char device[MAX_OBD_NAME]; struct lfsck_start start; - char *optstring = "Ac::C::e:hM:n::ors:t:w:"; + char *short_opts = "Ac::C::d::e:hM:n::ors:t:w:"; int opt, index, rc, val, i; memset(&data, 0, sizeof(data)); @@ -212,7 +291,7 @@ int jt_lfsck_start(int argc, char **argv) /* Reset the 'optind' for the case of getopt_long() called multiple * times under the same lctl. */ optind = 0; - while ((opt = getopt_long(argc, argv, optstring, long_opt_start, + while ((opt = getopt_long(argc, argv, short_opts, long_opt_start, &index)) != EOF) { switch (opt) { case 'A': @@ -244,6 +323,19 @@ int jt_lfsck_start(int argc, char **argv) } start.ls_valid |= LSV_CREATE_MDTOBJ; break; + case 'd': + if (optarg == NULL || strcmp(optarg, "on") == 0) { + start.ls_flags |= LPF_DELAY_CREATE_OSTOBJ; + } else if (strcmp(optarg, "off") != 0) { + fprintf(stderr, "invalid switch: -c '%s'. " + "valid switches are:\n" + "empty ('on'), or 'off' without space. " + "For example:\n" + "'-c', '-con', '-coff'\n", optarg); + return -EINVAL; + } + start.ls_valid |= LSV_DELAY_CREATE_OSTOBJ; + break; case 'e': if (strcmp(optarg, "abort") == 0) { start.ls_flags |= LPF_FAILOUT; @@ -335,21 +427,16 @@ bad_type: start.ls_active = LFSCK_TYPES_DEF; if (data.ioc_inlbuf4 == NULL) { - if (lcfg_get_devname() != NULL) { - rc = lfsck_pack_dev(&data, device, lcfg_get_devname()); - if (rc != 0) - return rc; - } else { - fprintf(stderr, - "Must specify device to start LFSCK.\n"); - return -EINVAL; - } + rc = lfsck_get_dev_name(&data, device, start.ls_active, + start.ls_flags & LPF_ALL_TGT); + if (rc != 0) + return rc; } data.ioc_inlbuf1 = (char *)&start; data.ioc_inllen1 = sizeof(start); memset(buf, 0, sizeof(rawbuf)); - rc = obd_ioctl_pack(&data, &buf, sizeof(rawbuf)); + rc = llapi_ioctl_pack(&data, &buf, sizeof(rawbuf)); if (rc != 0) { fprintf(stderr, "Fail to pack ioctl data: rc = %d.\n", rc); return rc; @@ -361,7 +448,7 @@ bad_type: return rc; } - obd_ioctl_unpack(&data, buf, sizeof(rawbuf)); + llapi_ioctl_unpack(&data, buf, sizeof(rawbuf)); printf("Started LFSCK on the device %s: scrub", device); for (i = 0; lfsck_types_names[i].ltn_name != NULL; i++) { if (start.ls_active & lfsck_types_names[i].ltn_type) { @@ -382,7 +469,7 @@ int jt_lfsck_stop(int argc, char **argv) char rawbuf[MAX_IOC_BUFLEN], *buf = rawbuf; char device[MAX_OBD_NAME]; struct lfsck_stop stop; - char *optstring = "AhM:"; + char *short_opts = "AhM:"; int opt, index, rc; memset(&data, 0, sizeof(data)); @@ -392,7 +479,7 @@ int jt_lfsck_stop(int argc, char **argv) /* Reset the 'optind' for the case of getopt_long() called multiple * times under the same lctl. */ optind = 0; - while ((opt = getopt_long(argc, argv, optstring, long_opt_stop, + while ((opt = getopt_long(argc, argv, short_opts, long_opt_stop, &index)) != EOF) { switch (opt) { case 'A': @@ -413,21 +500,16 @@ int jt_lfsck_stop(int argc, char **argv) } if (data.ioc_inlbuf4 == NULL) { - if (lcfg_get_devname() != NULL) { - rc = lfsck_pack_dev(&data, device, lcfg_get_devname()); - if (rc != 0) - return rc; - } else { - fprintf(stderr, - "Must specify device to stop LFSCK.\n"); - return -EINVAL; - } + rc = lfsck_get_dev_name(&data, device, 0, + stop.ls_flags & LPF_ALL_TGT); + if (rc != 0) + return rc; } data.ioc_inlbuf1 = (char *)&stop; data.ioc_inllen1 = sizeof(stop); memset(buf, 0, sizeof(rawbuf)); - rc = obd_ioctl_pack(&data, &buf, sizeof(rawbuf)); + rc = llapi_ioctl_pack(&data, &buf, sizeof(rawbuf)); if (rc != 0) { fprintf(stderr, "Fail to pack ioctl data: rc = %d.\n", rc); return rc; @@ -496,21 +578,15 @@ bad_type: } if (data.ioc_inlbuf4 == NULL) { - if (lcfg_get_devname() != NULL) { - rc = lfsck_pack_dev(&data, device, lcfg_get_devname()); - if (rc != 0) - return rc; - } else { - fprintf(stderr, - "Must specify device to query LFSCK.\n"); - return -EINVAL; - } + rc = lfsck_get_dev_name(&data, device, 0, true); + if (rc != 0) + return rc; } data.ioc_inlbuf1 = (char *)&query; data.ioc_inllen1 = sizeof(query); memset(buf, 0, sizeof(rawbuf)); - rc = obd_ioctl_pack(&data, &buf, sizeof(rawbuf)); + rc = llapi_ioctl_pack(&data, &buf, sizeof(rawbuf)); if (rc != 0) { fprintf(stderr, "Fail to pack ioctl data: rc = %d.\n", rc); return rc; @@ -522,7 +598,7 @@ bad_type: return rc; } - obd_ioctl_unpack(&data, buf, sizeof(rawbuf)); + llapi_ioctl_unpack(&data, buf, sizeof(rawbuf)); for (i = 0, type = 1 << i; i < LFSCK_TYPE_BITS; i++, type = 1 << i) { const char *name; int j;