X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre%2Futils%2Flfs.c;h=699d73e6e10ca96a4d3683771b9ac978ef89d1b2;hp=cb684a1f45d57ab8a67879a11b17756d07fb5cda;hb=3b84a1ee5213563945225854a50e9037bb9646db;hpb=7936ec229c7f62cfbf5a0e4ff5933149967e7c8f diff --git a/lustre/utils/lfs.c b/lustre/utils/lfs.c index cb684a1..699d73e 100644 --- a/lustre/utils/lfs.c +++ b/lustre/utils/lfs.c @@ -27,7 +27,7 @@ * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved. * Use is subject to license terms. * - * Copyright (c) 2011, 2013, Intel Corporation. + * Copyright (c) 2011, 2014, Intel Corporation. */ /* * This file is part of Lustre, http://www.lustre.org/ @@ -66,11 +66,10 @@ #endif #include -#include -#include +#include +#include #include #include -#include "obdctl.h" /* all functions */ static int lfs_setstripe(int argc, char **argv); @@ -117,21 +116,43 @@ static int lfs_hsm_cancel(int argc, char **argv); static int lfs_swap_layouts(int argc, char **argv); static int lfs_mv(int argc, char **argv); -#define SETSTRIPE_USAGE(_cmd, _tgt) \ - "usage: "_cmd" [--stripe-count|-c ]\n"\ - " [--stripe-index|-i ]\n"\ - " [--stripe-size|-S ]\n"\ - " [--pool|-p ]\n"\ - " [--block|-b] "_tgt"\n"\ - "\tstripe_size: Number of bytes on each OST (0 filesystem default)\n"\ - "\t Can be specified with k, m or g (in KB, MB and GB\n"\ - "\t respectively)\n"\ - "\tstart_ost_idx: OST index of first stripe (-1 default)\n"\ - "\tstripe_count: Number of OSTs to stripe over (0 default, -1 all)\n"\ - "\tpool_name: Name of OST pool to use (default none)\n"\ - "\tblock: Block file access during data migration" - -/* all avaialable commands */ +/* Setstripe and migrate share mostly the same parameters */ +#define SSM_CMD_COMMON(cmd) \ + "usage: "cmd" [--stripe-count|-c ]\n" \ + " [--stripe-index|-i ]\n" \ + " [--stripe-size|-S ]\n" \ + " [--pool|-p ]\n" \ + " [--ost-list|-o ]\n" + +#define SSM_HELP_COMMON \ + "\tstripe_size: Number of bytes on each OST (0 filesystem default)\n" \ + "\t Can be specified with k, m or g (in KB, MB and GB\n" \ + "\t respectively)\n" \ + "\tstart_ost_idx: OST index of first stripe (-1 default)\n" \ + "\tstripe_count: Number of OSTs to stripe over (0 default, -1 all)\n" \ + "\tpool_name: Name of OST pool to use (default none)\n" \ + "\tost_indices: List of OST indices, can be repeated multiple times\n"\ + "\t Indices be specified in a format of:\n" \ + "\t -o ,-,\n" \ + "\t Or:\n" \ + "\t -o -o - -o \n" \ + "\t If --pool is set with --ost-list, then the OSTs\n" \ + "\t must be the members of the pool." + +#define SETSTRIPE_USAGE \ + SSM_CMD_COMMON("setstripe") \ + " \n" \ + SSM_HELP_COMMON + +#define MIGRATE_USAGE \ + SSM_CMD_COMMON("migrate ") \ + " [--block|-b]\n" \ + " \n" \ + SSM_HELP_COMMON \ + "\n" \ + "\tblock: Block file access during data migration\n" \ + +/* all available commands */ command_t cmdlist[] = { {"setstripe", lfs_setstripe, 0, "Create a new file with a specific striping pattern or\n" @@ -139,7 +160,7 @@ command_t cmdlist[] = { "delete the default striping pattern from an existing directory\n" "usage: setstripe -d (to delete default striping)\n"\ " or\n" - SETSTRIPE_USAGE("setstripe", "")}, + SETSTRIPE_USAGE}, {"getstripe", lfs_getstripe, 0, "To list the striping info for a given file or files in a\n" "directory or recursively for all files in a directory tree.\n" @@ -150,16 +171,18 @@ command_t cmdlist[] = { " [--layout|-L]\n" " ..."}, {"setdirstripe", lfs_setdirstripe, 0, - "To create a remote directory on a specified MDT.\n" + "To create a striped directory on a specified MDT. This can only\n" + "be done on MDT0 with the right of administrator.\n" "usage: setdirstripe <--count|-c stripe_count>\n" - "[--index|-i mdt_index] [--hash-type|-t hash_type]\n" - "[--default_stripe|-D ] \n" + " [--index|-i mdt_index] [--hash-type|-t hash_type]\n" + " [--default_stripe|-D ] [--mode|-m mode] \n" "\tstripe_count: stripe count of the striped directory\n" "\tmdt_index: MDT index of first stripe\n" "\thash_type: hash type of the striped directory. Hash types:\n" - " -t fnv_1a_64 FNV-1a hash algorithm(default)\n" - " -t all_char sum of characters % MDT_COUNT. (not recommended)\n" - "\tdefault_stripe: set default dirstripe of the directory\n"}, + " fnv_1a_64 FNV-1a hash algorithm (default)\n" + " all_char sum of characters % MDT_COUNT (not recommended)\n" + "\tdefault_stripe: set default dirstripe of the directory\n" + "\tmode: the mode of the directory\n"}, {"getdirstripe", lfs_getdirstripe, 0, "To list the striping info for a given directory\n" "or recursively for all directories in a directory tree.\n" @@ -167,10 +190,18 @@ command_t cmdlist[] = { " [--count|-c ] [--index|-i ] [--raw|-R]\n" " [--recursive | -r] [ --default_stripe | -D ] "}, {"mkdir", lfs_setdirstripe, 0, - "To create a remote directory on a specified MDT. And this can only\n" - "be done on MDT0 by administrator.\n" - "usage: mkdir <--index|-i mdt_index> \n" - "\tmdt_index: MDT index of the remote directory.\n"}, + "To create a striped directory on a specified MDT. This can only\n" + "be done on MDT0 with the right of administrator.\n" + "usage: mkdir <--count|-c stripe_count>\n" + " [--index|-i mdt_index] [--hash-type|-t hash_type]\n" + " [--default_stripe|-D ] [--mode|-m mode] \n" + "\tstripe_count: stripe count of the striped directory\n" + "\tmdt_index: MDT index of first stripe\n" + "\thash_type: hash type of the striped directory. Hash types:\n" + " fnv_1a_64 FNV-1a hash algorithm (default)\n" + " all_char sum of characters % MDT_COUNT (not recommended)\n" + "\tdefault_stripe: set default dirstripe of the directory\n" + "\tmode: the mode of the directory\n"}, {"rm_entry", lfs_rmentry, 0, "To remove the name entry of the remote directory. Note: This\n" "command will only delete the name entry, i.e. the remote directory\n" @@ -290,7 +321,7 @@ command_t cmdlist[] = { "usage: fid2path [--link ] ..." /* [ --rec ] */ }, {"path2fid", lfs_path2fid, 0, "Display the fid(s) for a given path(s).\n" - "usage: path2fid ..."}, + "usage: path2fid [--parents] ..."}, {"data_version", lfs_data_version, 0, "Display file data version for " "a given path.\n" "usage: data_version -[n|r|w] "}, {"hsm_state", lfs_hsm_state, 0, "Display the HSM information (states, " @@ -323,8 +354,8 @@ command_t cmdlist[] = { {"swap_layouts", lfs_swap_layouts, 0, "Swap layouts between 2 files.\n" "usage: swap_layouts "}, {"migrate", lfs_setstripe, 0, "migrate file from one OST layout to " - "another (may be not safe with concurent writes).\n" - SETSTRIPE_USAGE("migrate ", "")}, + "another (may be not safe with concurrent writes).\n" + MIGRATE_USAGE}, {"mv", lfs_mv, 0, "To move directories between MDTs.\n" "usage: mv [--mdt-index|-M] " @@ -332,18 +363,19 @@ command_t cmdlist[] = { {"help", Parser_help, 0, "help"}, {"exit", Parser_quit, 0, "quit"}, {"quit", Parser_quit, 0, "quit"}, + {"--version", Parser_version, 0, + "output build version of the utility and exit"}, { 0, 0, 0, NULL } }; #define MIGRATION_BLOCKS 1 -static int lfs_migrate(char *name, unsigned long long stripe_size, - int stripe_offset, int stripe_count, - int stripe_pattern, char *pool_name, - __u64 migration_flags) +static int lfs_migrate(char *name, __u64 migration_flags, + struct llapi_stripe_param *param) { int fd, fdv; - char volatile_file[PATH_MAX]; + char volatile_file[PATH_MAX + + LUSTRE_VOLATILE_HDR_LEN + 4]; char parent[PATH_MAX]; char *ptr; int rc; @@ -354,7 +386,7 @@ static int lfs_migrate(char *name, unsigned long long stripe_size, void *buf = NULL; int rsize, wsize; __u64 rpos, wpos, bufoff; - int gid = 0, sz; + int gid; int have_gl = 0; struct stat st, stv; @@ -367,9 +399,9 @@ static int lfs_migrate(char *name, unsigned long long stripe_size, } rc = llapi_file_get_stripe(name, lum); - /* failure can come from may case and some may be not real error + /* failure can happen for many reasons and some may be not real errors * (eg: no stripe) - * in case of a real error, a later call will failed with a better + * in case of a real error, a later call will fail with better * error management */ if (rc < 0) bufsz = 1024*1024; @@ -381,26 +413,6 @@ static int lfs_migrate(char *name, unsigned long long stripe_size, goto free; } - if (migration_flags & MIGRATION_BLOCKS) { - /* generate a random id for the grouplock */ - fd = open("/dev/urandom", O_RDONLY); - if (fd == -1) { - rc = -errno; - fprintf(stderr, "cannot open /dev/urandom (%s)\n", - strerror(-rc)); - goto free; - } - sz = sizeof(gid); - rc = read(fd, &gid, sz); - close(fd); - if (rc < sz) { - rc = -errno; - fprintf(stderr, "cannot read %d bytes from" - " /dev/urandom (%s)\n", sz, strerror(-rc)); - goto free; - } - } - /* search for file directory pathname */ if (strlen(name) > sizeof(parent)-1) { rc = -E2BIG; @@ -419,14 +431,18 @@ static int lfs_migrate(char *name, unsigned long long stripe_size, else *ptr = '\0'; } - sprintf(volatile_file, "%s/%s::", parent, LUSTRE_VOLATILE_HDR); + rc = snprintf(volatile_file, sizeof(volatile_file), "%s/%s::", parent, + LUSTRE_VOLATILE_HDR); + if (rc >= sizeof(volatile_file)) { + rc = -E2BIG; + goto free; + } /* create, open a volatile file, use caching (ie no directio) */ /* exclusive create is not needed because volatile files cannot * conflict on name by construction */ - fdv = llapi_file_open_pool(volatile_file, O_CREAT | O_WRONLY, - 0644, stripe_size, stripe_offset, - stripe_count, stripe_pattern, pool_name); + fdv = llapi_file_open_param(volatile_file, O_CREAT | O_WRONLY, 0644, + param); if (fdv < 0) { rc = fdv; fprintf(stderr, "cannot create volatile file in %s (%s)\n", @@ -481,14 +497,17 @@ static int lfs_migrate(char *name, unsigned long long stripe_size, goto error; } + do + gid = random(); + while (gid == 0); if (migration_flags & MIGRATION_BLOCKS) { - /* take group lock to limit concurent access + /* take group lock to limit concurrent access * this will be no more needed when exclusive access will * be implemented (see LU-2919) */ /* group lock is taken after data version read because it * blocks data version call */ - if (ioctl(fd, LL_IOC_GROUP_LOCK, gid) == -1) { - rc = -errno; + rc = llapi_group_lock(fd, gid); + if (rc < 0) { fprintf(stderr, "cannot get group lock on %s (%s)\n", name, strerror(-rc)); goto error; @@ -535,11 +554,10 @@ static int lfs_migrate(char *name, unsigned long long stripe_size, if (migration_flags & MIGRATION_BLOCKS) { /* give back group lock */ - if (ioctl(fd, LL_IOC_GROUP_UNLOCK, gid) == -1) { - rc = -errno; + rc = llapi_group_unlock(fd, gid); + if (rc < 0) fprintf(stderr, "cannot put group lock on %s (%s)\n", name, strerror(-rc)); - } have_gl = 0; } @@ -564,11 +582,14 @@ static int lfs_migrate(char *name, unsigned long long stripe_size, error: /* give back group lock */ - if ((migration_flags & MIGRATION_BLOCKS) && have_gl && - (ioctl(fd, LL_IOC_GROUP_UNLOCK, gid) == -1)) { - /* we keep in rc the original error */ - fprintf(stderr, "cannot put group lock on %s (%s)\n", - name, strerror(-errno)); + if ((migration_flags & MIGRATION_BLOCKS) && have_gl) { + int rc2; + + /* we keep the original error in rc */ + rc2 = llapi_group_unlock(fd, gid); + if (rc2 < 0) + fprintf(stderr, "cannot put group lock on %s (%s)\n", + name, strerror(-rc2)); } close(fdv); @@ -581,23 +602,110 @@ free: return rc; } +/** + * Parse a string containing an OST index list into an array of integers. + * + * The input string contains a comma delimited list of individual + * indices and ranges, for example "1,2-4,7". Add the indices into the + * \a osts array and remove duplicates. + * + * \param[out] osts array to store indices in + * \param[in] size size of \a osts array + * \param[in] offset starting index in \a osts + * \param[in] arg string containing OST index list + * + * \retval positive number of indices in \a osts + * \retval -EINVAL unable to parse \a arg + */ +static int parse_targets(__u32 *osts, int size, int offset, char *arg) +{ + int rc; + int nr = offset; + int slots = size - offset; + char *ptr = NULL; + bool end_of_loop; + + if (arg == NULL) + return -EINVAL; + + end_of_loop = false; + while (!end_of_loop) { + int start_index; + int end_index; + int i; + char *endptr = NULL; + + rc = -EINVAL; + + ptr = strchrnul(arg, ','); + + end_of_loop = *ptr == '\0'; + *ptr = '\0'; + + start_index = strtol(arg, &endptr, 0); + if (endptr == arg) /* no data at all */ + break; + if (*endptr != '-' && *endptr != '\0') /* has invalid data */ + break; + if (start_index < 0) + break; + + end_index = start_index; + if (*endptr == '-') { + end_index = strtol(endptr + 1, &endptr, 0); + if (*endptr != '\0') + break; + if (end_index < start_index) + break; + } + + for (i = start_index; i <= end_index && slots > 0; i++) { + int j; + + /* remove duplicate */ + for (j = 0; j < offset; j++) { + if (osts[j] == i) + break; + } + if (j == offset) { /* no duplicate */ + osts[nr++] = i; + --slots; + } + } + if (slots == 0 && i < end_index) + break; + + *ptr = ','; + arg = ++ptr; + offset = nr; + rc = 0; + } + if (!end_of_loop && ptr != NULL) + *ptr = ','; + + return rc < 0 ? rc : nr; +} + /* functions */ static int lfs_setstripe(int argc, char **argv) { - char *fname; - int result; - unsigned long long st_size; - int st_offset, st_count; - char *end; - int c; - int delete = 0; - char *stripe_size_arg = NULL; - char *stripe_off_arg = NULL; - char *stripe_count_arg = NULL; - char *pool_name_arg = NULL; - unsigned long long size_units = 1; - int migrate_mode = 0; - __u64 migration_flags = 0; + struct llapi_stripe_param *param; + char *fname; + int result; + unsigned long long st_size; + int st_offset, st_count; + char *end; + int c; + int delete = 0; + char *stripe_size_arg = NULL; + char *stripe_off_arg = NULL; + char *stripe_count_arg = NULL; + char *pool_name_arg = NULL; + unsigned long long size_units = 1; + bool migrate_mode = false; + __u64 migration_flags = 0; + __u32 osts[LOV_MAX_STRIPE_COUNT] = { 0 }; + int nr_osts = 0; struct option long_opts[] = { /* valid only in migrate mode */ @@ -619,12 +727,8 @@ static int lfs_setstripe(int argc, char **argv) #endif {"stripe-index", required_argument, 0, 'i'}, {"stripe_index", required_argument, 0, 'i'}, -#if LUSTRE_VERSION_CODE < OBD_OCD_VERSION(2, 9, 53, 0) - /* This formerly implied "stripe-index", but was confusing - * with "file offset" (which will eventually be needed for - * with different layouts by offset), so deprecate it. */ - {"offset", required_argument, 0, 'o'}, -#endif + {"ost-list", required_argument, 0, 'o'}, + {"ost_list", required_argument, 0, 'o'}, {"pool", required_argument, 0, 'p'}, #if LUSTRE_VERSION_CODE < OBD_OCD_VERSION(2, 9, 53, 0) /* This formerly implied "--stripe-size", but was confusing @@ -637,22 +741,21 @@ static int lfs_setstripe(int argc, char **argv) {0, 0, 0, 0} }; - st_size = 0; - st_offset = -1; - st_count = 0; + st_size = 0; + st_offset = -1; + st_count = 0; if (strcmp(argv[0], "migrate") == 0) - migrate_mode = 1; + migrate_mode = true; - optind = 0; - while ((c = getopt_long(argc, argv, "c:di:o:p:s:S:", + while ((c = getopt_long(argc, argv, "bc:di:o:p:s:S:", long_opts, NULL)) >= 0) { switch (c) { case 0: /* Long options. */ break; case 'b': - if (migrate_mode == 0) { + if (!migrate_mode) { fprintf(stderr, "--block is valid only for" " migrate mode"); return CMD_HELP; @@ -671,11 +774,19 @@ static int lfs_setstripe(int argc, char **argv) /* delete the default striping pattern */ delete = 1; break; -#if LUSTRE_VERSION_CODE < OBD_OCD_VERSION(2, 9, 53, 0) case 'o': - fprintf(stderr, "warning: '--offset|-o' deprecated, " - "use '--stripe-index|-i' instead\n"); -#endif + nr_osts = parse_targets(osts, ARRAY_SIZE(osts), nr_osts, + optarg); + if (nr_osts < 0) { + fprintf(stderr, + "error: %s: bad OST indices '%s'\n", + argv[0], optarg); + return CMD_HELP; + } + + if (st_offset == -1) /* first in the command line */ + st_offset = osts[0]; + break; case 'i': #if LUSTRE_VERSION_CODE >= OBD_OCD_VERSION(2, 6, 53, 0) if (strcmp(argv[optind - 1], "--index") == 0) @@ -719,6 +830,13 @@ static int lfs_setstripe(int argc, char **argv) return CMD_HELP; } + if (pool_name_arg && strlen(pool_name_arg) > LOV_MAXPOOLNAME) { + fprintf(stderr, + "error: %s: pool name '%s' is too long (max is %d characters)\n", + argv[0], pool_name_arg, LOV_MAXPOOLNAME); + return CMD_HELP; + } + /* get the stripe size */ if (stripe_size_arg != NULL) { result = llapi_parse_size(stripe_size_arg, &st_size, @@ -726,7 +844,7 @@ static int lfs_setstripe(int argc, char **argv) if (result) { fprintf(stderr, "error: %s: bad stripe size '%s'\n", argv[0], stripe_size_arg); - return result; + return CMD_HELP; } } /* get the stripe offset */ @@ -748,15 +866,44 @@ static int lfs_setstripe(int argc, char **argv) } } + /* initialize stripe parameters */ + param = calloc(1, offsetof(typeof(*param), lsp_osts[nr_osts])); + if (param == NULL) { + fprintf(stderr, "error: %s: run out of memory\n", argv[0]); + return CMD_HELP; + } + + param->lsp_stripe_size = st_size; + param->lsp_stripe_offset = st_offset; + param->lsp_stripe_count = st_count; + param->lsp_stripe_pattern = 0; + param->lsp_pool = pool_name_arg; + param->lsp_is_specific = false; + if (nr_osts > 0) { + if (st_count > 0 && nr_osts != st_count) { + fprintf(stderr, "error: %s: stripe count '%d' doesn't " + "match the number of OSTs: %d\n", + argv[0], st_count, nr_osts); + return CMD_HELP; + } + + param->lsp_is_specific = true; + param->lsp_stripe_count = nr_osts; + memcpy(param->lsp_osts, osts, sizeof(*osts) * nr_osts); + } + do { - if (migrate_mode) - result = lfs_migrate(fname, st_size, st_offset, - st_count, 0, pool_name_arg, - migration_flags); - else - result = llapi_file_create_pool(fname, st_size, - st_offset, st_count, - 0, pool_name_arg); + if (!migrate_mode) { + result = llapi_file_open_param(fname, + O_CREAT | O_WRONLY, + 0644, param); + if (result >= 0) { + close(result); + result = 0; + } + } else { + result = lfs_migrate(fname, migration_flags, param); + } if (result) { fprintf(stderr, "error: %s: %s stripe file '%s' failed\n", @@ -767,6 +914,7 @@ static int lfs_setstripe(int argc, char **argv) fname = argv[++optind]; } while (fname != NULL); + free(param); return result; } @@ -882,11 +1030,12 @@ static int name2layout(__u32 *layout, char *name) #define FIND_POOL_OPT 3 static int lfs_find(int argc, char **argv) { - int c, ret; + int c, rc; + int ret = 0; time_t t; struct find_param param = { .fp_max_depth = -1, - .quiet = 1, + .fp_quiet = 1, }; struct option long_opts[] = { {"atime", required_argument, 0, 'A'}, @@ -927,7 +1076,6 @@ static int lfs_find(int argc, char **argv) time(&t); - optind = 0; /* when getopt_long_only() hits '!' it returns 1, puts "!" in optarg */ while ((c = getopt_long_only(argc, argv, "-A:c:C:D:g:G:i:L:m:M:n:O:Ppqrs:S:t:u:U:v", @@ -984,40 +1132,40 @@ static int lfs_find(int argc, char **argv) xsign = ¶m.fp_msign; param.fp_exclude_mtime = !!neg_opt; } - ret = set_time(&t, xtime, optarg); - if (ret == INT_MAX) { - ret = -1; - goto err; - } - if (ret) - *xsign = ret; - break; + rc = set_time(&t, xtime, optarg); + if (rc == INT_MAX) { + ret = -1; + goto err; + } + if (rc) + *xsign = rc; + break; case 'c': if (optarg[0] == '+') { - param.stripecount_sign = -1; + param.fp_stripe_count_sign = -1; optarg++; } else if (optarg[0] == '-') { - param.stripecount_sign = 1; + param.fp_stripe_count_sign = 1; optarg++; } - param.stripecount = strtoul(optarg, &endptr, 0); + param.fp_stripe_count = strtoul(optarg, &endptr, 0); if (*endptr != '\0') { fprintf(stderr,"error: bad stripe_count '%s'\n", optarg); ret = -1; goto err; } - param.check_stripecount = 1; - param.exclude_stripecount = !!neg_opt; + param.fp_check_stripe_count = 1; + param.fp_exclude_stripe_count = !!neg_opt; break; case 'D': param.fp_max_depth = strtol(optarg, 0, 0); break; case 'g': case 'G': - ret = name2id(¶m.fp_gid, optarg, GROUP); - if (ret) { + rc = name2id(¶m.fp_gid, optarg, GROUP); + if (rc) { param.fp_gid = strtoul(optarg, &endptr, 10); if (*endptr != '\0') { fprintf(stderr, "Group/GID: %s cannot " @@ -1030,16 +1178,16 @@ static int lfs_find(int argc, char **argv) param.fp_check_gid = 1; break; case 'L': - ret = name2layout(¶m.layout, optarg); + ret = name2layout(¶m.fp_layout, optarg); if (ret) goto err; - param.exclude_layout = !!neg_opt; - param.check_layout = 1; + param.fp_exclude_layout = !!neg_opt; + param.fp_check_layout = 1; break; case 'u': case 'U': - ret = name2id(¶m.fp_uid, optarg, USER); - if (ret) { + rc = name2id(¶m.fp_uid, optarg, USER); + if (rc) { param.fp_uid = strtoul(optarg, &endptr, 10); if (*endptr != '\0') { fprintf(stderr, "User/UID: %s cannot " @@ -1062,14 +1210,14 @@ static int lfs_find(int argc, char **argv) } /* we do check for empty pool because empty pool * is used to find V1 lov attributes */ - strncpy(param.poolname, optarg, LOV_MAXPOOLNAME); - param.poolname[LOV_MAXPOOLNAME] = '\0'; - param.exclude_pool = !!neg_opt; - param.check_pool = 1; + strncpy(param.fp_poolname, optarg, LOV_MAXPOOLNAME); + param.fp_poolname[LOV_MAXPOOLNAME] = '\0'; + param.fp_exclude_pool = !!neg_opt; + param.fp_check_pool = 1; break; case 'n': - param.pattern = (char *)optarg; - param.exclude_pattern = !!neg_opt; + param.fp_pattern = (char *)optarg; + param.fp_exclude_pattern = !!neg_opt; break; case 'm': case 'i': @@ -1084,7 +1232,7 @@ static int lfs_find(int argc, char **argv) goto err; } - param.exclude_obd = !!neg_opt; + param.fp_exclude_obd = !!neg_opt; token = buf; while (token && *token) { @@ -1095,32 +1243,38 @@ static int lfs_find(int argc, char **argv) } } if (c == 'm') { - param.exclude_mdt = !!neg_opt; - param.num_alloc_mdts += len; - tmp = realloc(param.mdtuuid, - param.num_alloc_mdts * - sizeof(*param.mdtuuid)); - if (tmp == NULL) - GOTO(err_free, ret = -ENOMEM); - param.mdtuuid = tmp; + param.fp_exclude_mdt = !!neg_opt; + param.fp_num_alloc_mdts += len; + tmp = realloc(param.fp_mdt_uuid, + param.fp_num_alloc_mdts * + sizeof(*param.fp_mdt_uuid)); + if (tmp == NULL) { + ret = -ENOMEM; + goto err_free; + } + + param.fp_mdt_uuid = tmp; } else { - param.exclude_obd = !!neg_opt; - param.num_alloc_obds += len; - tmp = realloc(param.obduuid, - param.num_alloc_obds * - sizeof(*param.obduuid)); - if (tmp == NULL) - GOTO(err_free, ret = -ENOMEM); - param.obduuid = tmp; + param.fp_exclude_obd = !!neg_opt; + param.fp_num_alloc_obds += len; + tmp = realloc(param.fp_obd_uuid, + param.fp_num_alloc_obds * + sizeof(*param.fp_obd_uuid)); + if (tmp == NULL) { + ret = -ENOMEM; + goto err_free; + } + + param.fp_obd_uuid = tmp; } for (token = buf; token && *token; token = next) { struct obd_uuid *puuid; if (c == 'm') { puuid = - ¶m.mdtuuid[param.num_mdts++]; + ¶m.fp_mdt_uuid[param.fp_num_mdts++]; } else { puuid = - ¶m.obduuid[param.num_obds++]; + ¶m.fp_obd_uuid[param.fp_num_obds++]; } p = strchr(token, ','); next = 0; @@ -1128,8 +1282,12 @@ static int lfs_find(int argc, char **argv) *p = 0; next = p+1; } - if (strlen(token) > sizeof(puuid->uuid)-1) - GOTO(err_free, ret = -E2BIG); + + if (strlen(token) > sizeof(puuid->uuid) - 1) { + ret = -E2BIG; + goto err_free; + } + strncpy(puuid->uuid, token, sizeof(puuid->uuid)); } @@ -1139,47 +1297,47 @@ err_free: break; } case 'p': - param.zeroend = 1; + param.fp_zero_end = 1; break; case 'P': break; case 's': if (optarg[0] == '+') { - param.size_sign = -1; + param.fp_size_sign = -1; optarg++; } else if (optarg[0] == '-') { - param.size_sign = 1; + param.fp_size_sign = 1; optarg++; } - ret = llapi_parse_size(optarg, ¶m.size, - ¶m.size_units, 0); + ret = llapi_parse_size(optarg, ¶m.fp_size, + ¶m.fp_size_units, 0); if (ret) { fprintf(stderr, "error: bad file size '%s'\n", optarg); goto err; } - param.check_size = 1; - param.exclude_size = !!neg_opt; + param.fp_check_size = 1; + param.fp_exclude_size = !!neg_opt; break; case 'S': if (optarg[0] == '+') { - param.stripesize_sign = -1; + param.fp_stripe_size_sign = -1; optarg++; } else if (optarg[0] == '-') { - param.stripesize_sign = 1; + param.fp_stripe_size_sign = 1; optarg++; } - ret = llapi_parse_size(optarg, ¶m.stripesize, - ¶m.stripesize_units, 0); + ret = llapi_parse_size(optarg, ¶m.fp_stripe_size, + ¶m.fp_stripe_size_units, 0); if (ret) { fprintf(stderr, "error: bad stripe_size '%s'\n", optarg); goto err; } - param.check_stripesize = 1; - param.exclude_stripesize = !!neg_opt; + param.fp_check_stripe_size = 1; + param.fp_exclude_stripe_size = !!neg_opt; break; case 't': param.fp_exclude_type = !!neg_opt; @@ -1228,19 +1386,21 @@ err_free: pathend = argc; } - do { - ret = llapi_find(argv[pathstart], ¶m); - } while (++pathstart < pathend && !ret); + do { + rc = llapi_find(argv[pathstart], ¶m); + if (rc != 0 && ret == 0) + ret = rc; + } while (++pathstart < pathend); if (ret) fprintf(stderr, "error: %s failed for %s.\n", argv[0], argv[optind - 1]); err: - if (param.obduuid && param.num_alloc_obds) - free(param.obduuid); + if (param.fp_obd_uuid && param.fp_num_alloc_obds) + free(param.fp_obd_uuid); - if (param.mdtuuid && param.num_alloc_mdts) - free(param.mdtuuid); + if (param.fp_mdt_uuid && param.fp_num_alloc_mdts) + free(param.fp_mdt_uuid); return ret; } @@ -1297,33 +1457,32 @@ static int lfs_getstripe_internal(int argc, char **argv, int c, rc; param->fp_max_depth = 1; - optind = 0; while ((c = getopt_long(argc, argv, "cdDghiLMoO:pqrRsSv", long_opts, NULL)) != -1) { switch (c) { case 'O': - if (param->obduuid) { + if (param->fp_obd_uuid) { fprintf(stderr, "error: %s: only one obduuid allowed", argv[0]); return CMD_HELP; } - param->obduuid = (struct obd_uuid *)optarg; + param->fp_obd_uuid = (struct obd_uuid *)optarg; break; case 'q': - param->quiet++; + param->fp_quiet++; break; case 'd': param->fp_max_depth = 0; break; case 'D': - param->get_default_lmv = 1; + param->fp_get_default_lmv = 1; break; case 'r': - param->recursive = 1; + param->fp_recursive = 1; break; case 'v': - param->verbose = VERBOSE_ALL | VERBOSE_DETAIL; + param->fp_verbose = VERBOSE_ALL | VERBOSE_DETAIL; break; case 'c': #if LUSTRE_VERSION_CODE >= OBD_OCD_VERSION(2, 6, 53, 0) @@ -1331,8 +1490,8 @@ static int lfs_getstripe_internal(int argc, char **argv, fprintf(stderr, "warning: '--count' deprecated," " use '--stripe-count' instead\n"); #endif - if (!(param->verbose & VERBOSE_DETAIL)) { - param->verbose |= VERBOSE_COUNT; + if (!(param->fp_verbose & VERBOSE_DETAIL)) { + param->fp_verbose |= VERBOSE_COUNT; param->fp_max_depth = 0; } break; @@ -1344,8 +1503,8 @@ static int lfs_getstripe_internal(int argc, char **argv, #endif #endif /* LUSTRE_VERSION_CODE < OBD_OCD_VERSION(2, 9, 53, 0) */ case 'S': - if (!(param->verbose & VERBOSE_DETAIL)) { - param->verbose |= VERBOSE_SIZE; + if (!(param->fp_verbose & VERBOSE_DETAIL)) { + param->fp_verbose |= VERBOSE_SIZE; param->fp_max_depth = 0; } break; @@ -1360,36 +1519,36 @@ static int lfs_getstripe_internal(int argc, char **argv, fprintf(stderr, "warning: '--index' deprecated" ", use '--stripe-index' instead\n"); #endif - if (!(param->verbose & VERBOSE_DETAIL)) { - param->verbose |= VERBOSE_OFFSET; + if (!(param->fp_verbose & VERBOSE_DETAIL)) { + param->fp_verbose |= VERBOSE_OFFSET; param->fp_max_depth = 0; } break; case 'p': - if (!(param->verbose & VERBOSE_DETAIL)) { - param->verbose |= VERBOSE_POOL; + if (!(param->fp_verbose & VERBOSE_DETAIL)) { + param->fp_verbose |= VERBOSE_POOL; param->fp_max_depth = 0; } break; case 'g': - if (!(param->verbose & VERBOSE_DETAIL)) { - param->verbose |= VERBOSE_GENERATION; + if (!(param->fp_verbose & VERBOSE_DETAIL)) { + param->fp_verbose |= VERBOSE_GENERATION; param->fp_max_depth = 0; } break; case 'L': - if (!(param->verbose & VERBOSE_DETAIL)) { - param->verbose |= VERBOSE_LAYOUT; + if (!(param->fp_verbose & VERBOSE_DETAIL)) { + param->fp_verbose |= VERBOSE_LAYOUT; param->fp_max_depth = 0; } break; case 'M': - if (!(param->verbose & VERBOSE_DETAIL)) + if (!(param->fp_verbose & VERBOSE_DETAIL)) param->fp_max_depth = 0; - param->verbose |= VERBOSE_MDTINDEX; + param->fp_verbose |= VERBOSE_MDTINDEX; break; case 'R': - param->raw = 1; + param->fp_raw = 1; break; default: return CMD_HELP; @@ -1399,13 +1558,13 @@ static int lfs_getstripe_internal(int argc, char **argv, if (optind >= argc) return CMD_HELP; - if (param->recursive) + if (param->fp_recursive) param->fp_max_depth = -1; - if (!param->verbose) - param->verbose = VERBOSE_ALL; - if (param->quiet) - param->verbose = VERBOSE_OBJID; + if (!param->fp_verbose) + param->fp_verbose = VERBOSE_ALL; + if (param->fp_quiet) + param->fp_verbose = VERBOSE_OBJID; do { rc = llapi_getstripe(argv[optind], param); @@ -1440,7 +1599,7 @@ static int lfs_tgts(int argc, char **argv) memset(¶m, 0, sizeof(param)); if (!strcmp(argv[0], "mdts")) - param.get_lmv = 1; + param.fp_get_lmv = 1; rc = llapi_ostlist(mntdir, ¶m); if (rc) { @@ -1466,7 +1625,7 @@ static int lfs_getdirstripe(int argc, char **argv) { struct find_param param = { 0 }; - param.get_lmv = 1; + param.fp_get_lmv = 1; return lfs_getstripe_internal(argc, argv, ¶m); } @@ -1483,19 +1642,24 @@ static int lfs_setdirstripe(int argc, char **argv) char *stripe_offset_opt = NULL; char *stripe_count_opt = NULL; char *stripe_hash_opt = NULL; - int default_stripe = 0; + char *mode_opt = NULL; + bool default_stripe = false; + mode_t mode = S_IRWXU | S_IRWXG | S_IRWXO; + mode_t previous_mode = 0; + bool delete = false; struct option long_opts[] = { {"count", required_argument, 0, 'c'}, + {"delete", no_argument, 0, 'd'}, {"index", required_argument, 0, 'i'}, + {"mode", required_argument, 0, 'm'}, {"hash-type", required_argument, 0, 't'}, - {"default_stripe", required_argument, 0, 'D'}, + {"default_stripe", no_argument, 0, 'D'}, {0, 0, 0, 0} }; - optind = 0; - - while ((c = getopt_long(argc, argv, "c:Di:t:", long_opts, NULL)) >= 0) { + while ((c = getopt_long(argc, argv, "c:dDi:m:t:", long_opts, + NULL)) >= 0) { switch (c) { case 0: /* Long options. */ @@ -1503,12 +1667,19 @@ static int lfs_setdirstripe(int argc, char **argv) case 'c': stripe_count_opt = optarg; break; + case 'd': + delete = true; + default_stripe = true; + break; case 'D': - default_stripe = 1; + default_stripe = true; break; case 'i': stripe_offset_opt = optarg; break; + case 'm': + mode_opt = optarg; + break; case 't': stripe_hash_opt = optarg; break; @@ -1526,7 +1697,7 @@ static int lfs_setdirstripe(int argc, char **argv) return CMD_HELP; } - if (stripe_offset_opt == NULL && stripe_count_opt == NULL) { + if (!delete && stripe_offset_opt == NULL && stripe_count_opt == NULL) { fprintf(stderr, "error: %s: missing stripe offset and count.\n", argv[0]); return CMD_HELP; @@ -1542,6 +1713,27 @@ static int lfs_setdirstripe(int argc, char **argv) } } + if (delete) { + if (stripe_offset_opt != NULL || stripe_count_opt != NULL) { + fprintf(stderr, "error: %s: cannot specify -d with -s," + " or -i options.\n", argv[0]); + return CMD_HELP; + } else { + stripe_count = 0; + } + } + + + if (mode_opt != NULL) { + mode = strtoul(mode_opt, &end, 8); + if (*end != '\0') { + fprintf(stderr, "error: %s: bad mode '%s'\n", + argv[0], mode_opt); + return CMD_HELP; + } + previous_mode = umask(0); + } + if (stripe_hash_opt == NULL || strcmp(stripe_hash_opt, LMV_HASH_NAME_FNV_1A_64) == 0) { hash_type = LMV_HASH_TYPE_FNV_1A_64; @@ -1565,12 +1757,13 @@ static int lfs_setdirstripe(int argc, char **argv) dname = argv[optind]; do { - if (default_stripe == 1) { + if (default_stripe) { result = llapi_dir_set_default_lmv_stripe(dname, stripe_offset, stripe_count, hash_type, NULL); } else { - result = llapi_dir_create_pool(dname, 0, stripe_offset, + result = llapi_dir_create_pool(dname, mode, + stripe_offset, stripe_count, hash_type, NULL); } @@ -1583,6 +1776,9 @@ static int lfs_setdirstripe(int argc, char **argv) dname = argv[++optind]; } while (dname != NULL); + if (mode_opt != NULL) + umask(previous_mode); + return result; } @@ -1617,13 +1813,13 @@ static int lfs_mv(int argc, char **argv) { struct find_param param = { .fp_max_depth = -1, - .mdtindex = -1, + .fp_mdt_index = -1, }; char *end; int c; int rc = 0; struct option long_opts[] = { - {"--mdt-index", required_argument, 0, 'M'}, + {"mdt-index", required_argument, 0, 'M'}, {"verbose", no_argument, 0, 'v'}, {0, 0, 0, 0} }; @@ -1631,7 +1827,7 @@ static int lfs_mv(int argc, char **argv) while ((c = getopt_long(argc, argv, "M:v", long_opts, NULL)) != -1) { switch (c) { case 'M': { - param.mdtindex = strtoul(optarg, &end, 0); + param.fp_mdt_index = strtoul(optarg, &end, 0); if (*end != '\0') { fprintf(stderr, "%s: invalid MDT index'%s'\n", argv[0], optarg); @@ -1640,7 +1836,7 @@ static int lfs_mv(int argc, char **argv) break; } case 'v': { - param.verbose = VERBOSE_DETAIL; + param.fp_verbose = VERBOSE_DETAIL; break; } default: @@ -1650,21 +1846,22 @@ static int lfs_mv(int argc, char **argv) } } - if (param.mdtindex == -1) { - fprintf(stderr, "%s MDT index must be indicated\n", argv[0]); + if (param.fp_mdt_index == -1) { + fprintf(stderr, "%s: MDT index must be specified\n", argv[0]); return CMD_HELP; } if (optind >= argc) { - fprintf(stderr, "%s missing operand path\n", argv[0]); + fprintf(stderr, "%s: missing operand path\n", argv[0]); return CMD_HELP; } - param.migrate = 1; + param.fp_migrate = 1; rc = llapi_mv(argv[optind], ¶m); if (rc != 0) - fprintf(stderr, "cannot migrate '%s' to MDT%04x: %s\n", - argv[optind], param.mdtindex, strerror(-rc)); + fprintf(stderr, "%s: cannot migrate '%s' to MDT%04x: %s\n", + argv[0], argv[optind], param.fp_mdt_index, + strerror(-rc)); return rc; } @@ -1702,7 +1899,10 @@ static int showdf(char *mntdir, struct obd_statfs *stat, double ratio = 0; char *suffix = "KMGTPEZY"; /* Note if we have >2^64 bytes/fs these buffers will need to be grown */ - char tbuf[20], ubuf[20], abuf[20], rbuf[20]; + char tbuf[3 * sizeof(__u64)]; + char ubuf[3 * sizeof(__u64)]; + char abuf[3 * sizeof(__u64)]; + char rbuf[3 * sizeof(__u64)]; if (!uuid || !stat) return -EINVAL; @@ -1826,6 +2026,9 @@ static int mntdf(char *mntdir, char *fsname, char *pool, int ishow, if (rc == -ENODEV) break; + if (rc == -EAGAIN) + continue; + if (poolname && tp->st_op == LL_STATFS_LOV && llapi_search_ost(fsname, poolname, obd_uuid2str(&uuid_buf)) != 1) @@ -1888,7 +2091,6 @@ static int lfs_df(int argc, char **argv) {0, 0, 0, 0} }; - optind = 0; while ((c = getopt_long(argc, argv, "hilp:", long_opts, NULL)) != -1) { switch (c) { case 'i': @@ -1935,7 +2137,6 @@ static int lfs_getname(int argc, char **argv) int rc = 0, index = 0, c; char buf[sizeof(struct obd_uuid)]; - optind = 0; while ((c = getopt(argc, argv, "h")) != -1) return CMD_HELP; @@ -2004,9 +2205,7 @@ static int lfs_check(int argc, char **argv) return rc; } - rc = llapi_target_iterate(num_types, obd_types, - mntdir, llapi_ping_target); - + rc = llapi_target_check(num_types, obd_types, mntdir); if (rc) fprintf(stderr, "error: %s: %s status failed\n", argv[0],argv[1]); @@ -2034,7 +2233,6 @@ static int lfs_quotacheck(int argc, char **argv) memset(&qchk, 0, sizeof(qchk)); - optind = 0; while ((c = getopt(argc, argv, "gu")) != -1) { switch (c) { case 'u': @@ -2109,7 +2307,6 @@ static int lfs_quotaon(int argc, char **argv) memset(&qctl, 0, sizeof(qctl)); qctl.qc_cmd = LUSTRE_Q_QUOTAON; - optind = 0; while ((c = getopt(argc, argv, "fgu")) != -1) { switch (c) { case 'u': @@ -2177,7 +2374,6 @@ static int lfs_quotaoff(int argc, char **argv) memset(&qctl, 0, sizeof(qctl)); qctl.qc_cmd = LUSTRE_Q_QUOTAOFF; - optind = 0; while ((c = getopt(argc, argv, "gu")) != -1) { switch (c) { case 'u': @@ -2339,7 +2535,6 @@ int lfs_setquota_times(int argc, char **argv) qctl.qc_cmd = LUSTRE_Q_SETINFO; qctl.qc_type = UGQUOTA; - optind = 0; while ((c = getopt_long(argc, argv, "b:gi:tu", long_opts, NULL)) != -1) { switch (c) { case 'u': @@ -2429,7 +2624,6 @@ int lfs_setquota(int argc, char **argv) * so it can be used as a marker that qc_type * isn't reinitialized from command line */ - optind = 0; while ((c = getopt_long(argc, argv, "b:B:g:i:I:u:", long_opts, NULL)) != -1) { switch (c) { case 'u': @@ -2816,7 +3010,6 @@ static int lfs_quota(int argc, char **argv) __u64 total_ialloc = 0, total_balloc = 0; bool human_readable = false; - optind = 0; while ((c = getopt(argc, argv, "gi:I:o:qtuvh")) != -1) { switch (c) { case 'u': @@ -2838,7 +3031,7 @@ static int lfs_quota(int argc, char **argv) break; case 'o': valid = qctl.qc_valid = QC_UUID; - strncpy(obd_uuid, optarg, sizeof(qctl.obd_uuid)); + strlcpy(obd_uuid, optarg, sizeof(qctl.obd_uuid)); break; case 'i': valid = qctl.qc_valid = QC_MDTIDX; @@ -2990,12 +3183,11 @@ static int flushctx_ioctl(char *mp) static int lfs_flushctx(int argc, char **argv) { - int kdestroy = 0, c; - FILE *proc = NULL; - char procline[PATH_MAX], *line; - int rc = 0; + int kdestroy = 0, c; + char mntdir[PATH_MAX] = {'\0'}; + int index = 0; + int rc = 0; - optind = 0; while ((c = getopt(argc, argv, "k")) != -1) { switch (c) { case 'k': @@ -3009,46 +3201,24 @@ static int lfs_flushctx(int argc, char **argv) } if (kdestroy) { - int rc; if ((rc = system("kdestroy > /dev/null")) != 0) { rc = WEXITSTATUS(rc); fprintf(stderr, "error destroying tickets: %d, continuing\n", rc); } } - if (optind >= argc) { - /* flush for all mounted lustre fs. */ - proc = fopen("/proc/mounts", "r"); - if (!proc) { - fprintf(stderr, "error: %s: can't open /proc/mounts\n", - argv[0]); - return -1; - } - - while ((line = fgets(procline, PATH_MAX, proc)) != NULL) { - char dev[PATH_MAX]; - char mp[PATH_MAX]; - char fs[PATH_MAX]; + if (optind >= argc) { + /* flush for all mounted lustre fs. */ + while (!llapi_search_mounts(NULL, index++, mntdir, NULL)) { + /* Check if we have a mount point */ + if (mntdir[0] == '\0') + continue; - if (sscanf(line, "%s %s %s", dev, mp, fs) != 3) { - fprintf(stderr, "%s: unexpected format in " - "/proc/mounts\n", - argv[0]); + if (flushctx_ioctl(mntdir)) rc = -1; - goto out; - } - if (strcmp(fs, "lustre") != 0) - continue; - /* we use '@' to determine it's a client. are there - * any other better way? - */ - if (strchr(dev, '@') == NULL) - continue; - - if (flushctx_ioctl(mp)) - rc = -1; - } + mntdir[0] = '\0'; /* avoid matching in next loop */ + } } else { /* flush fs as specified */ while (optind < argc) { @@ -3056,10 +3226,6 @@ static int lfs_flushctx(int argc, char **argv) rc = -1; } } - -out: - if (proc != NULL) - fclose(proc); return rc; } @@ -3100,7 +3266,7 @@ static int lfs_ls(int argc, char **argv) static int lfs_changelog(int argc, char **argv) { void *changelog_priv; - struct changelog_ext_rec *rec; + struct changelog_rec *rec; long long startrec = 0, endrec = 0; char *mdd; struct option long_opts[] = { @@ -3110,7 +3276,6 @@ static int lfs_changelog(int argc, char **argv) char short_opts[] = "f"; int rc, follow = 0; - optind = 0; while ((rc = getopt_long(argc, argv, short_opts, long_opts, NULL)) != -1) { switch (rc) { @@ -3134,15 +3299,16 @@ static int lfs_changelog(int argc, char **argv) if (argc > optind) endrec = strtoll(argv[optind++], NULL, 10); - rc = llapi_changelog_start(&changelog_priv, - CHANGELOG_FLAG_BLOCK | - (follow ? CHANGELOG_FLAG_FOLLOW : 0), - mdd, startrec); - if (rc < 0) { - fprintf(stderr, "Can't start changelog: %s\n", - strerror(errno = -rc)); - return rc; - } + rc = llapi_changelog_start(&changelog_priv, + CHANGELOG_FLAG_BLOCK | + CHANGELOG_FLAG_JOBID | + (follow ? CHANGELOG_FLAG_FOLLOW : 0), + mdd, startrec); + if (rc < 0) { + fprintf(stderr, "Can't start changelog: %s\n", + strerror(errno = -rc)); + return rc; + } while ((rc = llapi_changelog_recv(changelog_priv, &rec)) == 0) { time_t secs; @@ -3157,28 +3323,42 @@ static int lfs_changelog(int argc, char **argv) continue; } - secs = rec->cr_time >> 30; - gmtime_r(&secs, &ts); - printf(LPU64" %02d%-5s %02d:%02d:%02d.%06d %04d.%02d.%02d " - "0x%x t="DFID, rec->cr_index, rec->cr_type, - changelog_type2str(rec->cr_type), - ts.tm_hour, ts.tm_min, ts.tm_sec, - (int)(rec->cr_time & ((1<<30) - 1)), - ts.tm_year + 1900, ts.tm_mon + 1, ts.tm_mday, - rec->cr_flags & CLF_FLAGMASK, PFID(&rec->cr_tfid)); - if (rec->cr_namelen) - /* namespace rec includes parent and filename */ - printf(" p="DFID" %.*s", PFID(&rec->cr_pfid), - rec->cr_namelen, rec->cr_name); + secs = rec->cr_time >> 30; + gmtime_r(&secs, &ts); + printf(LPU64" %02d%-5s %02d:%02d:%02d.%06d %04d.%02d.%02d " + "0x%x t="DFID, rec->cr_index, rec->cr_type, + changelog_type2str(rec->cr_type), + ts.tm_hour, ts.tm_min, ts.tm_sec, + (int)(rec->cr_time & ((1<<30) - 1)), + ts.tm_year + 1900, ts.tm_mon + 1, ts.tm_mday, + rec->cr_flags & CLF_FLAGMASK, PFID(&rec->cr_tfid)); + + if (rec->cr_flags & CLF_JOBID) { + struct changelog_ext_jobid *jid = + changelog_rec_jobid(rec); + + if (jid->cr_jobid[0] != '\0') + printf(" j=%s", jid->cr_jobid); + } - if (!fid_is_zero(&rec->cr_sfid)) - printf(" s="DFID" sp="DFID" %.*s", - PFID(&rec->cr_sfid), PFID(&rec->cr_spfid), - changelog_rec_snamelen(rec), - changelog_rec_sname(rec)); + if (rec->cr_namelen) + printf(" p="DFID" %.*s", PFID(&rec->cr_pfid), + rec->cr_namelen, changelog_rec_name(rec)); + + if (rec->cr_flags & CLF_RENAME) { + struct changelog_ext_rename *rnm = + changelog_rec_rename(rec); + + if (!fid_is_zero(&rnm->cr_sfid)) + printf(" s="DFID" sp="DFID" %.*s", + PFID(&rnm->cr_sfid), + PFID(&rnm->cr_spfid), + (int)changelog_rec_snamelen(rec), + changelog_rec_sname(rec)); + } printf("\n"); - llapi_changelog_free(&rec); + llapi_changelog_free(&rec); } llapi_changelog_fini(&changelog_priv); @@ -3222,8 +3402,6 @@ static int lfs_fid2path(int argc, char **argv) int printcur = 0; int rc = 0; - optind = 0; - while ((rc = getopt_long(argc, argv, short_opts, long_opts, NULL)) != -1) { switch (rc) { @@ -3250,6 +3428,10 @@ static int lfs_fid2path(int argc, char **argv) device = argv[optind++]; path = calloc(1, PATH_MAX); + if (path == NULL) { + fprintf(stderr, "error: Not enough memory\n"); + return -errno; + } rc = 0; while (optind < argc) { @@ -3296,33 +3478,74 @@ static int lfs_fid2path(int argc, char **argv) static int lfs_path2fid(int argc, char **argv) { - char **path; - const char *sep = ""; - lustre_fid fid; - int rc = 0; + struct option long_opts[] = { + {"parents", no_argument, 0, 'p'}, + {0, 0, 0, 0} + }; + char **path; + const char short_opts[] = "p"; + const char *sep = ""; + lustre_fid fid; + int rc = 0; + bool show_parents = false; + + while ((rc = getopt_long(argc, argv, short_opts, + long_opts, NULL)) != -1) { + switch (rc) { + case 'p': + show_parents = true; + break; + default: + fprintf(stderr, "error: %s: option '%s' unrecognized\n", + argv[0], argv[optind - 1]); + return CMD_HELP; + } + } - if (argc < 2) + if (optind > argc - 1) return CMD_HELP; - else if (argc > 2) + else if (optind < argc - 1) sep = ": "; - path = argv + 1; - while (*path != NULL) { - int err = llapi_path2fid(*path, &fid); + rc = 0; + for (path = argv + optind; *path != NULL; path++) { + int err = 0; + if (!show_parents) { + err = llapi_path2fid(*path, &fid); + if (!err) + printf("%s%s"DFID"\n", + *sep != '\0' ? *path : "", sep, + PFID(&fid)); + } else { + char name[NAME_MAX + 1]; + unsigned int linkno = 0; + + while ((err = llapi_path2parent(*path, linkno, &fid, + name, sizeof(name))) == 0) { + if (*sep != '\0' && linkno == 0) + printf("%s%s", *path, sep); + + printf("%s"DFID"/%s", linkno != 0 ? "\t" : "", + PFID(&fid), name); + linkno++; + } + + /* err == -ENODATA is end-of-loop */ + if (linkno > 0 && err == -ENODATA) { + printf("\n"); + err = 0; + } + } if (err) { - fprintf(stderr, "%s: can't get fid for %s: %s\n", - argv[0], *path, strerror(-err)); + fprintf(stderr, "%s: can't get %sfid for %s: %s\n", + argv[0], show_parents ? "parent " : "", *path, + strerror(-err)); if (rc == 0) { rc = err; errno = -err; } - goto out; } - printf("%s%s"DFID"\n", *sep != '\0' ? *path : "", sep, - PFID(&fid)); -out: - path++; } return rc; @@ -3340,7 +3563,6 @@ static int lfs_data_version(int argc, char **argv) if (argc < 2) return CMD_HELP; - optind = 0; while ((c = getopt(argc, argv, "nrw")) != -1) { switch (c) { case 'n': @@ -3450,7 +3672,6 @@ static int lfs_hsm_change_flags(int argc, char **argv, int mode) if (argc < 3) return CMD_HELP; - optind = 0; while ((c = getopt_long(argc, argv, short_opts, long_opts, NULL)) != -1) { switch (c) { @@ -3544,12 +3765,15 @@ static int lfs_hsm_action(int argc, char **argv) if ((hps == HPS_RUNNING) && (hua == HUA_ARCHIVE || hua == HUA_RESTORE)) - printf("("LPX64 " bytes moved)\n", he.length); + printf("(%llu bytes moved)\n", + (unsigned long long)he.length); else if ((he.offset + he.length) == LUSTRE_EOF) - printf("(from "LPX64 " to EOF)\n", he.offset); + printf("(from %llu to EOF)\n", + (unsigned long long)he.offset); else - printf("(from "LPX64 " to "LPX64")\n", - he.offset, he.offset + he.length); + printf("(from %llu to %llu)\n", + (unsigned long long)he.offset, + (unsigned long long)(he.offset + he.length)); } while (++i < argc); @@ -3586,6 +3810,13 @@ static int lfs_hsm_prepare_file(char *file, struct lu_fid *fid, fprintf(stderr, "Cannot stat %s: %s\n", file, strerror(errno)); return -errno; } + /* Checking for regular file as archiving as posix copytool + * rejects archiving files other than regular files + */ + if (!S_ISREG(st.st_mode)) { + fprintf(stderr, "error: \"%s\" is not a regular file\n", file); + return CMD_HELP; + } /* A request should be ... */ if (*last_dev != st.st_dev && *last_dev != 0) { fprintf(stderr, "All files should be " @@ -3631,7 +3862,6 @@ static int lfs_hsm_request(int argc, char **argv, int action) if (argc < 2) return CMD_HELP; - optind = 0; while ((c = getopt_long(argc, argv, short_opts, long_opts, NULL)) != -1) { switch (c) { @@ -3716,15 +3946,16 @@ static int lfs_hsm_request(int argc, char **argv, int action) while ((rc = getline(&line, &len, fp)) != -1) { struct hsm_user_item *hui; - /* If allocated buffer was too small, gets something - * bigger */ + /* If allocated buffer was too small, get something + * larger */ if (nbfile_alloc <= hur->hur_request.hr_itemcount) { + ssize_t size; nbfile_alloc = nbfile_alloc * 2 + 1; oldhur = hur; hur = llapi_hsm_user_request_alloc(nbfile_alloc, opaque_len); if (hur == NULL) { - fprintf(stderr, "Cannot allocate " + fprintf(stderr, "hsm: cannot allocate " "the request: %s\n", strerror(errno)); hur = oldhur; @@ -3732,7 +3963,19 @@ static int lfs_hsm_request(int argc, char **argv, int action) fclose(fp); goto out_free; } - memcpy(hur, oldhur, hur_len(oldhur)); + size = hur_len(oldhur); + if (size < 0) { + fprintf(stderr, "hsm: cannot allocate " + "%u files + %u bytes data\n", + oldhur->hur_request.hr_itemcount, + oldhur->hur_request.hr_data_len); + free(hur); + hur = oldhur; + rc = -E2BIG; + fclose(fp); + goto out_free; + } + memcpy(hur, oldhur, size); free(oldhur); } @@ -3822,13 +4065,13 @@ int main(int argc, char **argv) { int rc; - setlinebuf(stdout); + /* Ensure that liblustreapi constructor has run */ + if (!liblustreapi_initialized) + fprintf(stderr, "liblustreapi was not properly initialized\n"); - ptl_initialize(argc, argv); - if (obd_initialize(argc, argv) < 0) - exit(2); + setlinebuf(stdout); - Parser_init("lfs > ", cmdlist); + Parser_init("lfs > ", cmdlist); if (argc > 1) { rc = Parser_execarg(argc - 1, argv + 1, cmdlist); @@ -3836,7 +4079,6 @@ int main(int argc, char **argv) rc = Parser_commands(); } - obd_finalize(argc, argv); return rc < 0 ? -rc : rc; }