X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Futils%2Flustre_lfsck.c;h=5e4893299ee0590b9c1d576d480beb3f8ce8f37b;hb=c30da8bfa199205194eefca2c5d2e6843a29a34b;hp=2c0f369aaeee4c8b17223d48edb6f9048da78784;hpb=17cc912fd5b40965d14a89a268cbf2d63b2fe21b;p=fs%2Flustre-release.git diff --git a/lustre/utils/lustre_lfsck.c b/lustre/utils/lustre_lfsck.c index 2c0f369..5e48932 100644 --- a/lustre/utils/lustre_lfsck.c +++ b/lustre/utils/lustre_lfsck.c @@ -20,7 +20,7 @@ * GPL HEADER END */ /* - * Copyright (c) 2012, 2016, Intel Corporation. + * Copyright (c) 2012, 2017, Intel Corporation. */ /* * lustre/utils/lustre_lfsck.c @@ -40,63 +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'}, - {"delay_create_ostobj", optional_argument, 0, 'd'}, - {"delay-create-ostobj", optional_argument, 0, 'd'}, - {"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) { @@ -123,7 +122,7 @@ 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" " [-A | --all] [-c | --create_ostobj [on | off]]\n" @@ -158,7 +157,7 @@ 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" " [-A | --all] [-h | --help]\n" @@ -171,7 +170,7 @@ 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" " [-t | --type check_type[,check_type...]]\n" @@ -204,6 +203,7 @@ static int lfsck_get_dev_name(struct obd_ioctl_data *data, char *device, int types, bool multipe_devices) { glob_t param = { 0 }; + size_t count = 0; char *ptr; int rc; int i; @@ -227,7 +227,16 @@ static int lfsck_get_dev_name(struct obd_ioctl_data *data, char *device, } } - if (param.gl_pathc == 1) + /* we have both sysfs and debugfs entries so to get the correct number + * of devices only count the entries in the sysfs tree + */ + for (i = 0; i < param.gl_pathc; i++) { + if (strstr(param.gl_pathv[i], "/sys/kernel/debug/lustre")) + continue; + count++; + } + + if (count == 1) goto pack; if (!multipe_devices) { @@ -240,12 +249,22 @@ static int lfsck_get_dev_name(struct obd_ioctl_data *data, char *device, } ptr = strrchr(param.gl_pathv[0], '-'); - LASSERT(ptr != NULL); + if (ptr == NULL) { + rc = -EINVAL; + goto out; + } for (i = 1; i < param.gl_pathc; i++) { - char *ptr2 = strrchr(param.gl_pathv[i], '-'); + char *ptr2; + + if (strstr(param.gl_pathv[i], "/sys/kernel/debug/lustre")) + continue; - LASSERT(ptr2 != NULL); + 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], @@ -274,7 +293,7 @@ int jt_lfsck_start(int argc, char **argv) char rawbuf[MAX_IOC_BUFLEN], *buf = rawbuf; char device[MAX_OBD_NAME]; struct lfsck_start start; - char *optstring = "Ac::C::d::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)); @@ -286,7 +305,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': @@ -431,7 +450,7 @@ bad_type: 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; @@ -443,7 +462,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) { @@ -464,7 +483,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)); @@ -474,7 +493,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': @@ -504,7 +523,7 @@ int jt_lfsck_stop(int argc, char **argv) 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; @@ -581,7 +600,7 @@ bad_type: 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; @@ -593,7 +612,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; @@ -610,7 +629,8 @@ bad_type: printf("%s_osts_%s: %d\n", name, lfsck_status2name(j), query.lu_osts_count[i][j]); - printf("%s_repaired: %llu\n", name, query.lu_repaired[i]); + printf("%s_repaired: %llu\n", name, + (unsigned long long)query.lu_repaired[i]); } return 0;