X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Futils%2Flfs.c;h=ed49265ba5eeb6081782623bd60ac4874d9cd2a9;hb=cc234da91b6c00cbe681d7352320df94c09dc288;hp=4890fef7a65605de594502c09dca2219d47223f5;hpb=2f8866e542f2cef1bbca310e00c1ece3a7268884;p=fs%2Flustre-release.git diff --git a/lustre/utils/lfs.c b/lustre/utils/lfs.c index 4890fef..ed49265 100644 --- a/lustre/utils/lfs.c +++ b/lustre/utils/lfs.c @@ -23,7 +23,7 @@ * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved. * Use is subject to license terms. * - * Copyright (c) 2011, 2016, Intel Corporation. + * Copyright (c) 2011, 2017, Intel Corporation. */ /* * This file is part of Lustre, http://www.lustre.org/ @@ -43,6 +43,7 @@ #include #include +#include #include #include #include @@ -56,10 +57,16 @@ #include #include #include +#include +#include #include #include #include #include +#include +#include +#include +#include "lfs_project.h" #include #include @@ -67,6 +74,8 @@ #include #include #include +#include +#include #ifndef ARRAY_SIZE # define ARRAY_SIZE(a) ((sizeof(a)) / (sizeof((a)[0]))) @@ -86,6 +95,7 @@ static int lfs_check(int argc, char **argv); #ifdef HAVE_SYS_QUOTA_H static int lfs_setquota(int argc, char **argv); static int lfs_quota(int argc, char **argv); +static int lfs_project(int argc, char **argv); #endif static int lfs_flushctx(int argc, char **argv); static int lfs_cp(int argc, char **argv); @@ -108,34 +118,42 @@ 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); static int lfs_ladvise(int argc, char **argv); +static int lfs_getsom(int argc, char **argv); static int lfs_mirror(int argc, char **argv); static int lfs_mirror_list_commands(int argc, char **argv); static int lfs_list_commands(int argc, char **argv); static inline int lfs_mirror_resync(int argc, char **argv); +static inline int lfs_mirror_verify(int argc, char **argv); enum setstripe_origin { SO_SETSTRIPE, SO_MIGRATE, SO_MIRROR_CREATE, - SO_MIRROR_EXTEND + SO_MIRROR_EXTEND, + SO_MIRROR_SPLIT, }; -static int lfs_setstripe0(int argc, char **argv, enum setstripe_origin opc); +static int lfs_setstripe_internal(int argc, char **argv, + enum setstripe_origin opc); static inline int lfs_setstripe(int argc, char **argv) { - return lfs_setstripe0(argc, argv, SO_SETSTRIPE); + return lfs_setstripe_internal(argc, argv, SO_SETSTRIPE); } static inline int lfs_setstripe_migrate(int argc, char **argv) { - return lfs_setstripe0(argc, argv, SO_MIGRATE); + return lfs_setstripe_internal(argc, argv, SO_MIGRATE); } static inline int lfs_mirror_create(int argc, char **argv) { - return lfs_setstripe0(argc, argv, SO_MIRROR_CREATE); + return lfs_setstripe_internal(argc, argv, SO_MIRROR_CREATE); } static inline int lfs_mirror_extend(int argc, char **argv) { - return lfs_setstripe0(argc, argv, SO_MIRROR_EXTEND); + return lfs_setstripe_internal(argc, argv, SO_MIRROR_EXTEND); +} +static inline int lfs_mirror_split(int argc, char **argv) +{ + return lfs_setstripe_internal(argc, argv, SO_MIRROR_SPLIT); } /* Setstripe and migrate share mostly the same parameters */ @@ -144,9 +162,11 @@ static inline int lfs_mirror_extend(int argc, char **argv) " [--stripe-count|-c ]\n" \ " [--stripe-index|-i ]\n" \ " [--stripe-size|-S ]\n" \ - " [--layout|-L ]\n" \ + " [--layout|-L ]\n" \ " [--pool|-p ]\n" \ - " [--ost|-o ]\n" + " [--ost|-o ]\n" \ + " [--yaml|-y ]\n" \ + " [--copy=]\n" #define SSM_HELP_COMMON \ "\tstripe_count: Number of OSTs to stripe over (0=fs default, -1 all)\n" \ @@ -166,7 +186,13 @@ static inline int lfs_mirror_extend(int argc, char **argv) "\tcomp_end: Extent end of component, start after previous end.\n"\ "\t Can be specified with K, M or G (for KB, MB, GB\n" \ "\t respectively, -1 for EOF). Must be a multiple of\n"\ - "\t stripe_size.\n" + "\t stripe_size.\n" \ + "\tyaml_template_file:\n" \ + "\t YAML layout template file, can't be used with -c,\n" \ + "\t -i, -S, -p, -o, or -E arguments.\n" \ + "\tlustre_src: Lustre file/dir whose layout info is used to set\n" \ + "\t another lustre file or directory, can't used with\n" \ + "\t -c, -i, -S, -p, -o, or -E arguments.\n" #define MIRROR_CREATE_HELP \ "\tmirror_count: Number of mirrors to be created with the upcoming\n" \ @@ -179,7 +205,8 @@ static inline int lfs_mirror_extend(int argc, char **argv) "\t It can be a plain layout or a composite layout.\n" \ "\t If not specified, the stripe options inherited\n" \ "\t from the previous component will be used.\n" \ - "\tparent: Use default stripe options from parent directory\n" + "\tflags: set flags to the component of the current mirror.\n" \ + "\t Only \"prefer\" flag is supported so far.\n" #define MIRROR_EXTEND_HELP \ MIRROR_CREATE_HELP \ @@ -192,7 +219,7 @@ static inline int lfs_mirror_extend(int argc, char **argv) #define MIRROR_EXTEND_USAGE \ " <--mirror-count|-N[mirror_count]>\n" \ - " [setstripe options|--parent|-f ]\n" \ + " [setstripe options|-f ]\n" \ " [--no-verify]\n" #define SETSTRIPE_USAGE \ @@ -206,11 +233,13 @@ static inline int lfs_mirror_extend(int argc, char **argv) SSM_CMD_COMMON("migrate ") \ " [--block|-b]\n" \ " [--non-block|-n]\n" \ + " [--non-direct|-D]\n" \ " \n" \ SSM_HELP_COMMON \ "\n" \ "\tblock: Block file access during data migration (default)\n" \ "\tnon-block: Abort migrations if concurrent access is detected\n" \ + "\tnon-direct: Do not use direct I/O to copy file contents\n" \ #define SETDIRSTRIPE_USAGE \ " [--mdt-count|-c stripe_count>\n" \ @@ -225,8 +254,6 @@ static inline int lfs_mirror_extend(int argc, char **argv) "\tdefault_stripe: set default dirstripe of the directory\n" \ "\tmode: the mode of the directory\n" -static const char *progname; - /** * command_t mirror_cmdlist - lfs mirror commands. */ @@ -235,18 +262,35 @@ command_t mirror_cmdlist[] = { .pc_help = "Create a mirrored file.\n" "usage: lfs mirror create " "<--mirror-count|-N[mirror_count]> " - "[setstripe options|--parent] ... \n" + "[setstripe options] ... \n" MIRROR_CREATE_HELP }, { .pc_name = "extend", .pc_func = lfs_mirror_extend, .pc_help = "Extend a mirrored file.\n" "usage: lfs mirror extend " "<--mirror-count|-N[mirror_count]> [--no-verify] " - "[setstripe options|--parent|-f ] ... \n" + "[setstripe options|-f ] ... \n" MIRROR_EXTEND_HELP }, + { .pc_name = "split", .pc_func = lfs_mirror_split, + .pc_help = "Split a mirrored file.\n" + "usage: lfs mirror split <--mirror-id | \n" + "\t <--component-id|-I > [--destroy|-d] \n" + "\t [-f ] \n" + "\tmirror_id: The numerical unique identifier for a mirror. It\n" + "\t can be fetched by lfs getstripe command.\n" + "\tcomp_id: Unique component ID within a mirror.\n" + "\tnew_file: This option indicates the layout of the split\n" + "\t mirror will be stored into. If not specified,\n" + "\t a new file named .mirror~\n" + "\t will be used.\n" }, { .pc_name = "resync", .pc_func = lfs_mirror_resync, .pc_help = "Resynchronizes out-of-sync mirrored file(s).\n" "usage: lfs mirror resync [--only ] " " [...]\n"}, + { .pc_name = "verify", .pc_func = lfs_mirror_verify, + .pc_help = "Verify mirrored file(s).\n" + "usage: lfs mirror verify " + "[--only ] " + "[--verbose|-v] [ ...]\n"}, { .pc_name = "--list-commands", .pc_func = lfs_mirror_list_commands, .pc_help = "list commands supported by lfs mirror"}, { .pc_name = "help", .pc_func = Parser_help, .pc_help = "help" }, @@ -269,6 +313,9 @@ command_t cmdlist[] = { "To totally delete the default striping from an existing directory:\n" "usage: setstripe -d \n" " or\n" + "To create a mirrored file or set s default mirror layout on a directory:\n" + "usage: setstripe -N[mirror_count] [STRIPE_OPTIONS] \n" + " or\n" "To delete the last component(s) from an existing composite file\n" "(note that this will also delete any data in those components):\n" "usage: setstripe --component-del [--component-id|-I ]\n" @@ -279,18 +326,20 @@ command_t cmdlist[] = { "\t '^init' indicating all uninstantiated components\n" "\t-I and -F cannot be specified at the same time\n"}, {"getstripe", lfs_getstripe, 0, - "To list the striping info for a given file or files in a\n" + "To list the layout pattern for a given file or files in a\n" "directory or recursively for all files in a directory tree.\n" "usage: getstripe [--ost|-O ] [--quiet|-q] [--verbose|-v]\n" - " [--stripe-count|-c] [--stripe-index|-i]\n" + " [--stripe-count|-c] [--stripe-index|-i] [--fid|-F]\n" " [--pool|-p] [--stripe-size|-S] [--directory|-d]\n" - " [--mdt|-m] [--recursive|-r] [--raw|-R] [--yaml|-y]\n" - " [--layout|-L] [--fid|-F] [--generation|-g]\n" + " [--mdt-index|-m] [--recursive|-r] [--raw|-R]\n" + " [--layout|-L] [--generation|-g] [--yaml|-y]\n" " [--component-id[=comp_id]|-I[comp_id]]\n" " [--component-flags[=comp_flags]]\n" " [--component-count]\n" " [--component-start[=[+-]comp_start]]\n" " [--component-end[=[+-]comp_end]|-E[[+-]comp_end]]\n" + " [[!] --mirror-index=[+-] |\n" + " [!] --mirror-id=[+-]]\n" " ..."}, {"setdirstripe", lfs_setdirstripe, 0, "To create a striped directory on a specified MDT. This can only\n" @@ -298,10 +347,10 @@ command_t cmdlist[] = { "usage: setdirstripe [OPTION] \n" SETDIRSTRIPE_USAGE}, {"getdirstripe", lfs_getdirstripe, 0, - "To list the striping info for a given directory\n" + "To list the layout pattern info for a given directory\n" "or recursively for all directories in a directory tree.\n" - "usage: getdirstripe [--obd|-O ] [--mdt-count|-c]\n" - " [--mdt-index|-i] [--mdt-hash|-t]\n" + "usage: getdirstripe [--mdt-count|-c] [--mdt-index|-m|-i]\n" + " [--mdt-hash|-H] [--obd|-O ]\n" " [--recursive|-r] [--yaml|-y]\n" " [--default|-D] ..."}, {"mkdir", lfs_setdirstripe, 0, @@ -315,34 +364,36 @@ command_t cmdlist[] = { "will become inaccessable after this command. This can only be done\n" "by the administrator\n" "usage: rm_entry \n"}, - {"pool_list", lfs_poollist, 0, - "List pools or pool OSTs\n" - "usage: pool_list [.] | \n"}, - {"find", lfs_find, 0, - "find files matching given attributes recursively in directory tree.\n" - "usage: find ...\n" - " [[!] --atime|-A [+-]N] [[!] --ctime|-C [+-]N]\n" - " [[!] --mtime|-M [+-]N] [[!] --mdt|-m ]\n" - " [--maxdepth|-D N] [[!] --name|-n ]\n" - " [[!] --ost|-O ] [--print|-p] [--print0|-P]\n" - " [[!] --size|-s [+-]N[bkMGTPE]]\n" - " [[!] --stripe-count|-c [+-]]\n" - " [[!] --stripe-index|-i ]\n" - " [[!] --stripe-size|-S [+-]N[kMGT]] [[!] --type|-t ]\n" - " [[!] --gid|-g|--group|-G |]\n" - " [[!] --uid|-u|--user|-U |] [[!] --pool ]\n" + {"pool_list", lfs_poollist, 0, + "List pools or pool OSTs\n" + "usage: pool_list [.] | \n"}, + {"find", lfs_find, 0, + "find files matching given attributes recursively in directory tree.\n" + "usage: find ...\n" + " [[!] --atime|-A [+-]N] [[!] --ctime|-C [+-]N]\n" + " [[!] --mtime|-M [+-]N] [--maxdepth|-D N] [[!] --blocks|-b N]\n" + " [[!] --mdt-index|--mdt|-m ]\n" + " [[!] --name|-n ] [[!] --ost|-O ]\n" + " [--print|-P] [--print0|-0] [[!] --size|-s [+-]N[bkMGTPE]]\n" + " [[!] --stripe-count|-c [+-]]\n" + " [[!] --stripe-index|-i ]\n" + " [[!] --stripe-size|-S [+-]N[kMGT]] [[!] --type|-t ]\n" + " [[!] --gid|-g|--group|-G |]\n" + " [[!] --uid|-u|--user|-U |] [[!] --pool ]\n" " [[!] --projid ]\n" " [[!] --layout|-L released,raid0,mdt]\n" " [[!] --component-count [+-]]\n" " [[!] --component-start [+-]N[kMGTPE]]\n" " [[!] --component-end|-E [+-]N[kMGTPE]]\n" " [[!] --component-flags ]\n" + " [[!] --mirror-count|-N [+-]]\n" + " [[!] --mirror-state <[^]state>]\n" " [[!] --mdt-count|-T [+-]]\n" " [[!] --mdt-hash|-H \n" "\t !: used before an option indicates 'NOT' requested attribute\n" "\t -: used before a value indicates less than requested value\n" "\t +: used before a value indicates more than requested value\n" - "\tmdt-hash: hash type of the striped directory.\n" + "\thashtype: hash type of the striped directory.\n" "\t fnv_1a_64 FNV-1a hash algorithm\n" "\t all_char sum of characters % MDT_COUNT\n"}, {"check", lfs_check, 0, @@ -373,13 +424,25 @@ command_t cmdlist[] = { " setquota [-t] <-u|--user|-g|--group|-p|--projid>\n" " [--block-grace ]\n" " [--inode-grace ] \n" + " setquota <-U|-G|-P>\n" + " -b -B \n" + " -i -I \n" + " setquota <-U|--default-usr|-G|--default-grp|-P|--default-prj>\n" + " [--block-softlimit ]\n" + " [--block-hardlimit ]\n" + " [--inode-softlimit ]\n" + " [--inode-hardlimit ] \n" + " setquota <-u|-g|-p> ||||\n" + " <-d|--default>\n" " -b can be used instead of --block-softlimit/--block-grace\n" " -B can be used instead of --block-hardlimit\n" " -i can be used instead of --inode-softlimit/--inode-grace\n" - " -I can be used instead of --inode-hardlimit\n\n" + " -I can be used instead of --inode-hardlimit\n" + " -d can be used instead of --default\n\n" "Note: The total quota space will be split into many qunits and\n" " balanced over all server targets, the minimal qunit size is\n" " 1M bytes for block space and 1K inodes for inode space.\n\n" + " The maximum quota grace time is 2^48 - 1 seconds.\n\n" " Quota space rebalancing process will stop when this mininum\n" " value is reached. As a result, quota exceeded can be returned\n" " while many targets still have 1MB or 1K inodes of spare\n" @@ -388,7 +451,19 @@ command_t cmdlist[] = { "usage: quota [-q] [-v] [-h] [-o |-i |-I " "]\n" " [<-u|-g|-p> ||||] \n" - " quota [-o |-i |-I ] -t <-u|-g|-p> "}, + " quota [-o |-i |-I ] -t <-u|-g|-p> \n" + " quota [-q] [-v] [h] <-U|-G|-P> "}, + {"project", lfs_project, 0, + "Change or list project attribute for specified file or directory.\n" + "usage: project [-d|-r] \n" + " list project ID and flags on file(s) or directories\n" + " project [-p id] [-s] [-r] \n" + " set project ID and/or inherit flag for specified file(s) or directories\n" + " project -c [-d|-r [-p id] [-0]] \n" + " check project ID and flags on file(s) or directories, print outliers\n" + " project -C [-r] [-k] \n" + " clear the project inherit flag and ID on the file or directory\n" + }, #endif {"flushctx", lfs_flushctx, 0, "Flush security context for current user.\n" "usage: flushctx [-k] [mountpoint...]"}, @@ -420,7 +495,7 @@ command_t cmdlist[] = { "undergoing actions) for given files.\n usage: hsm_state ..."}, {"hsm_set", lfs_hsm_set, 0, "Set HSM user flag on specified files.\n" "usage: hsm_set [--norelease] [--noarchive] [--dirty] [--exists] " - "[--archived] [--lost] ..."}, + "[--archived] [--lost] [--archive-id NUM] ..."}, {"hsm_clear", lfs_hsm_clear, 0, "Clear HSM user flag on specified " "files.\n" "usage: hsm_clear [--norelease] [--noarchive] [--dirty] [--exists] " @@ -466,9 +541,10 @@ command_t cmdlist[] = { " [--stripe-index|-i] \n" " [--stripe-size|-S] \n" " [--pool|-p] \n" - " [--ost-list|-o] \n" + " [--ost|-o] \n" " [--block|-b]\n" " [--non-block|-n]\n" + " [--non-direct|-D]\n" " \n" "\tstripe_count: number of OSTs to stripe a file over\n" "\tstripe_ost_index: index of the first OST to stripe a file over\n" @@ -476,11 +552,12 @@ command_t cmdlist[] = { "\tpool_name: name of the predefined pool of OSTs\n" "\tost_indices: OSTs to stripe over, in order\n" "\tblock: wait for the operation to return before continuing\n" - "\tnon-block: do not wait for the operation to return.\n"}, + "\tnon-block: do not wait for the operation to return\n" + "\tnon-direct: do not use direct I/O to copy file contents.\n"}, {"mv", lfs_mv, 0, "To move directories between MDTs. This command is deprecated, " "use \"migrate\" instead.\n" - "usage: mv [--mdt-index|-M] " + "usage: mv [--mdt-index|-m] " "[--verbose|-v]\n"}, {"ladvise", lfs_ladvise, 0, "Provide servers with advice about access patterns for a file.\n" @@ -494,8 +571,13 @@ command_t cmdlist[] = { "lfs mirror create - create a mirrored file or directory\n" "lfs mirror extend - add mirror(s) to an existing file\n" "lfs mirror split - split a mirror from an existing mirrored file\n" - "lfs mirror resync - resynchronize an out-of-sync mirrored file\n" - "lfs mirror verify - verify a mirrored file\n"}, + "lfs mirror resync - resynchronize out-of-sync mirrored file(s)\n" + "lfs mirror verify - verify mirrored file(s)\n"}, + {"getsom", lfs_getsom, 0, "To list the SOM info for a given file.\n" + "usage: getsom [-s] [-b] [-f] \n" + "\t-s: Only show the size value of the SOM data for a given file\n" + "\t-b: Only show the blocks value of the SOM data for a given file\n" + "\t-f: Only show the flags value of the SOM data for a given file\n"}, {"help", Parser_help, 0, "help"}, {"exit", Parser_quit, 0, "quit"}, {"quit", Parser_quit, 0, "quit"}, @@ -524,17 +606,20 @@ static const char *error_loc = "syserror"; enum { MIGRATION_NONBLOCK = 1 << 0, MIGRATION_MIRROR = 1 << 1, + MIGRATION_NONDIRECT = 1 << 2, }; static int lfs_component_create(char *fname, int open_flags, mode_t open_mode, struct llapi_layout *layout); static int -migrate_open_files(const char *name, const struct llapi_stripe_param *param, +migrate_open_files(const char *name, __u64 migration_flags, + const struct llapi_stripe_param *param, struct llapi_layout *layout, int *fd_src, int *fd_tgt) { int fd = -1; int fdv = -1; + int rflags; int mdt_index; int random_value; char parent[PATH_MAX]; @@ -571,7 +656,10 @@ migrate_open_files(const char *name, const struct llapi_stripe_param *param, /* open file, direct io */ /* even if the file is only read, WR mode is nedeed to allow * layout swap on fd */ - fd = open(name, O_RDWR | O_DIRECT); + rflags = O_RDWR; + if (!(migration_flags & MIGRATION_NONDIRECT)) + rflags |= O_DIRECT; + fd = open(name, rflags); if (fd < 0) { rc = -errno; error_loc = "cannot open source file"; @@ -865,28 +953,59 @@ static int migrate_nonblock(int fd, int fdv) return 0; } -static int lfs_component_set(char *fname, int comp_id, __u32 flags) +static int lfs_component_set(char *fname, int comp_id, + __u32 flags, __u32 neg_flags) { - return -ENOTSUP; + __u32 ids[2]; + __u32 flags_array[2]; + size_t count = 0; + int rc; + + if (flags) { + ids[count] = comp_id; + flags_array[count] = flags; + ++count; + } + + if (neg_flags) { + ids[count] = comp_id; + flags_array[count] = neg_flags | LCME_FL_NEG; + ++count; + } + + rc = llapi_layout_file_comp_set(fname, ids, flags_array, count); + if (rc) + fprintf(stderr, + "%s: cannot change the flags of component '%#x' of file '%s': %x / ^(%x)\n", + progname, comp_id, fname, flags, neg_flags); + + return rc; } -static int lfs_component_del(char *fname, __u32 comp_id, __u32 flags) +static int lfs_component_del(char *fname, __u32 comp_id, + __u32 flags, __u32 neg_flags) { int rc = 0; - if (flags != 0 && comp_id != 0) + if (flags && neg_flags) + return -EINVAL; + + if (!flags && neg_flags) + flags = neg_flags | LCME_FL_NEG; + + if ((flags && comp_id) || (!flags && !comp_id)) return -EINVAL; /* LCME_FL_INIT is the only supported flag in PFL */ - if (flags != 0) { + if (flags) { if (flags & ~LCME_KNOWN_FLAGS) { fprintf(stderr, - "%s setstripe: bad component flags %#x\n", + "%s setstripe: unknown flags %#x\n", progname, flags); return -EINVAL; } } else if (comp_id > LCME_ID_MAX) { - fprintf(stderr, "%s setstripe: bad component id %u\n", + fprintf(stderr, "%s setstripe: invalid component id %u\n", progname, comp_id); return -EINVAL; } @@ -944,7 +1063,8 @@ static int lfs_migrate(char *name, __u64 migration_flags, int fdv = -1; int rc; - rc = migrate_open_files(name, param, layout, &fd, &fdv); + rc = migrate_open_files(name, migration_flags, param, layout, + &fd, &fdv); if (rc < 0) goto out; @@ -957,7 +1077,7 @@ static int lfs_migrate(char *name, __u64 migration_flags, goto out; } - rc = llapi_lease_get(fd, LL_LEASE_RDLCK); + rc = llapi_lease_acquire(fd, LL_LEASE_RDLCK); if (rc < 0) { error_loc = "cannot get lease"; goto out; @@ -965,16 +1085,14 @@ static int lfs_migrate(char *name, __u64 migration_flags, rc = migrate_nonblock(fd, fdv); if (rc < 0) { - llapi_lease_put(fd); + llapi_lease_release(fd); goto out; } /* Atomically put lease, swap layouts and close. * for a migration we need to check data version on file did * not change. */ - rc = llapi_fswap_layouts(fd, fdv, 0, 0, - migration_flags & MIGRATION_MIRROR ? - MERGE_LAYOUTS_CLOSE : SWAP_LAYOUTS_CLOSE); + rc = llapi_fswap_layouts(fd, fdv, 0, 0, SWAP_LAYOUTS_CLOSE); if (rc < 0) { error_loc = "cannot swap layout"; goto out; @@ -993,9 +1111,78 @@ out: return rc; } +static int comp_str2flags(char *string, __u32 *flags, __u32 *neg_flags) +{ + char *name; + + if (string == NULL) + return -EINVAL; + + *flags = 0; + *neg_flags = 0; + for (name = strtok(string, ","); name; name = strtok(NULL, ",")) { + bool found = false; + int i; + + for (i = 0; i < ARRAY_SIZE(comp_flags_table); i++) { + __u32 comp_flag = comp_flags_table[i].cfn_flag; + const char *comp_name = comp_flags_table[i].cfn_name; + + if (strcmp(name, comp_name) == 0) { + *flags |= comp_flag; + found = true; + } else if (strncmp(name, "^", 1) == 0 && + strcmp(name + 1, comp_name) == 0) { + *neg_flags |= comp_flag; + found = true; + } + } + if (!found) { + llapi_printf(LLAPI_MSG_ERROR, + "%s: component flag '%s' not supported\n", + progname, name); + return -EINVAL; + } + } + + if (!*flags && !*neg_flags) + return -EINVAL; + + /* don't allow to set and exclude the same flag */ + if (*flags & *neg_flags) + return -EINVAL; + + return 0; +} + +static int mirror_str2state(char *string, __u16 *state, __u16 *neg_state) +{ + if (string == NULL) + return -EINVAL; + + *state = 0; + *neg_state = 0; + + if (strncmp(string, "^", 1) == 0) { + *neg_state = llapi_layout_string_flags(string + 1); + if (*neg_state != 0) + return 0; + } else { + *state = llapi_layout_string_flags(string); + if (*state != 0) + return 0; + } + + llapi_printf(LLAPI_MSG_ERROR, + "%s: mirrored file state '%s' not supported\n", + progname, string); + return -EINVAL; +} + /** * struct mirror_args - Command-line arguments for mirror(s). * @m_count: Number of mirrors to be created with this layout. + * @m_flags: Mirror level flags, only 'prefer' is supported. * @m_layout: Mirror layout. * @m_file: A victim file. Its layout will be split and used as a mirror. * @m_next: Point to the next node of the list. @@ -1005,11 +1192,36 @@ out: */ struct mirror_args { __u32 m_count; + __u32 m_flags; struct llapi_layout *m_layout; const char *m_file; struct mirror_args *m_next; }; +static int mirror_sanity_check_flags(struct llapi_layout *layout, void *unused) +{ + uint32_t flags; + int rc; + + rc = llapi_layout_comp_flags_get(layout, &flags); + if (rc) + return -errno; + + if (flags & LCME_FL_NEG) { + fprintf(stderr, "error: %s: negative flags are not supported\n", + progname); + return -EINVAL; + } + + if (flags & LCME_FL_STALE) { + fprintf(stderr, "error: %s: setting '%s' is not supported\n", + progname, comp_flags_table[LCME_FL_STALE].cfn_name); + return -EINVAL; + } + + return LLAPI_LAYOUT_ITER_CONT; +} + static inline int mirror_sanity_check_one(struct llapi_layout *layout) { uint64_t start, end; @@ -1045,19 +1257,24 @@ static inline int mirror_sanity_check_one(struct llapi_layout *layout) return -EINVAL; } - return 0; + rc = llapi_layout_comp_iterate(layout, mirror_sanity_check_flags, NULL); + return rc; } /** * enum mirror_flags - Flags for extending a mirrored file. - * @NO_VERIFY: Indicates not to verify the mirror(s) from victim file(s) + * @MF_NO_VERIFY: Indicates not to verify the mirror(s) from victim file(s) * in case the victim file(s) contains the same data as the * original mirrored file. + * @MF_DESTROY: Indicates to delete the mirror from the mirrored file. + * @MF_COMP_ID: specified component id instead of mirror id * * Flags for extending a mirrored file. */ enum mirror_flags { - NO_VERIFY = 0x1, + MF_NO_VERIFY = 0x1, + MF_DESTROY = 0x2, + MF_COMP_ID = 0x4, }; /** @@ -1111,9 +1328,8 @@ static int mirror_create_sanity_check(const char *fname, return -ENODATA; } } else { - if (list->m_layout != NULL) - has_m_layout = true; - else { + has_m_layout = true; + if (list->m_layout == NULL) { fprintf(stderr, "error: %s: no mirror layout\n", progname); return -EINVAL; @@ -1128,15 +1344,34 @@ static int mirror_create_sanity_check(const char *fname, } if (has_m_file && has_m_layout) { - fprintf(stderr, "error: %s: -f option should not " - "be specified with setstripe options or " - "--parent option\n", progname); + fprintf(stderr, + "error: %s: -f option should not be specified with setstripe options\n", + progname); return -EINVAL; } return 0; } +static int mirror_set_flags(struct llapi_layout *layout, void *cbdata) +{ + __u32 mirror_flags = *(__u32 *)cbdata; + uint32_t flags; + int rc; + + rc = llapi_layout_comp_flags_get(layout, &flags); + if (rc < 0) + return rc; + + if (!flags) { + rc = llapi_layout_comp_flags_set(layout, mirror_flags); + if (rc) + return rc; + } + + return LLAPI_LAYOUT_ITER_CONT; +} + /** * mirror_create() - Create a mirrored file. * @fname: The file to be created. @@ -1161,6 +1396,16 @@ static int mirror_create(char *fname, struct mirror_args *mirror_list) cur_mirror = mirror_list; while (cur_mirror != NULL) { + rc = llapi_layout_comp_iterate(cur_mirror->m_layout, + mirror_set_flags, + &cur_mirror->m_flags); + if (rc) { + rc = -errno; + fprintf(stderr, "%s: failed to set mirror flags\n", + progname); + goto error; + } + for (i = 0; i < cur_mirror->m_count; i++) { rc = llapi_layout_merge(&layout, cur_mirror->m_layout); if (rc) { @@ -1175,6 +1420,11 @@ static int mirror_create(char *fname, struct mirror_args *mirror_list) cur_mirror = cur_mirror->m_next; } + if (layout == NULL) { + fprintf(stderr, "error: %s: layout is NULL\n", progname); + return -EINVAL; + } + rc = llapi_layout_mirror_count_set(layout, mirror_count); if (rc) { rc = -errno; @@ -1183,7 +1433,7 @@ static int mirror_create(char *fname, struct mirror_args *mirror_list) goto error; } - rc = lfs_component_create(fname, O_CREAT | O_WRONLY, 0644, + rc = lfs_component_create(fname, O_CREAT | O_WRONLY, 0666, layout); if (rc >= 0) { close(rc); @@ -1244,7 +1494,7 @@ static int mirror_extend_file(const char *fname, const char *victim_file, int fdv = -1; struct stat stbuf; struct stat stbuf_v; - __u64 dv; + struct ll_ioc_lease *data = NULL; int rc; fd = open(fname, O_RDWR); @@ -1280,13 +1530,13 @@ static int mirror_extend_file(const char *fname, const char *victim_file, goto out; } - rc = llapi_lease_get(fd, LL_LEASE_RDLCK); + rc = llapi_lease_acquire(fd, LL_LEASE_RDLCK); if (rc < 0) { error_loc = "cannot get lease"; goto out; } - if (!(mirror_flags & NO_VERIFY)) { + if (!(mirror_flags & MF_NO_VERIFY)) { ssize_t ret; /* mirrors should have the same contents */ ret = mirror_file_compare(fd, fdv); @@ -1298,47 +1548,119 @@ static int mirror_extend_file(const char *fname, const char *victim_file, } /* Get rid of caching pages from clients */ - rc = llapi_get_data_version(fd, &dv, LL_DV_WR_FLUSH); + rc = llapi_file_flush(fd); if (rc < 0) { error_loc = "cannot get data version"; - return rc; + goto out; } - rc = llapi_get_data_version(fdv, &dv, LL_DV_WR_FLUSH); + rc = llapi_file_flush(fdv); if (rc < 0) { error_loc = "cannot get data version"; - return rc; + goto out; } /* Make sure we keep original atime/mtime values */ rc = migrate_copy_timestamps(fd, fdv); + if (rc < 0) { + error_loc = "cannot copy timestamp"; + goto out; + } - /* Atomically put lease, swap layouts and close. - * for a migration we need to check data version on file did - * not change. */ - rc = llapi_fswap_layouts(fd, fdv, 0, 0, MERGE_LAYOUTS_CLOSE); + /* Atomically put lease, merge layouts and close. */ + data = calloc(1, offsetof(typeof(*data), lil_ids[1])); + if (!data) { + error_loc = "memory allocation"; + goto out; + } + data->lil_mode = LL_LEASE_UNLCK; + data->lil_flags = LL_LEASE_LAYOUT_MERGE; + data->lil_count = 1; + data->lil_ids[0] = fdv; + rc = llapi_lease_set(fd, data); if (rc < 0) { - error_loc = "cannot swap layout"; + error_loc = "cannot merge layout"; + goto out; + } else if (rc == 0) { + rc = -EBUSY; + error_loc = "lost lease lock"; goto out; } + rc = 0; out: + if (data) + free(data); if (fd >= 0) close(fd); - if (fdv >= 0) close(fdv); - if (!rc) (void) unlink(victim_file); - if (rc < 0) fprintf(stderr, "error: %s: %s: %s: %s\n", progname, fname, error_loc, strerror(-rc)); return rc; } +static int mirror_extend_layout(char *name, struct llapi_layout *layout) +{ + struct ll_ioc_lease *data = NULL; + int fd = -1; + int fdv = -1; + int rc; + + rc = migrate_open_files(name, 0, NULL, layout, &fd, &fdv); + if (rc < 0) + goto out; + + rc = llapi_lease_acquire(fd, LL_LEASE_RDLCK); + if (rc < 0) { + error_loc = "cannot get lease"; + goto out; + } + + rc = migrate_nonblock(fd, fdv); + if (rc < 0) { + llapi_lease_release(fd); + goto out; + } + + /* Atomically put lease, merge layouts and close. */ + data = calloc(1, offsetof(typeof(*data), lil_ids[1])); + if (!data) { + error_loc = "memory allocation"; + goto out; + } + data->lil_mode = LL_LEASE_UNLCK; + data->lil_flags = LL_LEASE_LAYOUT_MERGE; + data->lil_count = 1; + data->lil_ids[0] = fdv; + rc = llapi_lease_set(fd, data); + if (rc < 0) { + error_loc = "cannot merge layout"; + goto out; + } else if (rc == 0) { + rc = -EBUSY; + error_loc = "lost lease lock"; + goto out; + } + rc = 0; + +out: + if (data) + free(data); + if (fd >= 0) + close(fd); + if (fdv >= 0) + close(fdv); + if (rc < 0) + fprintf(stderr, "error: %s: %s: %s: %s\n", + progname, name, error_loc, strerror(-rc)); + return rc; +} + static int mirror_extend(char *fname, struct mirror_args *mirror_list, enum mirror_flags mirror_flags) { @@ -1356,9 +1678,8 @@ static int mirror_extend(char *fname, struct mirror_args *mirror_list, __u32 mirror_count = mirror_list->m_count; while (mirror_count > 0) { - rc = lfs_migrate(fname, - MIGRATION_NONBLOCK | MIGRATION_MIRROR, - NULL, mirror_list->m_layout); + rc = mirror_extend_layout(fname, + mirror_list->m_layout); if (rc) break; @@ -1374,104 +1695,296 @@ static int mirror_extend(char *fname, struct mirror_args *mirror_list, 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) +static int find_mirror_id(struct llapi_layout *layout, void *cbdata) { + uint32_t id; int rc; - int nr = offset; - int slots = size - offset; - char *ptr = NULL; - bool end_of_loop; - if (arg == NULL) - return -EINVAL; + rc = llapi_layout_mirror_id_get(layout, &id); + if (rc < 0) + return rc; - end_of_loop = false; - while (!end_of_loop) { - int start_index; - int end_index; - int i; - char *endptr = NULL; + if ((__u16)id == *(__u16 *)cbdata) + return LLAPI_LAYOUT_ITER_STOP; - rc = -EINVAL; + return LLAPI_LAYOUT_ITER_CONT; +} - ptr = strchrnul(arg, ','); +static int find_comp_id(struct llapi_layout *layout, void *cbdata) +{ + uint32_t id; + int rc; - end_of_loop = *ptr == '\0'; - *ptr = '\0'; + rc = llapi_layout_comp_id_get(layout, &id); + if (rc < 0) + return rc; - 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; + if (id == *(__u32 *)cbdata) + return LLAPI_LAYOUT_ITER_STOP; - end_index = start_index; - if (*endptr == '-') { - end_index = strtol(endptr + 1, &endptr, 0); - if (*endptr != '\0') - break; - if (end_index < start_index) - break; - } + return LLAPI_LAYOUT_ITER_CONT; +} +static int mirror_split(const char *fname, __u32 id, + enum mirror_flags mflags, const char *victim_file) +{ + struct llapi_layout *layout; + char parent[PATH_MAX]; + char victim[PATH_MAX]; + int flags = O_CREAT | O_EXCL | O_LOV_DELAY_CREATE | O_NOFOLLOW; + char *ptr; + struct ll_ioc_lease *data; + uint16_t mirror_count; + int mdt_index; + int fd, fdv; + int rc; - for (i = start_index; i <= end_index && slots > 0; i++) { - int j; + /* check fname contains mirror with mirror_id/comp_id */ + layout = llapi_layout_get_by_path(fname, 0); + if (!layout) { + fprintf(stderr, + "error %s: file '%s' couldn't get layout\n", + progname, fname); + return -EINVAL; + } - /* 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; + rc = mirror_sanity_check_one(layout); + if (rc) + goto free_layout; - *ptr = ','; - arg = ++ptr; - offset = nr; - rc = 0; + rc = llapi_layout_mirror_count_get(layout, &mirror_count); + if (rc) { + fprintf(stderr, + "error %s: file '%s' couldn't get mirror count\n", + progname, fname); + goto free_layout; + } + if (mirror_count < 2) { + fprintf(stderr, + "error %s: file '%s' has %d component, cannot split\n", + progname, fname, mirror_count); + goto free_layout; } - if (!end_of_loop && ptr != NULL) - *ptr = ','; - return rc < 0 ? rc : nr; -} + if (mflags & MF_COMP_ID) { + rc = llapi_layout_comp_iterate(layout, find_comp_id, &id); + id = mirror_id_of(id); + } else { + rc = llapi_layout_comp_iterate(layout, find_mirror_id, &id); + } + if (rc < 0) { + fprintf(stderr, "error %s: failed to iterate layout of '%s'\n", + progname, fname); + goto free_layout; + } else if (rc == LLAPI_LAYOUT_ITER_CONT) { + fprintf(stderr, + "error %s: file '%s' does not contain mirror with id %u\n", + progname, fname, id); + goto free_layout; + } -struct lfs_setstripe_args { - unsigned long long lsa_comp_end; + fd = open(fname, O_RDWR); + if (fd < 0) { + fprintf(stderr, + "error %s: open file '%s' failed: %s\n", + progname, fname, strerror(errno)); + goto free_layout; + } + + /* get victim file directory pathname */ + if (strlen(fname) > sizeof(parent) - 1) { + fprintf(stderr, "error %s: file name of '%s' too long\n", + progname, fname); + rc = -ERANGE; + goto close_fd; + } + strncpy(parent, fname, sizeof(parent)); + ptr = strrchr(parent, '/'); + if (ptr == NULL) { + if (getcwd(parent, sizeof(parent)) == NULL) { + fprintf(stderr, "error %s: getcwd failed: %s\n", + progname, strerror(errno)); + rc = -errno; + goto close_fd; + } + } else { + if (ptr == parent) + ptr = parent + 1; + *ptr = '\0'; + } + + rc = llapi_file_fget_mdtidx(fd, &mdt_index); + if (rc < 0) { + fprintf(stderr, "%s: cannot get MDT index of '%s'\n", + progname, fname); + goto close_fd; + } + + if (victim_file == NULL) { + /* use a temp file to store the splitted layout */ + if (mflags & MF_DESTROY) { + fdv = llapi_create_volatile_idx(parent, mdt_index, + O_LOV_DELAY_CREATE); + } else { + snprintf(victim, sizeof(victim), "%s.mirror~%u", + fname, id); + fdv = open(victim, flags, S_IRUSR | S_IWUSR); + } + } else { + /* user specified victim file */ + fdv = open(victim_file, flags, S_IRUSR | S_IWUSR); + } + + if (fdv < 0) { + fprintf(stderr, + "error %s: create victim file failed: %s\n", + progname, strerror(errno)); + goto close_fd; + } + + /* get lease lock of fname */ + rc = llapi_lease_acquire(fd, LL_LEASE_WRLCK); + if (rc < 0) { + fprintf(stderr, + "error %s: cannot get lease of file '%s': %d\n", + progname, fname, rc); + goto close_victim; + } + + /* Atomatically put lease, split layouts and close. */ + data = malloc(offsetof(typeof(*data), lil_ids[2])); + if (!data) { + rc = -ENOMEM; + goto close_victim; + } + + data->lil_mode = LL_LEASE_UNLCK; + data->lil_flags = LL_LEASE_LAYOUT_SPLIT; + data->lil_count = 2; + data->lil_ids[0] = fdv; + data->lil_ids[1] = id; + rc = llapi_lease_set(fd, data); + if (rc <= 0) { + if (rc == 0) /* lost lease lock */ + rc = -EBUSY; + fprintf(stderr, + "error %s: cannot split '%s': %s\n", + progname, fname, strerror(-rc)); + } else { + rc = 0; + } + free(data); + +close_victim: + close(fdv); +close_fd: + close(fd); +free_layout: + llapi_layout_free(layout); + return rc; +} + +/** + * Parse a string containing an target 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 tgts array and remove duplicates. + * + * \param[out] tgts array to store indices in + * \param[in] size size of \a tgts array + * \param[in] offset starting index in \a tgts + * \param[in] arg string containing OST index list + * + * \retval positive number of indices in \a tgts + * \retval -EINVAL unable to parse \a arg + */ +static int parse_targets(__u32 *tgts, 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; + + 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 (tgts[j] == i) + break; + } + if (j == offset) { /* no duplicate */ + tgts[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; +} + +struct lfs_setstripe_args { + unsigned long long lsa_comp_end; unsigned long long lsa_stripe_size; long long lsa_stripe_count; long long lsa_stripe_off; __u32 lsa_comp_flags; - int lsa_nr_osts; + __u32 lsa_comp_neg_flags; unsigned long long lsa_pattern; - __u32 *lsa_osts; + unsigned int lsa_mirror_count; + int lsa_nr_tgts; + bool lsa_first_comp; + __u32 *lsa_tgts; char *lsa_pool_name; }; static inline void setstripe_args_init(struct lfs_setstripe_args *lsa) { + unsigned int mirror_count = lsa->lsa_mirror_count; + bool first_comp = lsa->lsa_first_comp; + memset(lsa, 0, sizeof(*lsa)); lsa->lsa_stripe_size = LLAPI_LAYOUT_DEFAULT; @@ -1479,6 +1992,9 @@ static inline void setstripe_args_init(struct lfs_setstripe_args *lsa) lsa->lsa_stripe_off = LLAPI_LAYOUT_DEFAULT; lsa->lsa_pattern = LLAPI_LAYOUT_RAID0; lsa->lsa_pool_name = NULL; + + lsa->lsa_mirror_count = mirror_count; + lsa->lsa_first_comp = first_comp; } /** @@ -1528,7 +2044,8 @@ static inline bool setstripe_args_specified(struct lfs_setstripe_args *lsa) * Return: 0 on success or an error code on failure. */ static int comp_args_to_layout(struct llapi_layout **composite, - struct lfs_setstripe_args *lsa) + struct lfs_setstripe_args *lsa, + bool set_extent) { struct llapi_layout *layout = *composite; uint64_t prev_end = 0; @@ -1554,19 +2071,30 @@ static int comp_args_to_layout(struct llapi_layout **composite, return rc; } - rc = llapi_layout_comp_add(layout); + if (lsa->lsa_first_comp) + prev_end = 0; + + if (lsa->lsa_first_comp) + rc = llapi_layout_add_first_comp(layout); + else + rc = llapi_layout_comp_add(layout); if (rc) { fprintf(stderr, "Add component failed. %s\n", strerror(errno)); return rc; } } + /* reset lsa_first_comp */ + lsa->lsa_first_comp = false; - rc = llapi_layout_comp_extent_set(layout, prev_end, lsa->lsa_comp_end); - if (rc) { - fprintf(stderr, "Set extent [%lu, %llu) failed. %s\n", - prev_end, lsa->lsa_comp_end, strerror(errno)); - return rc; + if (set_extent) { + rc = llapi_layout_comp_extent_set(layout, prev_end, + lsa->lsa_comp_end); + if (rc) { + fprintf(stderr, "Set extent [%lu, %llu) failed. %s\n", + prev_end, lsa->lsa_comp_end, strerror(errno)); + return rc; + } } /* Data-on-MDT component setting */ @@ -1585,10 +2113,10 @@ static int comp_args_to_layout(struct llapi_layout **composite, lsa->lsa_stripe_size); return -EINVAL; } - if (lsa->lsa_nr_osts != 0) { + if (lsa->lsa_nr_tgts != 0) { fprintf(stderr, "Option 'ost-list' can't be specified " "with Data-on-MDT component: '%i'\n", - lsa->lsa_nr_osts); + lsa->lsa_nr_tgts); return -EINVAL; } if (lsa->lsa_stripe_off != LLAPI_LAYOUT_DEFAULT) { @@ -1628,6 +2156,13 @@ static int comp_args_to_layout(struct llapi_layout **composite, return rc; } + rc = llapi_layout_comp_flags_set(layout, lsa->lsa_comp_flags); + if (rc) { + fprintf(stderr, "Set flags 0x%x failed: %s\n", + lsa->lsa_comp_flags, strerror(errno)); + return rc; + } + if (lsa->lsa_pool_name != NULL) { rc = llapi_layout_pool_name_set(layout, lsa->lsa_pool_name); if (rc) { @@ -1644,22 +2179,23 @@ static int comp_args_to_layout(struct llapi_layout **composite, } } - if (lsa->lsa_nr_osts > 0) { + if (lsa->lsa_nr_tgts > 0) { if (lsa->lsa_stripe_count > 0 && lsa->lsa_stripe_count != LLAPI_LAYOUT_DEFAULT && lsa->lsa_stripe_count != LLAPI_LAYOUT_WIDE && - lsa->lsa_nr_osts != lsa->lsa_stripe_count) { - fprintf(stderr, "stripe_count(%lld) != nr_osts(%d)\n", - lsa->lsa_stripe_count, lsa->lsa_nr_osts); + lsa->lsa_nr_tgts != lsa->lsa_stripe_count) { + fprintf(stderr, "stripe_count(%lld) != nr_tgts(%d)\n", + lsa->lsa_stripe_count, lsa->lsa_nr_tgts); return -EINVAL; } - for (i = 0; i < lsa->lsa_nr_osts; i++) { + for (i = 0; i < lsa->lsa_nr_tgts; i++) { rc = llapi_layout_ost_index_set(layout, i, - lsa->lsa_osts[i]); + lsa->lsa_tgts[i]); if (rc) break; } - } else if (lsa->lsa_stripe_off != LLAPI_LAYOUT_DEFAULT) { + } else if (lsa->lsa_stripe_off != LLAPI_LAYOUT_DEFAULT && + lsa->lsa_stripe_off != -1) { rc = llapi_layout_ost_index_set(layout, 0, lsa->lsa_stripe_off); } if (rc) { @@ -1671,6 +2207,140 @@ static int comp_args_to_layout(struct llapi_layout **composite, return 0; } +static int build_component(struct llapi_layout **layout, + struct lfs_setstripe_args *lsa, bool set_extent) +{ + int rc; + + rc = comp_args_to_layout(layout, lsa, set_extent); + if (rc) + return rc; + + if (lsa->lsa_mirror_count > 0) { + rc = llapi_layout_mirror_count_set(*layout, + lsa->lsa_mirror_count); + if (rc) + return rc; + + rc = llapi_layout_flags_set(*layout, LCM_FL_RDONLY); + if (rc) + return rc; + lsa->lsa_mirror_count = 0; + } + + return rc; +} + +static int build_layout_from_yaml_node(struct cYAML *node, + struct llapi_layout **layout, + struct lfs_setstripe_args *lsa, + __u32 *osts) +{ + char *string; + int rc = 0; + + while (node) { + string = node->cy_string; + /* skip leading lmm_ if present, to simplify parsing */ + if (string != NULL && strncmp(string, "lmm_", 4) == 0) + string += 4; + + if (node->cy_type == CYAML_TYPE_STRING) { + if (!strcmp(string, "lcme_extent.e_end")) { + if (!strcmp(node->cy_valuestring, "EOF") || + !strcmp(node->cy_valuestring, "eof")) + lsa->lsa_comp_end = LUSTRE_EOF; + } else if (!strcmp(string, "pool")) { + lsa->lsa_pool_name = node->cy_valuestring; + } else if (!strcmp(string, "pattern")) { + if (!strcmp(node->cy_valuestring, "mdt")) + lsa->lsa_pattern = LLAPI_LAYOUT_MDT; + } + } else if (node->cy_type == CYAML_TYPE_NUMBER) { + if (!strcmp(string, "lcm_mirror_count")) { + lsa->lsa_mirror_count = node->cy_valueint; + } else if (!strcmp(string, "lcme_extent.e_start")) { + if (node->cy_valueint != 0 || *layout != NULL) { + rc = build_component(layout, lsa, true); + if (rc) + return rc; + } + + if (node->cy_valueint == 0) + lsa->lsa_first_comp = true; + + /* initialize lsa */ + setstripe_args_init(lsa); + lsa->lsa_tgts = osts; + } else if (!strcmp(string, "lcme_extent.e_end")) { + if (node->cy_valueint == -1) + lsa->lsa_comp_end = LUSTRE_EOF; + else + lsa->lsa_comp_end = node->cy_valueint; + } else if (!strcmp(string, "stripe_count")) { + lsa->lsa_stripe_count = node->cy_valueint; + } else if (!strcmp(string, "stripe_size")) { + lsa->lsa_stripe_size = node->cy_valueint; + } else if (!strcmp(string, "stripe_offset")) { + lsa->lsa_stripe_off = node->cy_valueint; + } else if (!strcmp(string, "l_ost_idx")) { + osts[lsa->lsa_nr_tgts] = node->cy_valueint; + lsa->lsa_nr_tgts++; + } + } else if (node->cy_type == CYAML_TYPE_OBJECT) { + /* go deep to sub blocks */ + rc = build_layout_from_yaml_node(node->cy_child, layout, + lsa, osts); + if (rc) + return rc; + } + node = node->cy_next; + } + + return rc; +} + +static int lfs_comp_create_from_yaml(char *template, + struct llapi_layout **layout, + struct lfs_setstripe_args *lsa, + __u32 *osts) +{ + struct cYAML *tree = NULL, *err_rc = NULL; + int rc = 0; + + tree = cYAML_build_tree(template, NULL, 0, &err_rc, false); + if (!tree) { + fprintf(stderr, "%s: cannot parse YAML file %s\n", + progname, template); + cYAML_build_error(-EINVAL, -1, "yaml", "from comp yaml", + "can't parse", &err_rc); + cYAML_print_tree2file(stderr, err_rc); + cYAML_free_tree(err_rc); + rc = -EINVAL; + goto err; + } + + /* initialize lsa for plain file */ + setstripe_args_init(lsa); + lsa->lsa_tgts = osts; + + rc = build_layout_from_yaml_node(tree, layout, lsa, osts); + if (rc) { + fprintf(stderr, "%s: cannot build layout from YAML file %s.\n", + progname, template); + goto err; + } else { + rc = build_component(layout, lsa, *layout != NULL); + } + /* clean clean lsa */ + setstripe_args_init(lsa); + +err: + if (tree) + cYAML_free_tree(tree); + return rc; +} + /* In 'lfs setstripe --component-add' mode, we need to fetch the extent * end of the last component in the existing file, and adjust the * first extent start of the components to be added accordingly. */ @@ -1765,69 +2435,6 @@ static int adjust_first_extent(char *fname, struct llapi_layout *layout) return 0; } -static inline bool comp_flags_is_neg(__u32 flags) -{ - return flags & LCME_FL_NEG; -} - -static inline void comp_flags_set_neg(__u32 *flags) -{ - *flags |= LCME_FL_NEG; -} - -static inline void comp_flags_clear_neg(__u32 *flags) -{ - *flags &= ~LCME_FL_NEG; -} - -static int comp_str2flags(__u32 *flags, char *string) -{ - char *name; - __u32 neg_flags = 0; - - if (string == NULL) - return -EINVAL; - - *flags = 0; - for (name = strtok(string, ","); name; name = strtok(NULL, ",")) { - bool found = false; - int i; - - for (i = 0; i < ARRAY_SIZE(comp_flags_table); i++) { - __u32 comp_flag = comp_flags_table[i].cfn_flag; - const char *comp_name = comp_flags_table[i].cfn_name; - - if (strcmp(name, comp_name) == 0) { - *flags |= comp_flag; - found = true; - } else if (strncmp(name, "^", 1) == 0 && - strcmp(name + 1, comp_name) == 0) { - neg_flags |= comp_flag; - found = true; - } - } - if (!found) { - llapi_printf(LLAPI_MSG_ERROR, - "%s: component flag '%s' not supported\n", - progname, name); - return -EINVAL; - } - } - - if (*flags == 0 && neg_flags == 0) - return -EINVAL; - /* don't support mixed flags for now */ - if (*flags && neg_flags) - return -EINVAL; - - if (neg_flags) { - *flags = neg_flags; - comp_flags_set_neg(flags); - } - - return 0; -} - static inline bool arg_is_eof(char *arg) { return !strncmp(arg, "-1", strlen("-1")) || @@ -1900,22 +2507,27 @@ enum { LFS_COMP_DEL_OPT, LFS_COMP_SET_OPT, LFS_COMP_ADD_OPT, - LFS_COMP_USE_PARENT_OPT, LFS_COMP_NO_VERIFY_OPT, LFS_PROJID_OPT, + LFS_MIRROR_FLAGS_OPT, + LFS_MIRROR_ID_OPT, + LFS_MIRROR_STATE_OPT, + LFS_LAYOUT_COPY, + LFS_MIRROR_INDEX_OPT, }; /* functions */ -static int lfs_setstripe0(int argc, char **argv, enum setstripe_origin opc) +static int lfs_setstripe_internal(int argc, char **argv, + enum setstripe_origin opc) { - struct lfs_setstripe_args lsa; + struct lfs_setstripe_args lsa = { 0 }; struct llapi_stripe_param *param = NULL; struct find_param migrate_mdt_param = { .fp_max_depth = -1, .fp_mdt_index = -1, }; char *fname; - int result; + int result = 0; int result2 = 0; char *end; int c; @@ -1938,43 +2550,57 @@ static int lfs_setstripe0(int argc, char **argv, enum setstripe_origin opc) struct mirror_args *mirror_list = NULL; struct mirror_args *new_mirror = NULL; struct mirror_args *last_mirror = NULL; + __u16 mirror_id = 0; char cmd[PATH_MAX]; + bool from_yaml = false; + bool from_copy = false; + char *template = NULL; struct option long_opts[] = { - /* --block is only valid in migrate mode */ - { .val = 'b', .name = "block", .has_arg = no_argument}, +/* find { .val = 'A', .name = "atime", .has_arg = required_argument }*/ + /* --block is only valid in migrate mode */ + { .val = 'b', .name = "block", .has_arg = no_argument }, { .val = LFS_COMP_ADD_OPT, - .name = "comp-add", .has_arg = no_argument}, + .name = "comp-add", .has_arg = no_argument }, { .val = LFS_COMP_ADD_OPT, - .name = "component-add", - .has_arg = no_argument}, + .name = "component-add", .has_arg = no_argument }, { .val = LFS_COMP_DEL_OPT, - .name = "comp-del", .has_arg = no_argument}, + .name = "comp-del", .has_arg = no_argument }, { .val = LFS_COMP_DEL_OPT, - .name = "component-del", - .has_arg = no_argument}, + .name = "component-del", .has_arg = no_argument }, { .val = LFS_COMP_FLAGS_OPT, - .name = "comp-flags", .has_arg = required_argument}, + .name = "comp-flags", .has_arg = required_argument }, { .val = LFS_COMP_FLAGS_OPT, .name = "component-flags", - .has_arg = required_argument}, + .has_arg = required_argument }, { .val = LFS_COMP_SET_OPT, - .name = "comp-set", .has_arg = no_argument}, + .name = "comp-set", .has_arg = no_argument }, { .val = LFS_COMP_SET_OPT, .name = "component-set", .has_arg = no_argument}, - { .val = LFS_COMP_USE_PARENT_OPT, - .name = "parent", .has_arg = no_argument}, { .val = LFS_COMP_NO_VERIFY_OPT, .name = "no-verify", .has_arg = no_argument}, + { .val = LFS_MIRROR_FLAGS_OPT, + .name = "flags", .has_arg = required_argument}, + { .val = LFS_MIRROR_ID_OPT, + .name = "mirror-id", .has_arg = required_argument}, + { .val = LFS_LAYOUT_COPY, + .name = "copy", .has_arg = required_argument}, { .val = 'c', .name = "stripe-count", .has_arg = required_argument}, { .val = 'c', .name = "stripe_count", .has_arg = required_argument}, +/* find { .val = 'C', .name = "ctime", .has_arg = required_argument }*/ { .val = 'd', .name = "delete", .has_arg = no_argument}, + { .val = 'd', .name = "destroy", .has_arg = no_argument}, + /* --non-direct is only valid in migrate mode */ + { .val = 'D', .name = "non-direct", .has_arg = no_argument }, { .val = 'E', .name = "comp-end", .has_arg = required_argument}, { .val = 'E', .name = "component-end", .has_arg = required_argument}, { .val = 'f', .name = "file", .has_arg = required_argument }, - /* dirstripe {"mdt-hash", required_argument, 0, 'H'}, */ +/* find { .val = 'F', .name = "fid", .has_arg = no_argument }, */ +/* find { .val = 'g', .name = "gid", .has_arg = no_argument }, */ +/* find { .val = 'G', .name = "group", .has_arg = required_argument }*/ +/* dirstripe { .val = 'H', .name = "mdt-hash", .has_arg = required_argument }*/ { .val = 'i', .name = "stripe-index", .has_arg = required_argument}, { .val = 'i', .name = "stripe_index", .has_arg = required_argument}, { .val = 'I', .name = "comp-id", .has_arg = required_argument}, @@ -1983,20 +2609,28 @@ static int lfs_setstripe0(int argc, char **argv, enum setstripe_origin opc) { .val = 'm', .name = "mdt", .has_arg = required_argument}, { .val = 'm', .name = "mdt-index", .has_arg = required_argument}, { .val = 'm', .name = "mdt_index", .has_arg = required_argument}, - { .val = 'N', .name = "mirror-count", .has_arg = optional_argument}, /* --non-block is only valid in migrate mode */ - { .val = 'n', .name = "non-block", .has_arg = no_argument}, - { .val = 'o', .name = "ost", .has_arg = required_argument}, + { .val = 'n', .name = "non-block", .has_arg = no_argument }, + { .val = 'N', .name = "mirror-count", .has_arg = optional_argument}, + { .val = 'o', .name = "ost", .has_arg = required_argument }, #if LUSTRE_VERSION_CODE < OBD_OCD_VERSION(3, 0, 53, 0) { .val = 'o', .name = "ost-list", .has_arg = required_argument }, { .val = 'o', .name = "ost_list", .has_arg = required_argument }, #endif { .val = 'p', .name = "pool", .has_arg = required_argument }, +/* find { .val = 'P', .name = "print", .has_arg = no_argument }, */ +/* getstripe { .val = 'q', .name = "quiet", .has_arg = no_argument }, */ +/* getstripe { .val = 'r', .name = "recursive", .has_arg = no_argument }, */ +/* getstripe { .val = 'R', .name = "raw", .has_arg = no_argument }, */ { .val = 'S', .name = "stripe-size", .has_arg = required_argument }, { .val = 'S', .name = "stripe_size", .has_arg = required_argument }, - /* dirstripe {"mdt-count", required_argument, 0, 'T'}, */ +/* find { .val = 't', .name = "type", .has_arg = required_argument }*/ +/* dirstripe { .val = 'T', .name = "mdt-count", .has_arg = required_argument }*/ +/* find { .val = 'u', .name = "uid", .has_arg = required_argument }*/ +/* find { .val = 'U', .name = "user", .has_arg = required_argument }*/ /* --verbose is only valid in migrate mode */ - { .val = 'v', .name = "verbose", .has_arg = no_argument }, + { .val = 'v', .name = "verbose", .has_arg = no_argument}, + { .val = 'y', .name = "yaml", .has_arg = required_argument }, { .name = NULL } }; setstripe_args_init(&lsa); @@ -2006,7 +2640,7 @@ static int lfs_setstripe0(int argc, char **argv, enum setstripe_origin opc) snprintf(cmd, sizeof(cmd), "%s %s", progname, argv[0]); progname = cmd; - while ((c = getopt_long(argc, argv, "bc:dE:f:i:I:m:N::no:p:L:s:S:v", + while ((c = getopt_long(argc, argv, "bc:dDE:f:i:I:m:N::no:p:L:s:S:vy:", long_opts, NULL)) >= 0) { switch (c) { case 0: @@ -2019,24 +2653,71 @@ static int lfs_setstripe0(int argc, char **argv, enum setstripe_origin opc) comp_del = 1; break; case LFS_COMP_FLAGS_OPT: - result = comp_str2flags(&lsa.lsa_comp_flags, optarg); + result = comp_str2flags(optarg, &lsa.lsa_comp_flags, + &lsa.lsa_comp_neg_flags); if (result != 0) goto usage_error; - break; - case LFS_COMP_SET_OPT: - comp_set = 1; - break; - case LFS_COMP_USE_PARENT_OPT: - if (!mirror_mode) { - fprintf(stderr, "error: %s: --parent must be " - "specified with --mirror-count|-N " - "option\n", progname); + if (mirror_mode && lsa.lsa_comp_neg_flags) { + fprintf(stderr, "%s: inverted flags are not supported\n", + progname); goto usage_error; } - setstripe_args_init(&lsa); - break; - case LFS_COMP_NO_VERIFY_OPT: - mirror_flags |= NO_VERIFY; + if (lsa.lsa_comp_neg_flags & LCME_FL_STALE) { + fprintf(stderr, + "%s: cannot clear 'stale' flags from component. Please use lfs-mirror-resync(1) instead\n", + progname); + result = -EINVAL; + goto error; + } + + break; + case LFS_COMP_SET_OPT: + comp_set = 1; + break; + case LFS_COMP_NO_VERIFY_OPT: + mirror_flags |= MF_NO_VERIFY; + break; + case LFS_MIRROR_ID_OPT: + mirror_id = strtoul(optarg, &end, 0); + if (*end != '\0' || mirror_id == 0) { + fprintf(stderr, + "%s %s: invalid mirror ID '%s'\n", + progname, argv[0], optarg); + goto usage_error; + } + break; + case LFS_MIRROR_FLAGS_OPT: { + __u32 flags; + + if (!mirror_mode || !last_mirror) { + fprintf(stderr, "error: %s: --flags must be specified with --mirror-count|-N option\n", + progname); + goto usage_error; + } + + result = comp_str2flags(optarg, &last_mirror->m_flags, + &flags); + if (result != 0) + goto usage_error; + + if (flags) { + fprintf(stderr, "%s: inverted flags are not supported\n", + progname); + result = -EINVAL; + goto usage_error; + } + if (last_mirror->m_flags & ~LCME_USER_FLAGS) { + fprintf(stderr, + "%s: unsupported mirror flags: %s\n", + progname, optarg); + result = -EINVAL; + goto error; + } + break; + } + case LFS_LAYOUT_COPY: + from_copy = true; + template = optarg; break; case 'b': if (!migrate_mode) { @@ -2062,10 +2743,29 @@ static int lfs_setstripe0(int argc, char **argv, enum setstripe_origin opc) case 'd': /* delete the default striping pattern */ delete = 1; + if (opc == SO_MIRROR_SPLIT) { + if (has_m_file) { + fprintf(stderr, + "%s %s: -d cannot used with -f\n", + progname, argv[0]); + goto usage_error; + } + mirror_flags |= MF_DESTROY; + } + break; + case 'D': + if (!migrate_mode) { + fprintf(stderr, + "%s %s: -D|--non-direct is valid " + "only for migrate command\n", + progname, argv[0]); + goto usage_error; + } + migration_flags |= MIGRATION_NONDIRECT; break; case 'E': if (lsa.lsa_comp_end != 0) { - result = comp_args_to_layout(lpp, &lsa); + result = comp_args_to_layout(lpp, &lsa, true); if (result) { fprintf(stderr, "%s %s: invalid layout\n", @@ -2112,21 +2812,27 @@ static int lfs_setstripe0(int argc, char **argv, enum setstripe_origin opc) } break; case 'f': - if (opc != SO_MIRROR_EXTEND) { + if (opc != SO_MIRROR_EXTEND && opc != SO_MIRROR_SPLIT) { fprintf(stderr, "error: %s: invalid option: %s\n", progname, argv[optopt + 1]); goto usage_error; } - if (last_mirror == NULL) { - fprintf(stderr, "error: %s: '-N' must exist " - "in front of '%s'\n", - progname, argv[optopt + 1]); - goto usage_error; + if (opc == SO_MIRROR_EXTEND) { + if (last_mirror == NULL) { + fprintf(stderr, + "error: %s: '-N' must exist in front of '%s'\n", + progname, argv[optopt + 1]); + goto usage_error; + } + last_mirror->m_file = optarg; + last_mirror->m_count = 1; + } else { + /* mirror split */ + if (mirror_list == NULL) + mirror_list = lfs_mirror_alloc(); + mirror_list->m_file = optarg; } - - last_mirror->m_file = optarg; - last_mirror->m_count = 1; has_m_file = true; break; case 'L': @@ -2199,7 +2905,7 @@ static int lfs_setstripe0(int argc, char **argv, enum setstripe_origin opc) if (lsa.lsa_comp_end == 0) lsa.lsa_comp_end = LUSTRE_EOF; - result = comp_args_to_layout(lpp, &lsa); + result = comp_args_to_layout(lpp, &lsa, true); if (result) { lfs_mirror_free(new_mirror); goto error; @@ -2214,17 +2920,22 @@ static int lfs_setstripe0(int argc, char **argv, enum setstripe_origin opc) lpp = &last_mirror->m_layout; break; case 'o': - lsa.lsa_nr_osts = parse_targets(osts, +#if LUSTRE_VERSION_CODE < OBD_OCD_VERSION(3, 0, 53, 0) + if (strcmp(argv[optind - 1], "--ost-list") == 0) + fprintf(stderr, "warning: '--ost-list' is " + "deprecated, use '--ost' instead\n"); +#endif + lsa.lsa_nr_tgts = parse_targets(osts, sizeof(osts) / sizeof(__u32), - lsa.lsa_nr_osts, optarg); - if (lsa.lsa_nr_osts < 0) { + lsa.lsa_nr_tgts, optarg); + if (lsa.lsa_nr_tgts < 0) { fprintf(stderr, "%s %s: invalid OST target(s) '%s'\n", progname, argv[0], optarg); goto usage_error; } - lsa.lsa_osts = osts; + lsa.lsa_tgts = osts; if (lsa.lsa_stripe_off == LLAPI_LAYOUT_DEFAULT) lsa.lsa_stripe_off = osts[0]; break; @@ -2232,6 +2943,11 @@ static int lfs_setstripe0(int argc, char **argv, enum setstripe_origin opc) if (optarg == NULL) goto usage_error; lsa.lsa_pool_name = optarg; + + if (strlen(lsa.lsa_pool_name) == 0 || + strncmp(lsa.lsa_pool_name, "none", + LOV_MAXPOOLNAME) == 0) + lsa.lsa_pool_name = NULL; break; case 'S': result = llapi_parse_size(optarg, &lsa.lsa_stripe_size, @@ -2252,6 +2968,10 @@ static int lfs_setstripe0(int argc, char **argv, enum setstripe_origin opc) } migrate_mdt_param.fp_verbose = VERBOSE_DETAIL; break; + case 'y': + from_yaml = true; + template = optarg; + break; default: fprintf(stderr, "%s %s: unrecognized option '%s'\n", progname, argv[0], argv[optind - 1]); @@ -2281,12 +3001,12 @@ static int lfs_setstripe0(int argc, char **argv, enum setstripe_origin opc) } if (lsa.lsa_comp_end != 0) { - result = comp_args_to_layout(lpp, &lsa); + result = comp_args_to_layout(lpp, &lsa, true); if (result) goto error; } - if (mirror_flags & NO_VERIFY) { + if (mirror_flags & MF_NO_VERIFY) { if (opc != SO_MIRROR_EXTEND) { fprintf(stderr, "error: %s: --no-verify is valid only for lfs mirror extend command\n", @@ -2305,8 +3025,8 @@ static int lfs_setstripe0(int argc, char **argv, enum setstripe_origin opc) /* Only LCME_FL_INIT flags is used in PFL, and it shouldn't be * altered by user space tool, so we don't need to support the * --component-set for this moment. */ - if (comp_set != 0) { - fprintf(stderr, "%s %s: --component-set not supported\n", + if (comp_set && !comp_id) { + fprintf(stderr, "%s %s: --component-set doesn't have component-id set\n", progname, argv[0]); goto usage_error; } @@ -2375,6 +3095,21 @@ static int lfs_setstripe0(int argc, char **argv, enum setstripe_origin opc) goto error; } + if (from_yaml && from_copy) { + fprintf(stderr, + "%s: can't specify --yaml and --copy together\n", + progname); + goto error; + } + + if ((from_yaml || from_copy) && + (setstripe_args_specified(&lsa) || layout != NULL)) { + fprintf(stderr, "error: %s: can't specify --yaml with " + "-c, -S, -i, -o, -p or -E options.\n", + argv[0]); + goto error; + } + if (mdt_idx_arg != NULL && optind > 3) { fprintf(stderr, "%s %s: option -m cannot be used with other options\n", @@ -2389,9 +3124,10 @@ static int lfs_setstripe0(int argc, char **argv, enum setstripe_origin opc) goto usage_error; } - if (!comp_del && !comp_set && comp_id != 0) { + if (!comp_del && !comp_set && (opc != SO_MIRROR_SPLIT) && + comp_id != 0) { fprintf(stderr, - "%s %s: option -I can only be used with --component-del\n", + "%s %s: option -I can only be used with --component-del or --component-set or lfs mirror split\n", progname, argv[0]); goto usage_error; } @@ -2408,7 +3144,7 @@ static int lfs_setstripe0(int argc, char **argv, enum setstripe_origin opc) } else if (layout == NULL) { /* initialize stripe parameters */ param = calloc(1, offsetof(typeof(*param), - lsp_osts[lsa.lsa_nr_osts])); + lsp_osts[lsa.lsa_nr_tgts])); if (param == NULL) { fprintf(stderr, "%s %s: cannot allocate memory for parameters: %s\n", @@ -2431,23 +3167,43 @@ static int lfs_setstripe0(int argc, char **argv, enum setstripe_origin opc) param->lsp_stripe_offset = lsa.lsa_stripe_off; param->lsp_pool = lsa.lsa_pool_name; param->lsp_is_specific = false; - if (lsa.lsa_nr_osts > 0) { + if (lsa.lsa_nr_tgts > 0) { if (lsa.lsa_stripe_count > 0 && lsa.lsa_stripe_count != LLAPI_LAYOUT_DEFAULT && lsa.lsa_stripe_count != LLAPI_LAYOUT_WIDE && - lsa.lsa_nr_osts != lsa.lsa_stripe_count) { + lsa.lsa_nr_tgts != lsa.lsa_stripe_count) { fprintf(stderr, "error: %s: stripe count %lld " "doesn't match the number of OSTs: %d\n" , argv[0], lsa.lsa_stripe_count, - lsa.lsa_nr_osts); + lsa.lsa_nr_tgts); free(param); goto usage_error; } param->lsp_is_specific = true; - param->lsp_stripe_count = lsa.lsa_nr_osts; + param->lsp_stripe_count = lsa.lsa_nr_tgts; memcpy(param->lsp_osts, osts, - sizeof(*osts) * lsa.lsa_nr_osts); + sizeof(*osts) * lsa.lsa_nr_tgts); + } + } + + if (from_yaml) { + /* generate a layout from a YAML template */ + result = lfs_comp_create_from_yaml(template, &layout, + &lsa, osts); + if (result) { + fprintf(stderr, "error: %s: can't create composite " + "layout from template file %s\n", + argv[0], template); + goto error; + } + } else if (from_copy) { + layout = llapi_layout_get_by_path(template, 0); + if (layout == NULL) { + fprintf(stderr, + "%s: can't create composite layout from file %s.\n", + progname, template); + goto error; } } @@ -2459,10 +3215,12 @@ static int lfs_setstripe0(int argc, char **argv, enum setstripe_origin opc) layout); } else if (comp_set != 0) { result = lfs_component_set(fname, comp_id, - lsa.lsa_comp_flags); + lsa.lsa_comp_flags, + lsa.lsa_comp_neg_flags); } else if (comp_del != 0) { result = lfs_component_del(fname, comp_id, - lsa.lsa_comp_flags); + lsa.lsa_comp_flags, + lsa.lsa_comp_neg_flags); } else if (comp_add != 0) { result = lfs_component_add(fname, layout); } else if (opc == SO_MIRROR_CREATE) { @@ -2470,9 +3228,23 @@ static int lfs_setstripe0(int argc, char **argv, enum setstripe_origin opc) } else if (opc == SO_MIRROR_EXTEND) { result = mirror_extend(fname, mirror_list, mirror_flags); + } else if (opc == SO_MIRROR_SPLIT) { + if (mirror_id == 0 && comp_id == 0) { + fprintf(stderr, + "%s %s: no mirror id or component id is specified\n", + progname, argv[0]); + goto usage_error; + } + if (mirror_id != 0) + comp_id = mirror_id; + else + mirror_flags |= MF_COMP_ID; + result = mirror_split(fname, comp_id, mirror_flags, + has_m_file ? mirror_list->m_file : + NULL); } else if (layout != NULL) { result = lfs_component_create(fname, O_CREAT | O_WRONLY, - 0644, layout); + 0666, layout); if (result >= 0) { close(result); result = 0; @@ -2480,7 +3252,7 @@ static int lfs_setstripe0(int argc, char **argv, enum setstripe_origin opc) } else { result = llapi_file_open_param(fname, O_CREAT | O_WRONLY, - 0644, param); + 0666, param); if (result >= 0) { close(result); result = 0; @@ -2516,28 +3288,38 @@ static int lfs_poollist(int argc, char **argv) static int set_time(time_t *time, time_t *set, char *str) { - time_t t; - int res = 0; + time_t t; + int res = 0; + char *endptr; - if (str[0] == '+') - res = 1; - else if (str[0] == '-') - res = -1; + if (str[0] == '+') + res = 1; + else if (str[0] == '-') + res = -1; - if (res) - str++; + if (res) + str++; - t = strtol(str, NULL, 0); - if (*time < t * 24 * 60 * 60) { - if (res) - str--; - fprintf(stderr, "Wrong time '%s' is specified.\n", str); - return INT_MAX; - } + t = strtol(str, &endptr, 0); + if (*endptr != '\0') { + fprintf(stderr, + "%s find: bad time '%s': %s\n", + progname, str, strerror(EINVAL)); + return INT_MAX; + } + if (*time < t * 24 * 60 * 60) { + if (res != 0) + str--; + fprintf(stderr, + "%s find: bad time '%s': too large\n", + progname, str); + return INT_MAX; + } - *set = *time - t * 24 * 60 * 60; - return res; + *set = *time - t * 24 * 60 * 60; + return res; } + static int name2uid(unsigned int *id, const char *name) { struct passwd *passwd; @@ -2623,6 +3405,7 @@ static int lfs_find(int argc, char **argv) }; struct option long_opts[] = { { .val = 'A', .name = "atime", .has_arg = required_argument }, + { .val = 'b', .name = "blocks", .has_arg = required_argument }, { .val = LFS_COMP_COUNT_OPT, .name = "comp-count", .has_arg = required_argument }, { .val = LFS_COMP_COUNT_OPT, @@ -2638,35 +3421,43 @@ static int lfs_find(int argc, char **argv) { .val = LFS_COMP_START_OPT, .name = "component-start", .has_arg = required_argument }, + { .val = LFS_MIRROR_STATE_OPT, + .name = "mirror-state", .has_arg = required_argument }, { .val = 'c', .name = "stripe-count", .has_arg = required_argument }, { .val = 'c', .name = "stripe_count", .has_arg = required_argument }, { .val = 'C', .name = "ctime", .has_arg = required_argument }, +/* getstripe { .val = 'd', .name = "directory", .has_arg = no_argument }, */ { .val = 'D', .name = "maxdepth", .has_arg = required_argument }, { .val = 'E', .name = "comp-end", .has_arg = required_argument }, { .val = 'E', .name = "component-end", .has_arg = required_argument }, +/* find { .val = 'F', .name = "fid", .has_arg = no_argument }, */ { .val = 'g', .name = "gid", .has_arg = required_argument }, { .val = 'G', .name = "group", .has_arg = required_argument }, { .val = 'H', .name = "mdt-hash", .has_arg = required_argument }, { .val = 'i', .name = "stripe-index", .has_arg = required_argument }, { .val = 'i', .name = "stripe_index", .has_arg = required_argument }, - /*{"component-id", required_argument, 0, 'I'},*/ +/* getstripe { .val = 'I', .name = "comp-id", .has_arg = required_argument }*/ { .val = 'L', .name = "layout", .has_arg = required_argument }, { .val = 'm', .name = "mdt", .has_arg = required_argument }, { .val = 'm', .name = "mdt-index", .has_arg = required_argument }, { .val = 'm', .name = "mdt_index", .has_arg = required_argument }, { .val = 'M', .name = "mtime", .has_arg = required_argument }, { .val = 'n', .name = "name", .has_arg = required_argument }, - /* reserve {"or", no_argument, , 0, 'o'}, to match find(1) */ + { .val = 'N', .name = "mirror-count", .has_arg = required_argument }, +/* find { .val = 'o' .name = "or", .has_arg = no_argument }, like find(1) */ { .val = 'O', .name = "obd", .has_arg = required_argument }, { .val = 'O', .name = "ost", .has_arg = required_argument }, - /* no short option for pool, p/P already used */ + /* no short option for pool yet, can be 'p' after 2.18 */ { .val = LFS_POOL_OPT, .name = "pool", .has_arg = required_argument }, - { .val = 'p', .name = "print0", .has_arg = no_argument }, + { .val = '0', .name = "print0", .has_arg = no_argument }, { .val = 'P', .name = "print", .has_arg = no_argument }, { .val = LFS_PROJID_OPT, .name = "projid", .has_arg = required_argument }, +/* getstripe { .val = 'q', .name = "quiet", .has_arg = no_argument }, */ +/* getstripe { .val = 'r', .name = "recursive", .has_arg = no_argument }, */ +/* getstripe { .val = 'R', .name = "raw", .has_arg = no_argument }, */ { .val = 's', .name = "size", .has_arg = required_argument }, { .val = 'S', .name = "stripe-size", .has_arg = required_argument }, { .val = 'S', .name = "stripe_size", .has_arg = required_argument }, @@ -2674,6 +3465,8 @@ static int lfs_find(int argc, char **argv) { .val = 'T', .name = "mdt-count", .has_arg = required_argument }, { .val = 'u', .name = "uid", .has_arg = required_argument }, { .val = 'U', .name = "user", .has_arg = required_argument }, +/* getstripe { .val = 'v', .name = "verbose", .has_arg = no_argument }, */ +/* getstripe { .val = 'y', .name = "yaml", .has_arg = no_argument }, */ { .name = NULL } }; int pathstart = -1; int pathend = -1; @@ -2687,7 +3480,7 @@ static int lfs_find(int argc, char **argv) /* when getopt_long_only() hits '!' it returns 1, puts "!" in optarg */ while ((c = getopt_long_only(argc, argv, - "-A:c:C:D:E:g:G:H:i:L:m:M:n:O:Ppqrs:S:t:T:u:U:v", + "-0A:b:c:C:D:E:g:G:H:i:L:m:M:n:N:O:Ppqrs:S:t:T:u:U:v", long_opts, NULL)) >= 0) { xtime = NULL; xsign = NULL; @@ -2749,6 +3542,26 @@ static int lfs_find(int argc, char **argv) if (rc) *xsign = rc; break; + case 'b': + if (optarg[0] == '+') { + param.fp_blocks_sign = -1; + optarg++; + } else if (optarg[0] == '-') { + param.fp_blocks_sign = 1; + optarg++; + } + + param.fp_blocks_units = 1024; + ret = llapi_parse_size(optarg, ¶m.fp_blocks, + ¶m.fp_blocks_units, 0); + if (ret) { + fprintf(stderr, "error: bad blocks '%s'\n", + optarg); + goto err; + } + param.fp_check_blocks = 1; + param.fp_exclude_blocks = !!neg_opt; + break; case LFS_COMP_COUNT_OPT: if (optarg[0] == '+') { param.fp_comp_count_sign = -1; @@ -2768,14 +3581,19 @@ static int lfs_find(int argc, char **argv) param.fp_exclude_comp_count = !!neg_opt; break; case LFS_COMP_FLAGS_OPT: - rc = comp_str2flags(¶m.fp_comp_flags, optarg); - if (rc || comp_flags_is_neg(param.fp_comp_flags)) { + rc = comp_str2flags(optarg, ¶m.fp_comp_flags, + ¶m.fp_comp_neg_flags); + if (rc) { fprintf(stderr, "error: bad component flags " "'%s'\n", optarg); goto err; } param.fp_check_comp_flags = 1; - param.fp_exclude_comp_flags = !!neg_opt; + if (neg_opt) { + __u32 flags = param.fp_comp_neg_flags; + param.fp_comp_neg_flags = param.fp_comp_flags; + param.fp_comp_flags = flags; + } break; case LFS_COMP_START_OPT: if (optarg[0] == '+') { @@ -2796,6 +3614,23 @@ static int lfs_find(int argc, char **argv) param.fp_check_comp_start = 1; param.fp_exclude_comp_start = !!neg_opt; break; + case LFS_MIRROR_STATE_OPT: + rc = mirror_str2state(optarg, ¶m.fp_mirror_state, + ¶m.fp_mirror_neg_state); + if (rc) { + fprintf(stderr, + "error: bad mirrored file state '%s'\n", + optarg); + goto err; + } + param.fp_check_mirror_state = 1; + if (neg_opt) { + __u16 state = param.fp_mirror_neg_state; + param.fp_mirror_neg_state = + param.fp_mirror_state; + param.fp_mirror_state = state; + } + break; case 'c': if (optarg[0] == '+') { param.fp_stripe_count_sign = -1; @@ -2892,26 +3727,29 @@ static int lfs_find(int argc, char **argv) param.fp_exclude_uid = !!neg_opt; param.fp_check_uid = 1; break; - case LFS_POOL_OPT: - if (strlen(optarg) > LOV_MAXPOOLNAME) { - fprintf(stderr, - "Pool name %s is too long" - " (max is %d)\n", optarg, - LOV_MAXPOOLNAME); - ret = -1; - goto err; - } - /* we do check for empty pool because empty pool - * is used to find V1 lov attributes */ - 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.fp_pattern = (char *)optarg; param.fp_exclude_pattern = !!neg_opt; break; + case 'N': + if (optarg[0] == '+') { + param.fp_mirror_count_sign = -1; + optarg++; + } else if (optarg[0] == '-') { + param.fp_mirror_count_sign = 1; + optarg++; + } + + param.fp_mirror_count = strtoul(optarg, &endptr, 0); + if (*endptr != '\0') { + fprintf(stderr, + "error: bad mirror count '%s'\n", + optarg); + goto err; + } + param.fp_check_mirror_count = 1; + param.fp_exclude_mirror_count = !!neg_opt; + break; case 'm': case 'i': case 'O': { @@ -2989,10 +3827,35 @@ err_free: free(buf); break; } +#if LUSTRE_VERSION_CODE >= OBD_OCD_VERSION(2, 18, 53, 0) case 'p': +#endif + case LFS_POOL_OPT: + if (strlen(optarg) > LOV_MAXPOOLNAME) { + fprintf(stderr, + "Pool name %s is too long (max %d)\n", + optarg, LOV_MAXPOOLNAME); + ret = -1; + goto err; + } + /* + * We do check for empty pool because empty pool + * is used to find V1 LOV attributes + */ + 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; +#if LUSTRE_VERSION_CODE < OBD_OCD_VERSION(2, 14, 53, 0) + case 'p': /* want this for --pool, to match getstripe/find */ + fprintf(stderr, + "warning: -p deprecated, use --print0 or -0\n"); +#endif + case '0': param.fp_zero_end = 1; break; - case 'P': + case 'P': /* we always print, this option is a no-op */ break; case LFS_PROJID_OPT: rc = name2projid(¶m.fp_projid, optarg); @@ -3136,6 +3999,8 @@ static int lfs_getstripe_internal(int argc, char **argv, struct find_param *param) { struct option long_opts[] = { +/* find { .val = 'A', .name = "atime", .has_arg = required_argument }*/ +/* find { .val = 'b', .name = "blocks", .has_arg = required_argument }*/ { .val = LFS_COMP_COUNT_OPT, .name = "comp-count", .has_arg = no_argument }, { .val = LFS_COMP_COUNT_OPT, @@ -3148,29 +4013,21 @@ static int lfs_getstripe_internal(int argc, char **argv, .name = "comp-start", .has_arg = optional_argument }, { .val = LFS_COMP_START_OPT, .name = "component-start", .has_arg = optional_argument }, -#if LUSTRE_VERSION_CODE < OBD_OCD_VERSION(2, 9, 59, 0) - /* This formerly implied "stripe-count", but was explicitly - * made "stripe-count" for consistency with other options, - * and to separate it from "mdt-count" when DNE arrives. */ - { .val = 'c', .name = "count", .has_arg = no_argument }, -#endif + { .val = LFS_MIRROR_INDEX_OPT, + .name = "mirror-index", .has_arg = required_argument }, + { .val = LFS_MIRROR_ID_OPT, + .name = "mirror-id", .has_arg = required_argument }, { .val = 'c', .name = "stripe-count", .has_arg = no_argument }, { .val = 'c', .name = "stripe_count", .has_arg = no_argument }, +/* find { .val = 'C', .name = "ctime", .has_arg = required_argument }*/ { .val = 'd', .name = "directory", .has_arg = no_argument }, { .val = 'D', .name = "default", .has_arg = no_argument }, { .val = 'E', .name = "comp-end", .has_arg = optional_argument }, - { .val = 'E', .name = "component-end", - .has_arg = optional_argument }, + { .val = 'E', .name = "component-end", .has_arg = optional_argument }, { .val = 'F', .name = "fid", .has_arg = no_argument }, { .val = 'g', .name = "generation", .has_arg = no_argument }, - /* dirstripe { .val = 'H', .name = "mdt-hash", - * .has_arg = required_argument }, */ -#if LUSTRE_VERSION_CODE < OBD_OCD_VERSION(2, 9, 59, 0) - /* This formerly implied "stripe-index", but was explicitly - * made "stripe-index" for consistency with other options, - * and to separate it from "mdt-index" when DNE arrives. */ - { .val = 'i', .name = "index", .has_arg = no_argument }, -#endif +/* find { .val = 'G', .name = "group", .has_arg = required_argument }*/ +/* dirstripe { .val = 'H', .name = "mdt-hash", .has_arg = required_argument }*/ { .val = 'i', .name = "stripe-index", .has_arg = no_argument }, { .val = 'i', .name = "stripe_index", .has_arg = no_argument }, { .val = 'I', .name = "comp-id", .has_arg = optional_argument }, @@ -3179,45 +4036,56 @@ static int lfs_getstripe_internal(int argc, char **argv, { .val = 'm', .name = "mdt", .has_arg = no_argument }, { .val = 'm', .name = "mdt-index", .has_arg = no_argument }, { .val = 'm', .name = "mdt_index", .has_arg = no_argument }, -#if LUSTRE_VERSION_CODE < OBD_OCD_VERSION(3, 0, 53, 0) - { .val = 'M', .name = "mdt-index", .has_arg = no_argument }, - { .val = 'M', .name = "mdt_index", .has_arg = no_argument }, -#endif -#if LUSTRE_VERSION_CODE < OBD_OCD_VERSION(2, 9, 59, 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. */ - { .val = 'o', .name = "offset", .has_arg = no_argument }, -#endif +/* find { .val = 'M', .name = "mtime", .has_arg = required_argument }*/ +/* find { .val = 'n', .name = "name", .has_arg = required_argument }*/ { .val = 'O', .name = "obd", .has_arg = required_argument }, { .val = 'O', .name = "ost", .has_arg = required_argument }, { .val = 'p', .name = "pool", .has_arg = no_argument }, +/* find { .val = 'P', .name = "print", .has_arg = no_argument }, */ { .val = 'q', .name = "quiet", .has_arg = no_argument }, { .val = 'r', .name = "recursive", .has_arg = no_argument }, { .val = 'R', .name = "raw", .has_arg = no_argument }, -#if LUSTRE_VERSION_CODE < OBD_OCD_VERSION(2, 9, 59, 0) - /* This formerly implied "--stripe-size", but was confusing - * with "lfs find --size|-s", which means "file size", so use - * the consistent "--stripe-size|-S" for all commands. */ - { .val = 's', .name = "size", .has_arg = no_argument }, -#endif { .val = 'S', .name = "stripe-size", .has_arg = no_argument }, { .val = 'S', .name = "stripe_size", .has_arg = no_argument }, - /* dirstripe { .val = 'T', .name = "mdt-count", - * .has_arg = required_argument }, */ +/* find { .val = 't', .name = "type", .has_arg = required_argument }*/ +/* dirstripe { .val = 'T', .name = "mdt-count", .has_arg = required_argument }*/ +/* find { .val = 'u', .name = "uid", .has_arg = required_argument }*/ +/* find { .val = 'U', .name = "user", .has_arg = required_argument }*/ { .val = 'v', .name = "verbose", .has_arg = no_argument }, { .val = 'y', .name = "yaml", .has_arg = no_argument }, { .name = NULL } }; int c, rc; + int neg_opt = 0; + int pathstart = -1, pathend = -1; + int isoption; char *end, *tmp; - while ((c = getopt_long(argc, argv, "cdDE::FghiI::LmMoO:pqrRsSvy", - long_opts, NULL)) != -1) { + while ((c = getopt_long(argc, argv, + "-cdDE::FghiI::LmMoO:pqrRsSvy", + long_opts, NULL)) != -1) { + if (neg_opt) + --neg_opt; + + /* '!' is part of option */ + isoption = (c != 1) || (strcmp(optarg, "!") == 0); + if (!isoption && pathend != -1) { + fprintf(stderr, + "error: %s: filename|dirname must either precede options or follow options\n", + argv[0]); + return CMD_HELP; + } + if (!isoption && pathstart == -1) + pathstart = optind - 1; + if (isoption && pathstart != -1 && pathend == -1) + pathend = optind - 2; + switch (c) { + case 1: + /* unknown: opt is "!" */ + if (strcmp(optarg, "!") == 0) + neg_opt = 2; + break; case 'c': - if (strcmp(argv[optind - 1], "--count") == 0) - fprintf(stderr, "warning: '--count' deprecated," - " use '--stripe-count' instead\n"); if (!(param->fp_verbose & VERBOSE_DETAIL)) { param->fp_verbose |= VERBOSE_COUNT; param->fp_max_depth = 0; @@ -3229,19 +4097,16 @@ static int lfs_getstripe_internal(int argc, char **argv, break; case LFS_COMP_FLAGS_OPT: if (optarg != NULL) { - __u32 *flags = ¶m->fp_comp_flags; - rc = comp_str2flags(flags, optarg); + rc = comp_str2flags(optarg, + ¶m->fp_comp_flags, + ¶m->fp_comp_neg_flags); if (rc != 0) { fprintf(stderr, "error: %s bad " "component flags '%s'.\n", argv[0], optarg); return CMD_HELP; - } else { - param->fp_check_comp_flags = 1; - param->fp_exclude_comp_flags = - comp_flags_is_neg(*flags); - comp_flags_clear_neg(flags); } + param->fp_check_comp_flags = 1; } else { param->fp_verbose |= VERBOSE_COMP_FLAGS; param->fp_max_depth = 0; @@ -3273,6 +4138,58 @@ static int lfs_getstripe_internal(int argc, char **argv, param->fp_max_depth = 0; } break; + case LFS_MIRROR_INDEX_OPT: + if (optarg[0] == '+') { + param->fp_mirror_index_sign = -1; + optarg++; + } else if (optarg[0] == '-') { + param->fp_mirror_index_sign = 1; + optarg++; + } + + param->fp_mirror_index = strtoul(optarg, &end, 0); + if (*end != '\0' || (param->fp_mirror_index == 0 && + param->fp_mirror_index_sign == 0 && neg_opt == 0)) { + fprintf(stderr, + "%s %s: invalid mirror index '%s'\n", + progname, argv[0], optarg); + return CMD_HELP; + } + if (param->fp_mirror_id != 0) { + fprintf(stderr, + "%s %s: can't specify both mirror index and mirror ID\n", + progname, argv[0]); + return CMD_HELP; + } + param->fp_check_mirror_index = 1; + param->fp_exclude_mirror_index = !!neg_opt; + break; + case LFS_MIRROR_ID_OPT: + if (optarg[0] == '+') { + param->fp_mirror_id_sign = -1; + optarg++; + } else if (optarg[0] == '-') { + param->fp_mirror_id_sign = 1; + optarg++; + } + + param->fp_mirror_id = strtoul(optarg, &end, 0); + if (*end != '\0' || (param->fp_mirror_id == 0 && + param->fp_mirror_id_sign == 0 && neg_opt == 0)) { + fprintf(stderr, + "%s %s: invalid mirror ID '%s'\n", + progname, argv[0], optarg); + return CMD_HELP; + } + if (param->fp_mirror_index != 0) { + fprintf(stderr, + "%s %s: can't specify both mirror index and mirror ID\n", + progname, argv[0]); + return CMD_HELP; + } + param->fp_check_mirror_id = 1; + param->fp_exclude_mirror_id = !!neg_opt; + break; case 'd': param->fp_max_depth = 0; break; @@ -3323,17 +4240,7 @@ static int lfs_getstripe_internal(int argc, char **argv, param->fp_max_depth = 0; } break; -#if LUSTRE_VERSION_CODE < OBD_OCD_VERSION(2, 9, 59, 0) - case 'o': - fprintf(stderr, "warning: '--offset|-o' deprecated, " - "use '--stripe-index|-i' instead\n"); -#endif case 'i': -#if LUSTRE_VERSION_CODE >= OBD_OCD_VERSION(2, 6, 53, 0) - if (strcmp(argv[optind - 1], "--index") == 0) - fprintf(stderr, "warning: '--index' deprecated" - ", use '--stripe-index' instead\n"); -#endif if (!(param->fp_verbose & VERBOSE_DETAIL)) { param->fp_verbose |= VERBOSE_OFFSET; param->fp_max_depth = 0; @@ -3364,10 +4271,8 @@ static int lfs_getstripe_internal(int argc, char **argv, break; #if LUSTRE_VERSION_CODE < OBD_OCD_VERSION(3, 0, 53, 0) case 'M': -#if LUSTRE_VERSION_CODE >= OBD_OCD_VERSION(2, 11, 53, 0) fprintf(stderr, "warning: '-M' deprecated" - ", use '-m' instead\n"); -#endif + ", use '--mdt-index' or '-m' instead\n"); #endif case 'm': if (!(param->fp_verbose & VERBOSE_DETAIL)) @@ -3398,11 +4303,6 @@ static int lfs_getstripe_internal(int argc, char **argv, case 'R': param->fp_raw = 1; break; -#if LUSTRE_VERSION_CODE < OBD_OCD_VERSION(2, 9, 59, 0) - case 's': - fprintf(stderr, "warning: '--size|-s' deprecated, " - "use '--stripe-size|-S' instead\n"); -#endif /* LUSTRE_VERSION_CODE < OBD_OCD_VERSION(2, 9, 59, 0) */ case 'S': if (!(param->fp_verbose & VERBOSE_DETAIL)) { param->fp_verbose |= VERBOSE_SIZE; @@ -3420,7 +4320,16 @@ static int lfs_getstripe_internal(int argc, char **argv, } } - if (optind >= argc) + if (pathstart == -1) { + fprintf(stderr, "error: %s: no filename|pathname\n", + argv[0]); + return CMD_HELP; + } else if (pathend == -1) { + /* no options */ + pathend = argc; + } + + if (pathend > argc) return CMD_HELP; if (param->fp_recursive) @@ -3434,8 +4343,8 @@ static int lfs_getstripe_internal(int argc, char **argv, param->fp_verbose = VERBOSE_OBJID; do { - rc = llapi_getstripe(argv[optind], param); - } while (++optind < argc && !rc); + rc = llapi_getstripe(argv[pathstart], param); + } while (++pathstart < pathend && !rc); if (rc) fprintf(stderr, "error: %s failed for %s.\n", @@ -3494,17 +4403,13 @@ static int lfs_getdirstripe(int argc, char **argv) { struct find_param param = { 0 }; struct option long_opts[] = { -#if LUSTRE_VERSION_CODE < OBD_OCD_VERSION(3, 0, 53, 0) { .val = 'c', .name = "mdt-count", .has_arg = no_argument }, -#endif { .val = 'D', .name = "default", .has_arg = no_argument }, { .val = 'H', .name = "mdt-hash", .has_arg = no_argument }, { .val = 'i', .name = "mdt-index", .has_arg = no_argument }, + { .val = 'm', .name = "mdt-index", .has_arg = no_argument }, { .val = 'O', .name = "obd", .has_arg = required_argument }, { .val = 'r', .name = "recursive", .has_arg = no_argument }, -#if LUSTRE_VERSION_CODE < OBD_OCD_VERSION(3, 0, 53, 0) - { .val = 't', .name = "mdt-hash", .has_arg = no_argument }, -#endif { .val = 'T', .name = "mdt-count", .has_arg = no_argument }, { .val = 'y', .name = "yaml", .has_arg = no_argument }, { .name = NULL } }; @@ -3513,39 +4418,36 @@ static int lfs_getdirstripe(int argc, char **argv) param.fp_get_lmv = 1; while ((c = getopt_long(argc, argv, - "cDHiO:rtTy", long_opts, NULL)) != -1) + "cDHimO:rtTy", long_opts, NULL)) != -1) { switch (c) { - case 'O': - if (param.fp_obd_uuid) { - fprintf(stderr, - "error: %s: only one obduuid allowed", - argv[0]); - return CMD_HELP; - } - param.fp_obd_uuid = (struct obd_uuid *)optarg; - break; -#if LUSTRE_VERSION_CODE < OBD_OCD_VERSION(3, 0, 53, 0) case 'c': -#if LUSTRE_VERSION_CODE >= OBD_OCD_VERSION(2, 10, 50, 0) - fprintf(stderr, "warning: '-c' deprecated" - ", use '-T' instead\n"); -#endif -#endif case 'T': param.fp_verbose |= VERBOSE_COUNT; break; + case 'D': + param.fp_get_default_lmv = 1; + break; case 'i': + case 'm': param.fp_verbose |= VERBOSE_OFFSET; break; #if LUSTRE_VERSION_CODE < OBD_OCD_VERSION(3, 0, 53, 0) case 't': + fprintf(stderr, "warning: '-t' deprecated, " + "use '--mdt-hash' or '-H' instead\n"); #endif case 'H': param.fp_verbose |= VERBOSE_HASH_TYPE; break; - case 'D': - param.fp_get_default_lmv = 1; + case 'O': + if (param.fp_obd_uuid) { + fprintf(stderr, + "error: %s: only one obduuid allowed", + argv[0]); + return CMD_HELP; + } + param.fp_obd_uuid = (struct obd_uuid *)optarg; break; case 'r': param.fp_recursive = 1; @@ -3577,298 +4479,22 @@ static int lfs_getdirstripe(int argc, char **argv) return rc; } -/* functions */ -static int lfs_setdirstripe(int argc, char **argv) -{ - char *dname; - int result; - unsigned int stripe_offset = -1; - unsigned int stripe_count = 1; - enum lmv_hash_type hash_type; - char *end; - int c; - char *stripe_offset_opt = NULL; - char *stripe_count_opt = NULL; - char *stripe_hash_opt = NULL; - 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; +enum mntdf_flags { + MNTDF_INODES = 0x0001, + MNTDF_COOKED = 0x0002, + MNTDF_LAZY = 0x0004, + MNTDF_VERBOSE = 0x0008, + MNTDF_SHOW = 0x0010, +}; - struct option long_opts[] = { -#if LUSTRE_VERSION_CODE < OBD_OCD_VERSION(3, 0, 53, 0) - { .val = 'c', .name = "count", .has_arg = required_argument }, -#endif - { .val = 'c', .name = "mdt-count", .has_arg = required_argument }, - { .val = 'd', .name = "delete", .has_arg = no_argument }, -#if LUSTRE_VERSION_CODE < OBD_OCD_VERSION(3, 0, 53, 0) - { .val = 'i', .name = "index", .has_arg = required_argument }, -#endif - { .val = 'i', .name = "mdt-index", .has_arg = required_argument }, - { .val = 'm', .name = "mode", .has_arg = required_argument }, -#if LUSTRE_VERSION_CODE < OBD_OCD_VERSION(3, 0, 53, 0) - { .val = 't', .name = "hash-type", .has_arg = required_argument }, - { .val = 't', .name = "mdt-hash", .has_arg = required_argument }, -#endif - {"mdt-hash", required_argument, 0, 'H'}, -#if LUSTRE_VERSION_CODE < OBD_OCD_VERSION(3, 0, 53, 0) - { .val = 'D', .name = "default_stripe", - .has_arg = no_argument }, -#endif - { .val = 'D', .name = "default", .has_arg = no_argument }, - { .name = NULL } }; - - while ((c = getopt_long(argc, argv, "c:dDi:H:m:t:", long_opts, - NULL)) >= 0) { - switch (c) { - case 0: - /* Long options. */ - break; - case 'c': -#if LUSTRE_VERSION_CODE >= OBD_OCD_VERSION(2, 11, 53, 0) - if (strcmp(argv[optind - 1], "--count") == 0) - fprintf(stderr, - "%s %s: warning: '--count' deprecated, use '--mdt-count' instead\n", - progname, argv[0]); -#endif - stripe_count_opt = optarg; - break; - case 'd': - delete = true; - default_stripe = true; - break; - case 'D': - default_stripe = true; - break; - case 'i': -#if LUSTRE_VERSION_CODE >= OBD_OCD_VERSION(2, 11, 53, 0) - if (strcmp(argv[optind - 1], "--index") == 0) - fprintf(stderr, - "%s %s: warning: '--index' deprecated, use '--mdt-index' instead\n", - progname, argv[0]); -#endif - stripe_offset_opt = optarg; - break; - case 'm': - mode_opt = optarg; - break; -#if LUSTRE_VERSION_CODE < OBD_OCD_VERSION(3, 0, 53, 0) - case 't': -#endif - case 'H': -#if LUSTRE_VERSION_CODE >= OBD_OCD_VERSION(2, 11, 53, 0) - if (strcmp(argv[optind - 1], "--hash-type") == 0) - fprintf(stderr, - "%s %s: warning: '--hash-type' deprecated, use '--mdt-hash' instead\n", - progname, argv[0]); -#endif - stripe_hash_opt = optarg; - break; - default: - fprintf(stderr, "%s %s: unrecognized option '%s'\n", - progname, argv[0], argv[optind - 1]); - return CMD_HELP; - } - } - - if (optind == argc) { - fprintf(stderr, "%s %s: DIR must be specified\n", - progname, argv[0]); - return CMD_HELP; - } - - if (!delete && stripe_offset_opt == NULL && stripe_count_opt == NULL) { - fprintf(stderr, - "%s %s: stripe offset and count must be specified\n", - progname, argv[0]); - return CMD_HELP; - } - - if (stripe_offset_opt != NULL) { - /* get the stripe offset */ - stripe_offset = strtoul(stripe_offset_opt, &end, 0); - if (*end != '\0') { - fprintf(stderr, - "%s %s: bad stripe offset '%s'\n", - progname, argv[0], stripe_offset_opt); - return CMD_HELP; - } - } - - if (delete) { - if (stripe_offset_opt != NULL || stripe_count_opt != NULL) { - fprintf(stderr, - "%s %s: cannot specify -d with -c or -i options\n", - progname, argv[0]); - return CMD_HELP; - } else { - stripe_count = 0; - } - } - - - if (mode_opt != NULL) { - mode = strtoul(mode_opt, &end, 8); - if (*end != '\0') { - fprintf(stderr, - "%s %s: bad MODE '%s'\n", - progname, argv[0], mode_opt); - return CMD_HELP; - } - previous_mode = umask(0); - } - - if (stripe_hash_opt == NULL) { - hash_type = LMV_HASH_TYPE_FNV_1A_64; - } else { - hash_type = check_hashtype(stripe_hash_opt); - if (hash_type == 0) { - fprintf(stderr, "%s %s: bad stripe hash type '%s'\n", - progname, argv[0], stripe_hash_opt); - return CMD_HELP; - } - } - - /* get the stripe count */ - if (stripe_count_opt != NULL) { - stripe_count = strtoul(stripe_count_opt, &end, 0); - if (*end != '\0') { - fprintf(stderr, - "%s %s: bad stripe count '%s'\n", - progname, argv[0], stripe_count_opt); - return CMD_HELP; - } - } - - dname = argv[optind]; - do { - 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, mode, - stripe_offset, - stripe_count, hash_type, - NULL); - } - - if (result) { - fprintf(stderr, - "%s setdirstripe: cannot create stripe dir '%s': %s\n", - progname, dname, strerror(-result)); - break; - } - dname = argv[++optind]; - } while (dname != NULL); - - if (mode_opt != NULL) - umask(previous_mode); - - return result; -} - -/* functions */ -static int lfs_rmentry(int argc, char **argv) -{ - char *dname; - int index; - int result = 0; - - if (argc <= 1) { - fprintf(stderr, "error: %s: missing dirname\n", - argv[0]); - return CMD_HELP; - } - - index = 1; - dname = argv[index]; - while (dname != NULL) { - result = llapi_direntry_remove(dname); - if (result) { - fprintf(stderr, "error: %s: remove dir entry '%s' " - "failed\n", argv[0], dname); - break; - } - dname = argv[++index]; - } - return result; -} - -static int lfs_mv(int argc, char **argv) -{ - struct find_param param = { - .fp_max_depth = -1, - .fp_mdt_index = -1, - }; - char *end; - int c; - int rc = 0; - struct option long_opts[] = { - { .val = 'M', .name = "mdt-index", .has_arg = required_argument }, - { .val = 'v', .name = "verbose", .has_arg = no_argument }, - { .name = NULL } }; - - while ((c = getopt_long(argc, argv, "M:v", long_opts, NULL)) != -1) { - switch (c) { - case 'M': { - param.fp_mdt_index = strtoul(optarg, &end, 0); - if (*end != '\0') { - fprintf(stderr, "%s: invalid MDT index'%s'\n", - argv[0], optarg); - return CMD_HELP; - } - break; - } - case 'v': { - param.fp_verbose = VERBOSE_DETAIL; - break; - } - default: - fprintf(stderr, "error: %s: unrecognized option '%s'\n", - argv[0], argv[optind - 1]); - return CMD_HELP; - } - } - - 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]); - return CMD_HELP; - } - - param.fp_migrate = 1; - rc = llapi_migrate_mdt(argv[optind], ¶m); - if (rc != 0) - fprintf(stderr, "%s: cannot migrate '%s' to MDT%04x: %s\n", - argv[0], argv[optind], param.fp_mdt_index, - strerror(-rc)); - return rc; -} - -static int lfs_osts(int argc, char **argv) -{ - return lfs_tgts(argc, argv); -} - -static int lfs_mdts(int argc, char **argv) -{ - return lfs_tgts(argc, argv); -} - -#define COOK(value) \ -({ \ - int radix = 0; \ - while (value > 1024) { \ - value /= 1024; \ - radix++; \ - } \ - radix; \ +#define COOK(value) \ +({ \ + int radix = 0; \ + while (value > 1024) { \ + value /= 1024; \ + radix++; \ + } \ + radix; \ }) #define UUF "%-20s" #define CSF "%11s" @@ -3877,19 +4503,24 @@ static int lfs_mdts(int argc, char **argv) #define RSF "%4s" #define RDF "%3d%%" -enum mntdf_flags { - MNTDF_INODES = 0x0001, - MNTDF_COOKED = 0x0002, - MNTDF_LAZY = 0x0004, - MNTDF_VERBOSE = 0x0008, -}; +static inline int obd_statfs_ratio(const struct obd_statfs *st) +{ + double avail, used, ratio = 0; + + avail = st->os_bavail; + used = st->os_blocks - st->os_bfree; + if (avail + used > 0) + ratio = used / (used + avail) * 100 + 0.5; + + return (int)ratio; +} static int showdf(char *mntdir, struct obd_statfs *stat, char *uuid, enum mntdf_flags flags, char *type, int index, int rc) { long long avail, used, total; - double ratio = 0; + int ratio = 0; char *suffix = "KMGTPEZY"; /* Note if we have >2^64 bytes/fs these buffers will need to be grown */ char tbuf[3 * sizeof(__u64)]; @@ -3915,8 +4546,7 @@ static int showdf(char *mntdir, struct obd_statfs *stat, total = (stat->os_blocks * stat->os_bsize) >> shift; } - if ((used + avail) > 0) - ratio = (double)used / (double)(used + avail); + ratio = obd_statfs_ratio(stat); if (flags & MNTDF_COOKED) { int i; @@ -3951,7 +4581,7 @@ static int showdf(char *mntdir, struct obd_statfs *stat, snprintf(abuf, sizeof(tbuf), CDF, avail); } - sprintf(rbuf, RDF, (int)(ratio * 100 + 0.5)); + sprintf(rbuf, RDF, ratio); printf(UUF" "CSF" "CSF" "CSF" "RSF" %-s", uuid, tbuf, ubuf, abuf, rbuf, mntdir); if (type) @@ -3990,11 +4620,24 @@ static int showdf(char *mntdir, struct obd_statfs *stat, } struct ll_stat_type { - int st_op; - char *st_name; + int st_op; + char *st_name; +}; + +#define LL_STATFS_MAX LOV_MAX_STRIPE_COUNT + +struct ll_statfs_data { + int sd_index; + struct obd_statfs sd_st; +}; + +struct ll_statfs_buf { + int sb_count; + struct ll_statfs_data sb_buf[LL_STATFS_MAX]; }; -static int mntdf(char *mntdir, char *fsname, char *pool, enum mntdf_flags flags) +static int mntdf(char *mntdir, char *fsname, char *pool, enum mntdf_flags flags, + int ops, struct ll_statfs_buf *lsb) { struct obd_statfs stat_buf, sum = { .os_bsize = 1 }; struct obd_uuid uuid_buf; @@ -4031,16 +4674,22 @@ static int mntdf(char *mntdir, char *fsname, char *pool, enum mntdf_flags flags) return rc; } - if (flags & MNTDF_INODES) - printf(UUF" "CSF" "CSF" "CSF" "RSF" %-s\n", - "UUID", "Inodes", "IUsed", "IFree", - "IUse%", "Mounted on"); - else - printf(UUF" "CSF" "CSF" "CSF" "RSF" %-s\n", - "UUID", flags & MNTDF_COOKED ? "bytes" : "1K-blocks", - "Used", "Available", "Use%", "Mounted on"); + if (flags & MNTDF_SHOW) { + if (flags & MNTDF_INODES) + printf(UUF" "CSF" "CSF" "CSF" "RSF" %-s\n", + "UUID", "Inodes", "IUsed", "IFree", + "IUse%", "Mounted on"); + else + printf(UUF" "CSF" "CSF" "CSF" "RSF" %-s\n", + "UUID", + flags & MNTDF_COOKED ? "bytes" : "1K-blocks", + "Used", "Available", "Use%", "Mounted on"); + } for (tp = types; tp->st_name != NULL; tp++) { + if (!(tp->st_op & ops)) + continue; + for (index = 0; ; index++) { memset(&stat_buf, 0, sizeof(struct obd_statfs)); memset(&uuid_buf, 0, sizeof(struct obd_uuid)); @@ -4072,8 +4721,15 @@ static int mntdf(char *mntdir, char *fsname, char *pool, enum mntdf_flags flags) if (uuid_buf.uuid[0] == '\0') snprintf(uuid_buf.uuid, sizeof(uuid_buf.uuid), "%s%04x", tp->st_name, index); - showdf(mntdir, &stat_buf, obd_uuid2str(&uuid_buf), - flags, tp->st_name, index, rc2); + if (!rc && lsb) { + lsb->sb_buf[lsb->sb_count].sd_index = index; + lsb->sb_buf[lsb->sb_count].sd_st = stat_buf; + lsb->sb_count++; + } + if (flags & MNTDF_SHOW) + showdf(mntdir, &stat_buf, + obd_uuid2str(&uuid_buf), flags, + tp->st_name, index, rc2); if (rc2 == 0) { if (tp->st_op == LL_STATFS_LMV) { @@ -4102,182 +4758,614 @@ static int mntdf(char *mntdir, char *fsname, char *pool, enum mntdf_flags flags) sum.os_files = (sum.os_files - sum.os_ffree) + ost_ffree; sum.os_ffree = ost_ffree; } - printf("\n"); - showdf(mntdir, &sum, "filesystem_summary:", flags, NULL, 0, 0); - printf("\n"); + if (flags & MNTDF_SHOW) { + printf("\n"); + showdf(mntdir, &sum, "filesystem_summary:", flags, NULL, 0, 0); + printf("\n"); + } return rc; } -static int lfs_df(int argc, char **argv) +static int ll_statfs_data_comp(const void *sd1, const void *sd2) { - char mntdir[PATH_MAX] = {'\0'}, path[PATH_MAX] = {'\0'}; - enum mntdf_flags flags = 0; - int c, rc = 0, index = 0; - char fsname[PATH_MAX] = "", *pool_name = NULL; - struct option long_opts[] = { - { .val = 'h', .name = "human-readable", - .has_arg = no_argument }, - { .val = 'i', .name = "inodes", .has_arg = no_argument }, - { .val = 'l', .name = "lazy", .has_arg = no_argument }, - { .val = 'p', .name = "pool", .has_arg = required_argument }, - { .val = 'v', .name = "verbose", .has_arg = no_argument }, - { .name = NULL} }; + const struct obd_statfs *st1 = &((const struct ll_statfs_data *)sd1)-> + sd_st; + const struct obd_statfs *st2 = &((const struct ll_statfs_data *)sd2)-> + sd_st; + int r1 = obd_statfs_ratio(st1); + int r2 = obd_statfs_ratio(st2); + int64_t result = r1 - r2; + + /* if both space usage are above 90, compare free inodes */ + if (r1 > 90 && r2 > 90) + result = st2->os_ffree - st1->os_ffree; + + if (result < 0) + return -1; + else if (result == 0) + return 0; + else + return 1; +} - while ((c = getopt_long(argc, argv, "hilp:v", long_opts, NULL)) != -1) { - switch (c) { - case 'h': - flags |= MNTDF_COOKED; - break; - case 'i': - flags |= MNTDF_INODES; +/* functions */ +static int lfs_setdirstripe(int argc, char **argv) +{ + char *dname; + int result; + struct lfs_setstripe_args lsa = { 0 }; + struct llapi_stripe_param *param = NULL; + __u32 mdts[LMV_MAX_STRIPE_COUNT] = { 0 }; + char *end; + int c; + 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 ll_statfs_buf *lsb = NULL; + char mntdir[PATH_MAX] = ""; + bool auto_distributed = false; + + struct option long_opts[] = { + { .val = 'c', .name = "count", .has_arg = required_argument }, + { .val = 'c', .name = "mdt-count", .has_arg = required_argument }, + { .val = 'd', .name = "delete", .has_arg = no_argument }, + { .val = 'D', .name = "default", .has_arg = no_argument }, + { .val = 'D', .name = "default_stripe", .has_arg = no_argument }, + { .val = 'H', .name = "mdt-hash", .has_arg = required_argument }, + { .val = 'i', .name = "mdt-index", .has_arg = required_argument }, +#if LUSTRE_VERSION_CODE < OBD_OCD_VERSION(3, 0, 53, 0) + { .val = 'i', .name = "index", .has_arg = required_argument }, +#endif + { .val = 'o', .name = "mode", .has_arg = required_argument }, +#if LUSTRE_VERSION_CODE < OBD_OCD_VERSION(3, 0, 53, 0) + { .val = 't', .name = "hash-type", .has_arg = required_argument }, +#endif + { .val = 'T', .name = "mdt-count", .has_arg = required_argument }, +/* setstripe { .val = 'y', .name = "yaml", .has_arg = no_argument }, */ + { .name = NULL } }; + + setstripe_args_init(&lsa); + + while ((c = getopt_long(argc, argv, "c:dDi:H:m:o:t:T:", long_opts, + NULL)) >= 0) { + switch (c) { + case 0: + /* Long options. */ break; - case 'l': - flags |= MNTDF_LAZY; + case 'c': + case 'T': + lsa.lsa_stripe_count = strtoul(optarg, &end, 0); + if (*end != '\0') { + fprintf(stderr, + "%s %s: invalid stripe count '%s'\n", + progname, argv[0], optarg); + return CMD_HELP; + } break; - case 'p': - pool_name = optarg; + case 'd': + delete = true; + default_stripe = true; break; - case 'v': - flags |= MNTDF_VERBOSE; + case 'D': + default_stripe = true; + break; +#if LUSTRE_VERSION_CODE < OBD_OCD_VERSION(3, 0, 53, 0) + case 't': + fprintf(stderr, "warning: '--hash-type' and '-t' " + "deprecated, use '--mdt-hash' or '-H' instead\n"); +#endif + case 'H': + lsa.lsa_pattern = check_hashtype(optarg); + if (lsa.lsa_pattern == 0) { + fprintf(stderr, + "%s %s: bad stripe hash type '%s'\n", + progname, argv[0], optarg); + return CMD_HELP; + } + break; + case 'i': +#if LUSTRE_VERSION_CODE < OBD_OCD_VERSION(3, 0, 53, 0) + if (strcmp(argv[optind - 1], "--index") == 0) + fprintf(stderr, + "%s %s: warning: '--index' deprecated, use '--mdt-index' instead\n", + progname, argv[0]); +#endif + lsa.lsa_nr_tgts = parse_targets(mdts, + sizeof(mdts) / sizeof(__u32), + lsa.lsa_nr_tgts, optarg); + if (lsa.lsa_nr_tgts < 0) { + fprintf(stderr, + "%s %s: invalid MDT target(s) '%s'\n", + progname, argv[0], optarg); + return CMD_HELP; + } + + lsa.lsa_tgts = mdts; + if (lsa.lsa_stripe_off == LLAPI_LAYOUT_DEFAULT) + lsa.lsa_stripe_off = mdts[0]; + break; +#if LUSTRE_VERSION_CODE < OBD_OCD_VERSION(2, 16, 53, 0) + case 'm': + fprintf(stderr, "warning: '-m' is deprecated, " + "use '--mode' or '-o' instead\n"); +#endif + case 'o': + mode_opt = optarg; break; default: + fprintf(stderr, "%s %s: unrecognized option '%s'\n", + progname, argv[0], argv[optind - 1]); return CMD_HELP; } } - if (optind < argc && !realpath(argv[optind], path)) { - rc = -errno; - fprintf(stderr, "error: invalid path '%s': %s\n", - argv[optind], strerror(-rc)); - return rc; + + if (optind == argc) { + fprintf(stderr, "%s %s: DIR must be specified\n", + progname, argv[0]); + return CMD_HELP; } - while (!llapi_search_mounts(path, index++, mntdir, fsname)) { - /* Check if we have a mount point */ - if (mntdir[0] == '\0') - continue; + if (!delete && lsa.lsa_stripe_off == LLAPI_LAYOUT_DEFAULT && + lsa.lsa_stripe_count == LLAPI_LAYOUT_DEFAULT) { + fprintf(stderr, + "%s %s: stripe offset and count must be specified\n", + progname, argv[0]); + return CMD_HELP; + } - rc = mntdf(mntdir, fsname, pool_name, flags); - if (rc || path[0] != '\0') - break; - fsname[0] = '\0'; /* avoid matching in next loop */ - mntdir[0] = '\0'; /* avoid matching in next loop */ + if (delete && + (lsa.lsa_stripe_off != LLAPI_LAYOUT_DEFAULT || + lsa.lsa_stripe_count != LLAPI_LAYOUT_DEFAULT)) { + fprintf(stderr, + "%s %s: cannot specify -d with -c or -i options\n", + progname, argv[0]); + return CMD_HELP; } - return rc; -} + if (mode_opt != NULL) { + mode = strtoul(mode_opt, &end, 8); + if (*end != '\0') { + fprintf(stderr, + "%s %s: bad MODE '%s'\n", + progname, argv[0], mode_opt); + return CMD_HELP; + } + previous_mode = umask(0); + } -static int lfs_getname(int argc, char **argv) -{ - char mntdir[PATH_MAX] = "", path[PATH_MAX] = "", fsname[PATH_MAX] = ""; - int rc = 0, index = 0, c; - char buf[sizeof(struct obd_uuid)]; + /* + * initialize stripe parameters, in case param is converted to specific, + * i.e, 'lfs mkdir -i -1 -c N', always allocate space for lsp_tgts. + */ + param = calloc(1, offsetof(typeof(*param), + lsp_tgts[lsa.lsa_stripe_count != LLAPI_LAYOUT_DEFAULT ? + lsa.lsa_stripe_count : lsa.lsa_nr_tgts])); + if (param == NULL) { + fprintf(stderr, + "%s %s: cannot allocate memory for parameters: %s\n", + progname, argv[0], strerror(ENOMEM)); + return CMD_HELP; + } - while ((c = getopt(argc, argv, "h")) != -1) - return CMD_HELP; + if (lsa.lsa_stripe_count != LLAPI_LAYOUT_DEFAULT) + param->lsp_stripe_count = lsa.lsa_stripe_count; + if (lsa.lsa_stripe_off == LLAPI_LAYOUT_DEFAULT) + param->lsp_stripe_offset = -1; + else + param->lsp_stripe_offset = lsa.lsa_stripe_off; + if (lsa.lsa_pattern != LLAPI_LAYOUT_RAID0) + param->lsp_stripe_pattern = lsa.lsa_pattern; + else + param->lsp_stripe_pattern = LMV_HASH_TYPE_FNV_1A_64; + param->lsp_pool = lsa.lsa_pool_name; + param->lsp_is_specific = false; + if (lsa.lsa_nr_tgts > 1) { + if (lsa.lsa_stripe_count > 0 && + lsa.lsa_stripe_count != LLAPI_LAYOUT_DEFAULT && + lsa.lsa_stripe_count != lsa.lsa_nr_tgts) { + fprintf(stderr, "error: %s: stripe count %lld doesn't " + "match the number of MDTs: %d\n", + argv[0], lsa.lsa_stripe_count, lsa.lsa_nr_tgts); + free(param); + return CMD_HELP; + } - if (optind == argc) { /* no paths specified, get all paths. */ - while (!llapi_search_mounts(path, index++, mntdir, fsname)) { - rc = llapi_getname(mntdir, buf, sizeof(buf)); - if (rc < 0) { - fprintf(stderr, - "cannot get name for `%s': %s\n", - mntdir, strerror(-rc)); - break; - } + param->lsp_is_specific = true; + param->lsp_stripe_count = lsa.lsa_nr_tgts; + memcpy(param->lsp_tgts, mdts, sizeof(*mdts) * lsa.lsa_nr_tgts); + } - printf("%s %s\n", buf, mntdir); + dname = argv[optind]; + do { + if (default_stripe) { + result = llapi_dir_set_default_lmv(dname, param); + } else { + /* if current \a dname isn't under the same \a mntdir + * as the last one, and the last one was + * auto-distributed, restore \a param. + */ + if (mntdir[0] != '\0' && + strncmp(dname, mntdir, strlen(mntdir)) && + auto_distributed) { + param->lsp_is_specific = false; + param->lsp_stripe_offset = -1; + auto_distributed = false; + } - path[0] = fsname[0] = mntdir[0] = 0; - } - } else { /* paths specified, only attempt to search these. */ - for (; optind < argc; optind++) { - rc = llapi_getname(argv[optind], buf, sizeof(buf)); - if (rc < 0) { - fprintf(stderr, - "cannot get name for `%s': %s\n", - argv[optind], strerror(-rc)); - break; - } + if (!param->lsp_is_specific && + param->lsp_stripe_offset == -1) { + char path[PATH_MAX] = ""; - printf("%s %s\n", buf, argv[optind]); - } - } - return rc; -} + if (!lsb) { + lsb = malloc(sizeof(*lsb)); + if (!lsb) { + result = -ENOMEM; + break; + } + } + lsb->sb_count = 0; -static int lfs_check(int argc, char **argv) -{ - int rc; - char mntdir[PATH_MAX] = {'\0'}; - int num_types = 1; - char *obd_types[2]; - char obd_type1[4]; - char obd_type2[4]; + /* use mntdir for dirname() temporarily */ + strncpy(mntdir, dname, sizeof(mntdir)); + if (!realpath(dirname(mntdir), path)) { + result = -errno; + fprintf(stderr, + "error: invalid path '%s': %s\n", + argv[optind], strerror(errno)); + break; + } + mntdir[0] = '\0'; - if (argc != 2) - return CMD_HELP; + result = llapi_search_mounts(path, 0, mntdir, + NULL); + if (result < 0 || mntdir[0] == '\0') { + fprintf(stderr, + "No suitable Lustre mount found\n"); + break; + } - obd_types[0] = obd_type1; - obd_types[1] = obd_type2; + result = mntdf(mntdir, NULL, NULL, 0, + LL_STATFS_LMV, lsb); + if (result < 0) + break; - if (strcmp(argv[1], "osts") == 0) { - strcpy(obd_types[0], "osc"); - } else if (strcmp(argv[1], "mds") == 0) { - strcpy(obd_types[0], "mdc"); - } else if (strcmp(argv[1], "servers") == 0) { - num_types = 2; - strcpy(obd_types[0], "osc"); - strcpy(obd_types[1], "mdc"); - } else { - fprintf(stderr, "error: %s: option '%s' unrecognized\n", - argv[0], argv[1]); - return CMD_HELP; - } + if (param->lsp_stripe_count > lsb->sb_count) { + fprintf(stderr, + "error: stripe count %d is too big\n", + param->lsp_stripe_count); + result = -ERANGE; + break; + } - rc = llapi_search_mounts(NULL, 0, mntdir, NULL); - if (rc < 0 || mntdir[0] == '\0') { - fprintf(stderr, "No suitable Lustre mount found\n"); - return rc; - } + qsort(lsb->sb_buf, lsb->sb_count, + sizeof(struct ll_statfs_data), + ll_statfs_data_comp); - rc = llapi_target_check(num_types, obd_types, mntdir); - if (rc) - fprintf(stderr, "error: %s: %s status failed\n", - argv[0],argv[1]); + auto_distributed = true; + } - return rc; + if (auto_distributed) { + int r; + int nr = MAX(param->lsp_stripe_count, + lsb->sb_count / 2); + + /* don't use server whose usage is above 90% */ + while (nr != param->lsp_stripe_count && + obd_statfs_ratio(&lsb->sb_buf[nr].sd_st) + > 90) + nr = MAX(param->lsp_stripe_count, + nr / 2); + + /* get \a r between [0, nr) */ + r = rand() % nr; + + param->lsp_stripe_offset = + lsb->sb_buf[r].sd_index; + if (param->lsp_stripe_count > 1) { + int i = 0; + + param->lsp_is_specific = true; + for (; i < param->lsp_stripe_count; i++) + param->lsp_tgts[(i + r) % nr] = + lsb->sb_buf[i].sd_index; + } + } -} + result = llapi_dir_create(dname, mode, param); + } -#ifdef HAVE_SYS_QUOTA_H -#define ARG2INT(nr, str, msg) \ -do { \ - char *endp; \ - nr = strtol(str, &endp, 0); \ - if (*endp) { \ - fprintf(stderr, "error: bad %s: %s\n", msg, str); \ - return CMD_HELP; \ - } \ -} while (0) + if (result) { + fprintf(stderr, + "%s setdirstripe: cannot create stripe dir '%s': %s\n", + progname, dname, strerror(-result)); + break; + } + dname = argv[++optind]; + } while (dname != NULL); -#define ADD_OVERFLOW(a,b) ((a + b) < a) ? (a = ULONG_MAX) : (a = a + b) + if (mode_opt != NULL) + umask(previous_mode); -/* Convert format time string "XXwXXdXXhXXmXXs" into seconds value - * returns the value or ULONG_MAX on integer overflow or incorrect format - * Notes: - * 1. the order of specifiers is arbitrary (may be: 5w3s or 3s5w) - * 2. specifiers may be encountered multiple times (2s3s is 5 seconds) - * 3. empty integer value is interpreted as 0 - */ -static unsigned long str2sec(const char* timestr) + free(lsb); + free(param); + return result; +} + +/* functions */ +static int lfs_rmentry(int argc, char **argv) { - const char spec[] = "smhdw"; - const unsigned long mult[] = {1, 60, 60*60, 24*60*60, 7*24*60*60}; - unsigned long val = 0; - char *tail; + char *dname; + int index; + int result = 0; - if (strpbrk(timestr, spec) == NULL) { + if (argc <= 1) { + fprintf(stderr, "error: %s: missing dirname\n", + argv[0]); + return CMD_HELP; + } + + index = 1; + dname = argv[index]; + while (dname != NULL) { + result = llapi_direntry_remove(dname); + if (result) { + fprintf(stderr, "error: %s: remove dir entry '%s' " + "failed\n", argv[0], dname); + break; + } + dname = argv[++index]; + } + return result; +} + +static int lfs_mv(int argc, char **argv) +{ + struct find_param param = { + .fp_max_depth = -1, + .fp_mdt_index = -1, + }; + char *end; + int c; + int rc = 0; + struct option long_opts[] = { + { .val = 'm', .name = "mdt-index", .has_arg = required_argument }, + { .val = 'v', .name = "verbose", .has_arg = no_argument }, + { .name = NULL } }; + + while ((c = getopt_long(argc, argv, "m:M:v", long_opts, NULL)) != -1) { + switch (c) { +#if LUSTRE_VERSION_CODE < OBD_OCD_VERSION(3, 0, 53, 0) + case 'M': + fprintf(stderr, "warning: '-M' deprecated" + ", use '--mdt-index' or '-m' instead\n"); +#endif + case 'm': + param.fp_mdt_index = strtoul(optarg, &end, 0); + if (*end != '\0') { + fprintf(stderr, "%s mv: bad MDT index '%s'\n", + progname, optarg); + return CMD_HELP; + } + break; + case 'v': + param.fp_verbose = VERBOSE_DETAIL; + break; + default: + fprintf(stderr, "%s mv: unrecognized option '%s'\n", + progname, argv[optind - 1]); + return CMD_HELP; + } + } + + if (param.fp_mdt_index == -1) { + fprintf(stderr, "%s mv: MDT index must be specified\n", + progname); + return CMD_HELP; + } + + if (optind >= argc) { + fprintf(stderr, "%s mv: DIR must be specified\n", progname); + return CMD_HELP; + } + + param.fp_migrate = 1; + rc = llapi_migrate_mdt(argv[optind], ¶m); + if (rc != 0) + fprintf(stderr, "%s mv: cannot migrate '%s' to MDT%04x: %s\n", + progname, argv[optind], param.fp_mdt_index, + strerror(-rc)); + return rc; +} + +static int lfs_osts(int argc, char **argv) +{ + return lfs_tgts(argc, argv); +} + +static int lfs_mdts(int argc, char **argv) +{ + return lfs_tgts(argc, argv); +} + +static int lfs_df(int argc, char **argv) +{ + char mntdir[PATH_MAX] = {'\0'}, path[PATH_MAX] = {'\0'}; + enum mntdf_flags flags = MNTDF_SHOW; + int ops = LL_STATFS_LMV | LL_STATFS_LOV; + int c, rc = 0, index = 0; + char fsname[PATH_MAX] = "", *pool_name = NULL; + struct option long_opts[] = { + { .val = 'h', .name = "human-readable", + .has_arg = no_argument }, + { .val = 'i', .name = "inodes", .has_arg = no_argument }, + { .val = 'l', .name = "lazy", .has_arg = no_argument }, + { .val = 'p', .name = "pool", .has_arg = required_argument }, + { .val = 'v', .name = "verbose", .has_arg = no_argument }, + { .name = NULL} }; + + while ((c = getopt_long(argc, argv, "hilp:v", long_opts, NULL)) != -1) { + switch (c) { + case 'h': + flags |= MNTDF_COOKED; + break; + case 'i': + flags |= MNTDF_INODES; + break; + case 'l': + flags |= MNTDF_LAZY; + break; + case 'p': + pool_name = optarg; + break; + case 'v': + flags |= MNTDF_VERBOSE; + break; + default: + return CMD_HELP; + } + } + if (optind < argc && !realpath(argv[optind], path)) { + rc = -errno; + fprintf(stderr, "error: invalid path '%s': %s\n", + argv[optind], strerror(-rc)); + return rc; + } + + while (!llapi_search_mounts(path, index++, mntdir, fsname)) { + /* Check if we have a mount point */ + if (mntdir[0] == '\0') + continue; + + rc = mntdf(mntdir, fsname, pool_name, flags, ops, NULL); + if (rc || path[0] != '\0') + break; + fsname[0] = '\0'; /* avoid matching in next loop */ + mntdir[0] = '\0'; /* avoid matching in next loop */ + } + + return rc; +} + +static int lfs_getname(int argc, char **argv) +{ + char mntdir[PATH_MAX] = "", path[PATH_MAX] = "", fsname[PATH_MAX] = ""; + int rc = 0, index = 0, c; + char buf[sizeof(struct obd_uuid)]; + + while ((c = getopt(argc, argv, "h")) != -1) + return CMD_HELP; + + if (optind == argc) { /* no paths specified, get all paths. */ + while (!llapi_search_mounts(path, index++, mntdir, fsname)) { + rc = llapi_getname(mntdir, buf, sizeof(buf)); + if (rc < 0) { + fprintf(stderr, + "cannot get name for `%s': %s\n", + mntdir, strerror(-rc)); + break; + } + + printf("%s %s\n", buf, mntdir); + + path[0] = fsname[0] = mntdir[0] = 0; + } + } else { /* paths specified, only attempt to search these. */ + for (; optind < argc; optind++) { + rc = llapi_getname(argv[optind], buf, sizeof(buf)); + if (rc < 0) { + fprintf(stderr, + "cannot get name for `%s': %s\n", + argv[optind], strerror(-rc)); + break; + } + + printf("%s %s\n", buf, argv[optind]); + } + } + return rc; +} + +static int lfs_check(int argc, char **argv) +{ + int rc; + char mntdir[PATH_MAX] = {'\0'}; + int num_types = 1; + char *obd_types[2]; + char obd_type1[4]; + char obd_type2[4]; + + if (argc != 2) { + fprintf(stderr, "%s check: server type must be specified\n", + progname); + return CMD_HELP; + } + + obd_types[0] = obd_type1; + obd_types[1] = obd_type2; + + if (strcmp(argv[1], "osts") == 0) { + strcpy(obd_types[0], "osc"); + } else if (strcmp(argv[1], "mds") == 0) { + strcpy(obd_types[0], "mdc"); + } else if (strcmp(argv[1], "servers") == 0) { + num_types = 2; + strcpy(obd_types[0], "osc"); + strcpy(obd_types[1], "mdc"); + } else { + fprintf(stderr, "%s check: unrecognized option '%s'\n", + progname, argv[1]); + return CMD_HELP; + } + + rc = llapi_search_mounts(NULL, 0, mntdir, NULL); + if (rc < 0 || mntdir[0] == '\0') { + fprintf(stderr, + "%s check: cannot find mounted Lustre filesystem: %s\n", + progname, (rc < 0) ? strerror(-rc) : strerror(ENODEV)); + return rc; + } + + rc = llapi_target_check(num_types, obd_types, mntdir); + if (rc) + fprintf(stderr, "%s check: cannot check target '%s': %s\n", + progname, argv[1], strerror(-rc)); + + return rc; + +} + +#ifdef HAVE_SYS_QUOTA_H +#define ARG2INT(nr, str, msg) \ +do { \ + char *endp; \ + nr = strtol(str, &endp, 0); \ + if (*endp != '\0') { \ + fprintf(stderr, "%s: bad %s '%s'\n", \ + progname, msg, str); \ + return CMD_HELP; \ + } \ +} while (0) + +#define ADD_OVERFLOW(a,b) ((a + b) < a) ? (a = ULONG_MAX) : (a = a + b) + +/* Convert format time string "XXwXXdXXhXXmXXs" into seconds value + * returns the value or ULONG_MAX on integer overflow or incorrect format + * Notes: + * 1. the order of specifiers is arbitrary (may be: 5w3s or 3s5w) + * 2. specifiers may be encountered multiple times (2s3s is 5 seconds) + * 3. empty integer value is interpreted as 0 + */ +static unsigned long str2sec(const char* timestr) +{ + const char spec[] = "smhdw"; + const unsigned long mult[] = {1, 60, 60*60, 24*60*60, 7*24*60*60}; + unsigned long val = 0; + char *tail; + + if (strpbrk(timestr, spec) == NULL) { /* no specifiers inside the time string, should treat it as an integer value */ val = strtoul(timestr, &tail, 10); @@ -4327,7 +5415,8 @@ do { \ \ rc = llapi_parse_size(str, &limit, &units, 1); \ if (rc < 0) { \ - fprintf(stderr, "error: bad limit value %s\n", str); \ + fprintf(stderr, "%s: invalid limit '%s'\n", \ + progname, str); \ return CMD_HELP; \ } \ nr = limit; \ @@ -4417,6 +5506,12 @@ quota_type: return CMD_HELP; } + if ((dqb->dqb_valid | QIF_BTIME && dqi->dqi_bgrace >= UINT_MAX) || + (dqb->dqb_valid | QIF_ITIME && dqi->dqi_igrace >= UINT_MAX)) { + fprintf(stderr, "error: grace time is too large\n"); + return CMD_HELP; + } + mnt = argv[optind]; rc = llapi_quotactl(mnt, &qctl); if (rc) { @@ -4437,25 +5532,30 @@ quota_type: int lfs_setquota(int argc, char **argv) { - int c, rc; - struct if_quotactl qctl; - char *mnt, *obd_type = (char *)qctl.obd_type; - struct obd_dqblk *dqb = &qctl.qc_dqblk; - struct option long_opts[] = { + int c, rc = 0; + struct if_quotactl qctl; + char *mnt, *obd_type = (char *)qctl.obd_type; + struct obd_dqblk *dqb = &qctl.qc_dqblk; + struct option long_opts[] = { { .val = 'b', .name = "block-softlimit", .has_arg = required_argument }, { .val = 'B', .name = "block-hardlimit", .has_arg = required_argument }, + { .val = 'd', .name = "default", .has_arg = no_argument }, { .val = 'g', .name = "group", .has_arg = required_argument }, + { .val = 'G', .name = "default-grp", .has_arg = no_argument }, { .val = 'i', .name = "inode-softlimit", .has_arg = required_argument }, { .val = 'I', .name = "inode-hardlimit", .has_arg = required_argument }, { .val = 'p', .name = "projid", .has_arg = required_argument }, + { .val = 'P', .name = "default-prj", .has_arg = no_argument }, { .val = 'u', .name = "user", .has_arg = required_argument }, + { .val = 'U', .name = "default-usr", .has_arg = no_argument }, { .name = NULL } }; - unsigned limit_mask = 0; - char *endptr; + unsigned limit_mask = 0; + char *endptr; + bool use_default = false; int qtype; if (has_times_option(argc, argv)) @@ -4467,149 +5567,213 @@ int lfs_setquota(int argc, char **argv) * so it can be used as a marker that qc_type * isn't reinitialized from command line */ - while ((c = getopt_long(argc, argv, "b:B:g:i:I:p:u:", + while ((c = getopt_long(argc, argv, "b:B:dg:Gi:I:p:Pu:U", long_opts, NULL)) != -1) { switch (c) { + case 'U': + qctl.qc_cmd = LUSTRE_Q_SETDEFAULT; + qtype = USRQUOTA; + qctl.qc_id = 0; + goto quota_type_def; case 'u': qtype = USRQUOTA; rc = name2uid(&qctl.qc_id, optarg); goto quota_type; + case 'G': + qctl.qc_cmd = LUSTRE_Q_SETDEFAULT; + qtype = GRPQUOTA; + qctl.qc_id = 0; + goto quota_type_def; case 'g': qtype = GRPQUOTA; rc = name2gid(&qctl.qc_id, optarg); goto quota_type; + case 'P': + qctl.qc_cmd = LUSTRE_Q_SETDEFAULT; + qtype = PRJQUOTA; + qctl.qc_id = 0; + goto quota_type_def; case 'p': qtype = PRJQUOTA; rc = name2projid(&qctl.qc_id, optarg); quota_type: - if (qctl.qc_type != ALLQUOTA) { - fprintf(stderr, "error: -u and -g can't be used" - " more than once\n"); - return CMD_HELP; - } - qctl.qc_type = qtype; if (rc) { qctl.qc_id = strtoul(optarg, &endptr, 10); if (*endptr != '\0') { - fprintf(stderr, "error: can't find id " - "for name %s\n", optarg); - return CMD_HELP; + fprintf(stderr, "%s setquota: invalid" + " id '%s'\n", progname, optarg); + return -1; } } + + if (qctl.qc_id == 0) { + fprintf(stderr, "%s setquota: can't set quota" + " for root usr/group/project.\n", + progname); + return -1; + } + +quota_type_def: + if (qctl.qc_type != ALLQUOTA) { + fprintf(stderr, + "%s setquota: only one of -u, -U, -g," + " -G, -p or -P may be specified\n", + progname); + return CMD_HELP; + } + qctl.qc_type = qtype; break; - case 'b': + case 'd': + qctl.qc_cmd = LUSTRE_Q_SETDEFAULT; + use_default = true; + break; + case 'b': ARG2ULL(dqb->dqb_bsoftlimit, optarg, 1024); dqb->dqb_bsoftlimit >>= 10; limit_mask |= BSLIMIT; if (dqb->dqb_bsoftlimit && dqb->dqb_bsoftlimit <= 1024) /* <= 1M? */ - fprintf(stderr, "warning: block softlimit is " - "smaller than the miminal qunit size, " - "please see the help of setquota or " - "Lustre manual for details.\n"); - break; - case 'B': - ARG2ULL(dqb->dqb_bhardlimit, optarg, 1024); - dqb->dqb_bhardlimit >>= 10; - limit_mask |= BHLIMIT; + fprintf(stderr, + "%s setquota: warning: block softlimit '%llu' smaller than minimum qunit size\n" + "See '%s help setquota' or Lustre manual for details\n", + progname, dqb->dqb_bsoftlimit, + progname); + break; + case 'B': + ARG2ULL(dqb->dqb_bhardlimit, optarg, 1024); + dqb->dqb_bhardlimit >>= 10; + limit_mask |= BHLIMIT; if (dqb->dqb_bhardlimit && dqb->dqb_bhardlimit <= 1024) /* <= 1M? */ - fprintf(stderr, "warning: block hardlimit is " - "smaller than the miminal qunit size, " - "please see the help of setquota or " - "Lustre manual for details.\n"); - break; - case 'i': - ARG2ULL(dqb->dqb_isoftlimit, optarg, 1); - limit_mask |= ISLIMIT; + fprintf(stderr, + "%s setquota: warning: block hardlimit '%llu' smaller than minimum qunit size\n" + "See '%s help setquota' or Lustre manual for details\n", + progname, dqb->dqb_bhardlimit, + progname); + break; + case 'i': + ARG2ULL(dqb->dqb_isoftlimit, optarg, 1); + limit_mask |= ISLIMIT; if (dqb->dqb_isoftlimit && dqb->dqb_isoftlimit <= 1024) /* <= 1K inodes? */ - fprintf(stderr, "warning: inode softlimit is " - "smaller than the miminal qunit size, " - "please see the help of setquota or " - "Lustre manual for details.\n"); - break; - case 'I': - ARG2ULL(dqb->dqb_ihardlimit, optarg, 1); - limit_mask |= IHLIMIT; + fprintf(stderr, + "%s setquota: warning: inode softlimit '%llu' smaller than minimum qunit size\n" + "See '%s help setquota' or Lustre manual for details\n", + progname, dqb->dqb_isoftlimit, + progname); + break; + case 'I': + ARG2ULL(dqb->dqb_ihardlimit, optarg, 1); + limit_mask |= IHLIMIT; if (dqb->dqb_ihardlimit && dqb->dqb_ihardlimit <= 1024) /* <= 1K inodes? */ - fprintf(stderr, "warning: inode hardlimit is " - "smaller than the miminal qunit size, " - "please see the help of setquota or " - "Lustre manual for details.\n"); - break; - default: /* getopt prints error message for us when opterr != 0 */ + fprintf(stderr, + "%s setquota: warning: inode hardlimit '%llu' smaller than minimum qunit size\n" + "See '%s help setquota' or Lustre manual for details\n", + progname, dqb->dqb_ihardlimit, + progname); + break; + default: + fprintf(stderr, + "%s setquota: unrecognized option '%s'\n", + progname, argv[optind - 1]); return CMD_HELP; } } if (qctl.qc_type == ALLQUOTA) { - fprintf(stderr, "error: neither -u, -g nor -p was specified\n"); + fprintf(stderr, + "%s setquota: either -u or -g must be specified\n", + progname); return CMD_HELP; } - if (limit_mask == 0) { - fprintf(stderr, "error: at least one limit must be specified\n"); - return CMD_HELP; - } + if (!use_default && limit_mask == 0) { + fprintf(stderr, + "%s setquota: at least one limit must be specified\n", + progname); + return CMD_HELP; + } - if (optind != argc - 1) { - fprintf(stderr, "error: unexpected parameters encountered\n"); - return CMD_HELP; - } + if (use_default && limit_mask != 0) { + fprintf(stderr, + "%s setquota: limits should not be specified when" + " using default quota\n", + progname); + return CMD_HELP; + } + + if (use_default && qctl.qc_id == 0) { + fprintf(stderr, + "%s setquota: can not set default quota for root" + " user/group/project\n", + progname); + return CMD_HELP; + } + + if (optind != argc - 1) { + fprintf(stderr, + "%s setquota: filesystem not specified or unexpected argument '%s'\n", + progname, argv[optind]); + return CMD_HELP; + } mnt = argv[optind]; - if ((!(limit_mask & BHLIMIT) ^ !(limit_mask & BSLIMIT)) || - (!(limit_mask & IHLIMIT) ^ !(limit_mask & ISLIMIT))) { - /* sigh, we can't just set blimits/ilimits */ - struct if_quotactl tmp_qctl = {.qc_cmd = LUSTRE_Q_GETQUOTA, - .qc_type = qctl.qc_type, - .qc_id = qctl.qc_id}; - - rc = llapi_quotactl(mnt, &tmp_qctl); - if (rc < 0) { - fprintf(stderr, "error: setquota failed while retrieving" - " current quota settings (%s)\n", - strerror(-rc)); - return rc; - } + if (use_default) { + dqb->dqb_bhardlimit = 0; + dqb->dqb_bsoftlimit = 0; + dqb->dqb_ihardlimit = 0; + dqb->dqb_isoftlimit = 0; + dqb->dqb_itime = 0; + dqb->dqb_btime = 0; + dqb->dqb_valid |= QIF_LIMITS | QIF_TIMES; + } else if ((!(limit_mask & BHLIMIT) ^ !(limit_mask & BSLIMIT)) || + (!(limit_mask & IHLIMIT) ^ !(limit_mask & ISLIMIT))) { + /* sigh, we can't just set blimits/ilimits */ + struct if_quotactl tmp_qctl = {.qc_cmd = LUSTRE_Q_GETQUOTA, + .qc_type = qctl.qc_type, + .qc_id = qctl.qc_id}; + + rc = llapi_quotactl(mnt, &tmp_qctl); + if (rc < 0) + return rc; - if (!(limit_mask & BHLIMIT)) - dqb->dqb_bhardlimit = tmp_qctl.qc_dqblk.dqb_bhardlimit; - if (!(limit_mask & BSLIMIT)) - dqb->dqb_bsoftlimit = tmp_qctl.qc_dqblk.dqb_bsoftlimit; - if (!(limit_mask & IHLIMIT)) - dqb->dqb_ihardlimit = tmp_qctl.qc_dqblk.dqb_ihardlimit; - if (!(limit_mask & ISLIMIT)) - dqb->dqb_isoftlimit = tmp_qctl.qc_dqblk.dqb_isoftlimit; - - /* Keep grace times if we have got no softlimit arguments */ - if ((limit_mask & BHLIMIT) && !(limit_mask & BSLIMIT)) { - dqb->dqb_valid |= QIF_BTIME; - dqb->dqb_btime = tmp_qctl.qc_dqblk.dqb_btime; - } + if (!(limit_mask & BHLIMIT)) + dqb->dqb_bhardlimit = tmp_qctl.qc_dqblk.dqb_bhardlimit; + if (!(limit_mask & BSLIMIT)) + dqb->dqb_bsoftlimit = tmp_qctl.qc_dqblk.dqb_bsoftlimit; + if (!(limit_mask & IHLIMIT)) + dqb->dqb_ihardlimit = tmp_qctl.qc_dqblk.dqb_ihardlimit; + if (!(limit_mask & ISLIMIT)) + dqb->dqb_isoftlimit = tmp_qctl.qc_dqblk.dqb_isoftlimit; + + /* Keep grace times if we have got no softlimit arguments */ + if ((limit_mask & BHLIMIT) && !(limit_mask & BSLIMIT)) { + dqb->dqb_valid |= QIF_BTIME; + dqb->dqb_btime = tmp_qctl.qc_dqblk.dqb_btime; + } - if ((limit_mask & IHLIMIT) && !(limit_mask & ISLIMIT)) { - dqb->dqb_valid |= QIF_ITIME; - dqb->dqb_itime = tmp_qctl.qc_dqblk.dqb_itime; - } - } + if ((limit_mask & IHLIMIT) && !(limit_mask & ISLIMIT)) { + dqb->dqb_valid |= QIF_ITIME; + dqb->dqb_itime = tmp_qctl.qc_dqblk.dqb_itime; + } + } - dqb->dqb_valid |= (limit_mask & (BHLIMIT | BSLIMIT)) ? QIF_BLIMITS : 0; - dqb->dqb_valid |= (limit_mask & (IHLIMIT | ISLIMIT)) ? QIF_ILIMITS : 0; + dqb->dqb_valid |= (limit_mask & (BHLIMIT | BSLIMIT)) ? QIF_BLIMITS : 0; + dqb->dqb_valid |= (limit_mask & (IHLIMIT | ISLIMIT)) ? QIF_ILIMITS : 0; - rc = llapi_quotactl(mnt, &qctl); - if (rc) { - if (*obd_type) - fprintf(stderr, "%s %s ", obd_type, - obd_uuid2str(&qctl.obd_uuid)); - fprintf(stderr, "setquota failed: %s\n", strerror(-rc)); - return rc; - } + rc = llapi_quotactl(mnt, &qctl); + if (rc) { + if (*obd_type) + fprintf(stderr, + "%s setquota: cannot quotactl '%s' '%s': %s", + progname, obd_type, + obd_uuid2str(&qctl.obd_uuid), strerror(-rc)); + return rc; + } - return 0; + return 0; } /* Converts seconds value into format string @@ -4668,15 +5832,22 @@ static void diff2str(time_t seconds, char *buf, time_t now) } static void print_quota_title(char *name, struct if_quotactl *qctl, - bool human_readable) + bool human_readable, bool show_default) { - printf("Disk quotas for %s %s (%cid %u):\n", - qtype_name(qctl->qc_type), name, - *qtype_name(qctl->qc_type), qctl->qc_id); - printf("%15s%8s %7s%8s%8s%8s %7s%8s%8s\n", - "Filesystem", human_readable ? "used" : "kbytes", - "quota", "limit", "grace", - "files", "quota", "limit", "grace"); + if (show_default) { + printf("Disk default %s quota:\n", qtype_name(qctl->qc_type)); + printf("%15s %8s%8s%8s %8s%8s%8s\n", + "Filesystem", "bquota", "blimit", "bgrace", + "iquota", "ilimit", "igrace"); + } else { + printf("Disk quotas for %s %s (%cid %u):\n", + qtype_name(qctl->qc_type), name, + *qtype_name(qctl->qc_type), qctl->qc_id); + printf("%15s%8s %7s%8s%8s%8s %7s%8s%8s\n", + "Filesystem", human_readable ? "used" : "kbytes", + "quota", "limit", "grace", + "files", "quota", "limit", "grace"); + } } static void kbytes2str(__u64 num, char *buf, int buflen, bool h) @@ -4703,20 +5874,21 @@ static void kbytes2str(__u64 num, char *buf, int buflen, bool h) #define STRBUF_LEN 32 static void print_quota(char *mnt, struct if_quotactl *qctl, int type, - int rc, bool h) + int rc, bool h, bool show_default) { - time_t now; + time_t now; - time(&now); + time(&now); - if (qctl->qc_cmd == LUSTRE_Q_GETQUOTA || qctl->qc_cmd == Q_GETOQUOTA) { + if (qctl->qc_cmd == LUSTRE_Q_GETQUOTA || qctl->qc_cmd == Q_GETOQUOTA || + qctl->qc_cmd == LUSTRE_Q_GETDEFAULT) { int bover = 0, iover = 0; struct obd_dqblk *dqb = &qctl->qc_dqblk; char numbuf[3][STRBUF_LEN]; char timebuf[40]; char strbuf[STRBUF_LEN]; - if (dqb->dqb_bhardlimit && + if (dqb->dqb_bhardlimit && lustre_stoqb(dqb->dqb_curspace) >= dqb->dqb_bhardlimit) { bover = 1; } else if (dqb->dqb_bsoftlimit && dqb->dqb_btime) { @@ -4746,6 +5918,9 @@ static void print_quota(char *mnt, struct if_quotactl *qctl, int type, if (bover) diff2str(dqb->dqb_btime, timebuf, now); + else if (show_default) + snprintf(timebuf, sizeof(timebuf), "%llu", + dqb->dqb_btime); kbytes2str(lustre_stoqb(dqb->dqb_curspace), strbuf, sizeof(strbuf), h); @@ -4766,15 +5941,23 @@ static void print_quota(char *mnt, struct if_quotactl *qctl, int type, sprintf(numbuf[2], (dqb->dqb_valid & QIF_BLIMITS) ? "%s" : "[%s]", strbuf); - printf(" %7s%c %6s %7s %7s", - numbuf[0], bover ? '*' : ' ', numbuf[1], - numbuf[2], bover > 1 ? timebuf : "-"); + if (show_default) + printf(" %6s %7s %7s", numbuf[1], numbuf[2], timebuf); + else + printf(" %7s%c %6s %7s %7s", + numbuf[0], bover ? '*' : ' ', numbuf[1], + numbuf[2], bover > 1 ? timebuf : "-"); + if (iover) diff2str(dqb->dqb_itime, timebuf, now); + else if (show_default) + snprintf(timebuf, sizeof(timebuf), "%llu", + dqb->dqb_itime); - sprintf(numbuf[0], (dqb->dqb_valid & QIF_INODES) ? - "%ju" : "[%ju]", (uintmax_t)dqb->dqb_curinodes); + snprintf(numbuf[0], sizeof(numbuf), + (dqb->dqb_valid & QIF_INODES) ? "%ju" : "[%ju]", + (uintmax_t)dqb->dqb_curinodes); if (type == QC_GENERAL) sprintf(numbuf[1], (dqb->dqb_valid & QIF_ILIMITS) ? @@ -4786,7 +5969,9 @@ static void print_quota(char *mnt, struct if_quotactl *qctl, int type, sprintf(numbuf[2], (dqb->dqb_valid & QIF_ILIMITS) ? "%ju" : "[%ju]", (uintmax_t)dqb->dqb_ihardlimit); - if (type != QC_OSTIDX) + if (show_default) + printf(" %6s %7s %7s", numbuf[1], numbuf[2], timebuf); + else if (type != QC_OSTIDX) printf(" %7s%c %6s %7s %7s", numbuf[0], iover ? '*' : ' ', numbuf[1], numbuf[2], iover > 1 ? timebuf : "-"); @@ -4837,7 +6022,7 @@ static int print_obd_quota(char *mnt, struct if_quotactl *qctl, int is_mdt, } print_quota(obd_uuid2str(&qctl->obd_uuid), qctl, - qctl->qc_valid, 0, h); + qctl->qc_valid, 0, h, false); *total += is_mdt ? qctl->qc_dqblk.dqb_ihardlimit : qctl->qc_dqblk.dqb_bhardlimit; } @@ -4847,12 +6032,15 @@ out: } static int get_print_quota(char *mnt, char *name, struct if_quotactl *qctl, - int verbose, int quiet, bool human_readable) + int verbose, int quiet, bool human_readable, + bool show_default) { int rc1 = 0, rc2 = 0, rc3 = 0; char *obd_type = (char *)qctl->obd_type; char *obd_uuid = (char *)qctl->obd_uuid.uuid; __u64 total_ialloc = 0, total_balloc = 0; + bool use_default_for_blk = false; + bool use_default_for_file = false; int inacc; rc1 = llapi_quotactl(mnt, qctl); @@ -4874,8 +6062,31 @@ static int get_print_quota(char *mnt, char *name, struct if_quotactl *qctl, } } - if (qctl->qc_cmd == LUSTRE_Q_GETQUOTA && !quiet) - print_quota_title(name, qctl, human_readable); + if (!show_default && qctl->qc_id == 0) { + qctl->qc_dqblk.dqb_bhardlimit = 0; + qctl->qc_dqblk.dqb_bsoftlimit = 0; + qctl->qc_dqblk.dqb_ihardlimit = 0; + qctl->qc_dqblk.dqb_isoftlimit = 0; + qctl->qc_dqblk.dqb_btime = 0; + qctl->qc_dqblk.dqb_itime = 0; + qctl->qc_dqblk.dqb_valid |= QIF_LIMITS | QIF_TIMES; + } + + if (qctl->qc_dqblk.dqb_valid & QIF_BTIME && + LQUOTA_FLAG(qctl->qc_dqblk.dqb_btime) & LQUOTA_FLAG_DEFAULT) { + use_default_for_blk = true; + qctl->qc_dqblk.dqb_btime &= LQUOTA_GRACE_MASK; + } + + if (qctl->qc_dqblk.dqb_valid & QIF_ITIME && + LQUOTA_FLAG(qctl->qc_dqblk.dqb_itime) & LQUOTA_FLAG_DEFAULT) { + use_default_for_file = true; + qctl->qc_dqblk.dqb_itime &= LQUOTA_GRACE_MASK; + } + + if ((qctl->qc_cmd == LUSTRE_Q_GETQUOTA || + qctl->qc_cmd == LUSTRE_Q_GETDEFAULT) && !quiet) + print_quota_title(name, qctl, human_readable, show_default); if (rc1 && *obd_type) fprintf(stderr, "%s %s ", obd_type, obd_uuid); @@ -4887,10 +6098,10 @@ static int get_print_quota(char *mnt, char *name, struct if_quotactl *qctl, ((qctl->qc_dqblk.dqb_valid & (QIF_LIMITS|QIF_USAGE)) != (QIF_LIMITS|QIF_USAGE)); - print_quota(mnt, qctl, QC_GENERAL, rc1, human_readable); + print_quota(mnt, qctl, QC_GENERAL, rc1, human_readable, show_default); - if (qctl->qc_valid == QC_GENERAL && qctl->qc_cmd != LUSTRE_Q_GETINFO && - verbose) { + if (!show_default && verbose && + qctl->qc_valid == QC_GENERAL && qctl->qc_cmd != LUSTRE_Q_GETINFO) { char strbuf[STRBUF_LEN]; rc2 = print_obd_quota(mnt, qctl, 1, human_readable, @@ -4904,6 +6115,14 @@ static int get_print_quota(char *mnt, char *name, struct if_quotactl *qctl, strbuf); } + if (use_default_for_blk) + printf("%cid %u is using default block quota setting\n", + *qtype_name(qctl->qc_type), qctl->qc_id); + + if (use_default_for_file) + printf("%cid %u is using default file quota setting\n", + *qtype_name(qctl->qc_type), qctl->qc_id); + if (rc1 || rc2 || rc3 || inacc) printf("Some errors happened when getting quota info. " "Some devices may be not working or deactivated. " @@ -4913,6 +6132,160 @@ out: } +static int lfs_project(int argc, char **argv) +{ + int ret = 0, err = 0, c, i; + struct project_handle_control phc = { 0 }; + enum lfs_project_ops_t op; + + phc.newline = true; + phc.assign_projid = false; + /* default action */ + op = LFS_PROJECT_LIST; + + while ((c = getopt(argc, argv, "p:cCsdkr0")) != -1) { + switch (c) { + case 'c': + if (op != LFS_PROJECT_LIST) { + fprintf(stderr, + "%s: cannot specify '-c' '-C' '-s' together\n", + progname); + return CMD_HELP; + } + + op = LFS_PROJECT_CHECK; + break; + case 'C': + if (op != LFS_PROJECT_LIST) { + fprintf(stderr, + "%s: cannot specify '-c' '-C' '-s' together\n", + progname); + return CMD_HELP; + } + + op = LFS_PROJECT_CLEAR; + break; + case 's': + if (op != LFS_PROJECT_LIST) { + fprintf(stderr, + "%s: cannot specify '-c' '-C' '-s' together\n", + progname); + return CMD_HELP; + } + + phc.set_inherit = true; + op = LFS_PROJECT_SET; + break; + case 'd': + phc.dironly = true; + break; + case 'k': + phc.keep_projid = true; + break; + case 'r': + phc.recursive = true; + break; + case 'p': + phc.projid = strtoul(optarg, NULL, 0); + phc.assign_projid = true; + + break; + case '0': + phc.newline = false; + break; + default: + fprintf(stderr, "%s: invalid option '%c'\n", + progname, optopt); + return CMD_HELP; + } + } + + if (phc.assign_projid && op == LFS_PROJECT_LIST) { + op = LFS_PROJECT_SET; + phc.set_projid = true; + } else if (phc.assign_projid && op == LFS_PROJECT_SET) { + phc.set_projid = true; + } + + switch (op) { + case LFS_PROJECT_CHECK: + if (phc.keep_projid) { + fprintf(stderr, + "%s: '-k' is useless together with '-c'\n", + progname); + return CMD_HELP; + } + break; + case LFS_PROJECT_CLEAR: + if (!phc.newline) { + fprintf(stderr, + "%s: '-0' is useless together with '-C'\n", + progname); + return CMD_HELP; + } + if (phc.assign_projid) { + fprintf(stderr, + "%s: '-p' is useless together with '-C'\n", + progname); + return CMD_HELP; + } + break; + case LFS_PROJECT_SET: + if (!phc.newline) { + fprintf(stderr, + "%s: '-0' is useless together with '-s'\n", + progname); + return CMD_HELP; + } + if (phc.keep_projid) { + fprintf(stderr, + "%s: '-k' is useless together with '-s'\n", + progname); + return CMD_HELP; + } + break; + default: + if (!phc.newline) { + fprintf(stderr, + "%s: '-0' is useless for list operations\n", + progname); + return CMD_HELP; + } + break; + } + + argv += optind; + argc -= optind; + if (argc == 0) { + fprintf(stderr, "%s: missing file or directory target(s)\n", + progname); + return CMD_HELP; + } + + for (i = 0; i < argc; i++) { + switch (op) { + case LFS_PROJECT_CHECK: + err = lfs_project_check(argv[i], &phc); + break; + case LFS_PROJECT_LIST: + err = lfs_project_list(argv[i], &phc); + break; + case LFS_PROJECT_CLEAR: + err = lfs_project_clear(argv[i], &phc); + break; + case LFS_PROJECT_SET: + err = lfs_project_set(argv[i], &phc); + break; + default: + break; + } + if (err && !ret) + ret = err; + } + + return ret; +} + static int lfs_quota(int argc, char **argv) { int c; @@ -4924,21 +6297,30 @@ static int lfs_quota(int argc, char **argv) char *endptr; __u32 valid = QC_GENERAL, idx = 0; bool human_readable = false; + bool show_default = false; int qtype; - while ((c = getopt(argc, argv, "gi:I:o:pqtuvh")) != -1) { + while ((c = getopt(argc, argv, "gGi:I:o:pPqtuUvh")) != -1) { switch (c) { + case 'U': + show_default = true; case 'u': qtype = USRQUOTA; goto quota_type; + case 'G': + show_default = true; case 'g': qtype = GRPQUOTA; goto quota_type; + case 'P': + show_default = true; case 'p': qtype = PRJQUOTA; quota_type: if (qctl.qc_type != ALLQUOTA) { - fprintf(stderr, "error: use either -u or -g\n"); + fprintf(stderr, + "%s quota: only one of -u, -g, or -p may be specified\n", + progname); return CMD_HELP; } qctl.qc_type = qtype; @@ -4948,16 +6330,28 @@ quota_type: break; case 'o': valid = qctl.qc_valid = QC_UUID; - strlcpy(obd_uuid, optarg, sizeof(qctl.obd_uuid)); - break; - case 'i': - valid = qctl.qc_valid = QC_MDTIDX; - idx = qctl.qc_idx = atoi(optarg); - break; - case 'I': - valid = qctl.qc_valid = QC_OSTIDX; - idx = qctl.qc_idx = atoi(optarg); + snprintf(obd_uuid, sizeof(qctl.obd_uuid), "%s", optarg); break; + case 'i': + valid = qctl.qc_valid = QC_MDTIDX; + idx = qctl.qc_idx = atoi(optarg); + if (idx == 0 && *optarg != '0') { + fprintf(stderr, + "%s quota: invalid MDT index '%s'\n", + progname, optarg); + return CMD_HELP; + } + break; + case 'I': + valid = qctl.qc_valid = QC_OSTIDX; + idx = qctl.qc_idx = atoi(optarg); + if (idx == 0 && *optarg != '0') { + fprintf(stderr, + "%s quota: invalid OST index '%s'\n", + progname, optarg); + return CMD_HELP; + } + break; case 'v': verbose = 1; break; @@ -4967,16 +6361,16 @@ quota_type: case 'h': human_readable = true; break; - default: - fprintf(stderr, "error: %s: option '-%c' " - "unrecognized\n", argv[0], c); - return CMD_HELP; - } - } + default: + fprintf(stderr, "%s quota: unrecognized option '%s'\n", + progname, argv[optind - 1]); + return CMD_HELP; + } + } /* current uid/gid info for "lfs quota /path/to/lustre/mount" */ if (qctl.qc_cmd == LUSTRE_Q_GETQUOTA && qctl.qc_type == ALLQUOTA && - optind == argc - 1) { + optind == argc - 1 && !show_default) { qctl.qc_cmd = LUSTRE_Q_GETQUOTA; qctl.qc_valid = valid; @@ -4995,49 +6389,62 @@ quota_type: name = ""; mnt = argv[optind]; rc1 = get_print_quota(mnt, name, &qctl, verbose, quiet, - human_readable); + human_readable, show_default); if (rc1 && !rc) rc = rc1; } + return rc; /* lfs quota -u username /path/to/lustre/mount */ } else if (qctl.qc_cmd == LUSTRE_Q_GETQUOTA) { /* options should be followed by u/g-name and mntpoint */ - if (optind + 2 != argc || qctl.qc_type == ALLQUOTA) { - fprintf(stderr, "error: missing quota argument(s)\n"); + if ((!show_default && optind + 2 != argc) || + (show_default && optind + 1 != argc) || + qctl.qc_type == ALLQUOTA) { + fprintf(stderr, + "%s quota: name and mount point must be specified\n", + progname); return CMD_HELP; } - name = argv[optind++]; - switch (qctl.qc_type) { - case USRQUOTA: - rc = name2uid(&qctl.qc_id, name); - break; - case GRPQUOTA: - rc = name2gid(&qctl.qc_id, name); - break; - case PRJQUOTA: - rc = name2projid(&qctl.qc_id, name); - break; - default: - rc = -ENOTSUP; - break; + if (!show_default) { + name = argv[optind++]; + switch (qctl.qc_type) { + case USRQUOTA: + rc = name2uid(&qctl.qc_id, name); + break; + case GRPQUOTA: + rc = name2gid(&qctl.qc_id, name); + break; + case PRJQUOTA: + rc = name2projid(&qctl.qc_id, name); + break; + default: + rc = -ENOTSUP; + break; + } + } else { + qctl.qc_valid = QC_GENERAL; + qctl.qc_cmd = LUSTRE_Q_GETDEFAULT; + qctl.qc_id = 0; } + if (rc) { qctl.qc_id = strtoul(name, &endptr, 10); if (*endptr != '\0') { - fprintf(stderr, "error: can't find id for name: %s\n", - name); + fprintf(stderr, "%s quota: invalid id '%s'\n", + progname, name); return CMD_HELP; } } - mnt = argv[optind]; - rc = get_print_quota(mnt, name, &qctl, verbose, quiet, - human_readable); } else if (optind + 1 != argc || qctl.qc_type == ALLQUOTA) { - fprintf(stderr, "error: missing quota info argument(s)\n"); + fprintf(stderr, "%s quota: missing quota info argument(s)\n", + progname); return CMD_HELP; } + mnt = argv[optind]; + rc = get_print_quota(mnt, name, &qctl, verbose, quiet, + human_readable, show_default); return rc; } #endif /* HAVE_SYS_QUOTA_H! */ @@ -5142,16 +6549,18 @@ static int lfs_changelog(int argc, char **argv) case 'f': follow++; break; - case '?': - return CMD_HELP; default: - fprintf(stderr, "error: %s: option '%s' unrecognized\n", - argv[0], argv[optind - 1]); + fprintf(stderr, + "%s changelog: unrecognized option '%s'\n", + progname, argv[optind - 1]); return CMD_HELP; } } - if (optind >= argc) - return CMD_HELP; + if (optind >= argc) { + fprintf(stderr, "%s changelog: mdtname must be specified\n", + progname); + return CMD_HELP; + } mdd = argv[optind++]; if (argc > optind) @@ -5162,11 +6571,24 @@ static int lfs_changelog(int argc, char **argv) rc = llapi_changelog_start(&changelog_priv, CHANGELOG_FLAG_BLOCK | CHANGELOG_FLAG_JOBID | + CHANGELOG_FLAG_EXTRA_FLAGS | (follow ? CHANGELOG_FLAG_FOLLOW : 0), mdd, startrec); if (rc < 0) { - fprintf(stderr, "Can't start changelog: %s\n", - strerror(errno = -rc)); + fprintf(stderr, "%s changelog: cannot start changelog: %s\n", + progname, strerror(errno = -rc)); + return rc; + } + + rc = llapi_changelog_set_xflags(changelog_priv, + CHANGELOG_EXTRA_FLAG_UIDGID | + CHANGELOG_EXTRA_FLAG_NID | + CHANGELOG_EXTRA_FLAG_OMODE | + CHANGELOG_EXTRA_FLAG_XATTR); + if (rc < 0) { + fprintf(stderr, + "%s changelog: cannot set xflags for changelog: %s\n", + progname, strerror(errno = -rc)); return rc; } @@ -5201,32 +6623,86 @@ static int lfs_changelog(int argc, char **argv) printf(" j=%s", jid->cr_jobid); } - if (rec->cr_namelen) - printf(" p="DFID" %.*s", PFID(&rec->cr_pfid), - rec->cr_namelen, changelog_rec_name(rec)); + if (rec->cr_flags & CLF_EXTRA_FLAGS) { + struct changelog_ext_extra_flags *ef = + changelog_rec_extra_flags(rec); - if (rec->cr_flags & CLF_RENAME) { - struct changelog_ext_rename *rnm = - changelog_rec_rename(rec); + printf(" ef=0x%llx", ef->cr_extra_flags); - if (!fid_is_zero(&rnm->cr_sfid)) - printf(" s="DFID" sp="DFID" %.*s", - PFID(&rnm->cr_sfid), - PFID(&rnm->cr_spfid), + if (ef->cr_extra_flags & CLFE_UIDGID) { + struct changelog_ext_uidgid *uidgid = + changelog_rec_uidgid(rec); + + printf(" u=%llu:%llu", + uidgid->cr_uid, uidgid->cr_gid); + } + if (ef->cr_extra_flags & CLFE_NID) { + struct changelog_ext_nid *nid = + changelog_rec_nid(rec); + + printf(" nid=%s", + libcfs_nid2str(nid->cr_nid)); + } + + if (ef->cr_extra_flags & CLFE_OPEN) { + struct changelog_ext_openmode *omd = + changelog_rec_openmode(rec); + char mode[] = "---"; + + /* exec mode must be exclusive */ + if (omd->cr_openflags & MDS_FMODE_EXEC) { + mode[2] = 'x'; + } else { + if (omd->cr_openflags & MDS_FMODE_READ) + mode[0] = 'r'; + if (omd->cr_openflags & + (MDS_FMODE_WRITE | + MDS_OPEN_TRUNC | + MDS_OPEN_APPEND)) + mode[1] = 'w'; + } + + if (strcmp(mode, "---") != 0) + printf(" m=%s", mode); + + } + + if (ef->cr_extra_flags & CLFE_XATTR) { + struct changelog_ext_xattr *xattr = + changelog_rec_xattr(rec); + + if (xattr->cr_xattr[0] != '\0') + printf(" x=%s", xattr->cr_xattr); + } + } + + 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_fini(&changelog_priv); + llapi_changelog_fini(&changelog_priv); - if (rc < 0) - fprintf(stderr, "Changelog: %s\n", strerror(errno = -rc)); + if (rc < 0) + fprintf(stderr, "%s changelog: cannot access changelog: %s\n", + progname, strerror(errno = -rc)); - return (rc == 1 ? 0 : rc); + return (rc == 1 ? 0 : rc); } static int lfs_changelog_clear(int argc, char **argv) @@ -5271,36 +6747,55 @@ static int lfs_fid2path(int argc, char **argv) int lnktmp; int printcur = 0; int rc = 0; + char *endptr = NULL; while ((rc = getopt_long(argc, argv, short_opts, long_opts, NULL)) != -1) { - switch (rc) { - case 'c': - printcur++; - break; - case 'l': - linkno = strtol(optarg, NULL, 10); - break; - case 'r': - recno = strtoll(optarg, NULL, 10); - break; - case '?': - return CMD_HELP; - default: - fprintf(stderr, "error: %s: option '%s' unrecognized\n", - argv[0], argv[optind - 1]); - return CMD_HELP; - } - } + switch (rc) { + case 'c': + printcur++; + break; + case 'l': + linkno = strtol(optarg, &endptr, 10); + if (*endptr != '\0') { + fprintf(stderr, + "%s fid2path: invalid linkno '%s'\n", + progname, optarg); + return CMD_HELP; + } + break; + case 'r': + recno = strtoll(optarg, &endptr, 10); + if (*endptr != '\0') { + fprintf(stderr, + "%s fid2path: invalid recno '%s'\n", + progname, optarg); + return CMD_HELP; + } + break; + default: + fprintf(stderr, + "%s fid2path: unrecognized option '%s'\n", + progname, argv[optind - 1]); + return CMD_HELP; + } + } - if (argc < 3) + if (argc < 3) { + fprintf(stderr, + "%s fid2path: and ... must be specified\n", + progname); return CMD_HELP; + } device = argv[optind++]; path = calloc(1, PATH_MAX); if (path == NULL) { - fprintf(stderr, "error: Not enough memory\n"); - return -errno; + rc = -errno; + fprintf(stderr, + "%s fid2path: cannot allocate memory for path: %s\n", + progname, strerror(-rc)); + return rc; } rc = 0; @@ -5315,8 +6810,9 @@ static int lfs_fid2path(int argc, char **argv) rc2 = llapi_fid2path(device, fid, path, PATH_MAX, &rectmp, &lnktmp); if (rc2 < 0) { - fprintf(stderr, "%s: error on FID %s: %s\n", - argv[0], fid, strerror(errno = -rc2)); + fprintf(stderr, + "%s fid2path: cannot find '%s': %s\n", + progname, fid, strerror(errno = -rc2)); if (rc == 0) rc = rc2; break; @@ -5354,7 +6850,7 @@ static int lfs_path2fid(int argc, char **argv) char **path; const char short_opts[] = "p"; const char *sep = ""; - lustre_fid fid; + struct lu_fid fid; int rc = 0; bool show_parents = false; @@ -5365,14 +6861,18 @@ static int lfs_path2fid(int argc, char **argv) show_parents = true; break; default: - fprintf(stderr, "error: %s: option '%s' unrecognized\n", - argv[0], argv[optind - 1]); + fprintf(stderr, + "%s path2fid: unrecognized option '%s'\n", + progname, argv[optind - 1]); return CMD_HELP; } } - if (optind > argc - 1) + if (optind > argc - 1) { + fprintf(stderr, "%s path2fid: FILE... must be specified\n", + progname); return CMD_HELP; + } else if (optind < argc - 1) sep = ": "; @@ -5407,8 +6907,9 @@ static int lfs_path2fid(int argc, char **argv) } if (err) { - fprintf(stderr, "%s: can't get %sfid for %s: %s\n", - argv[0], show_parents ? "parent " : "", *path, + fprintf(stderr, + "%s path2fid: cannot get %sfid for '%s': %s\n", + progname, show_parents ? "parent " : "", *path, strerror(-err)); if (rc == 0) { rc = err; @@ -5429,8 +6930,11 @@ static int lfs_data_version(int argc, char **argv) int c; int data_version_flags = LL_DV_RD_FLUSH; /* Read by default */ - if (argc < 2) + if (argc < 2) { + fprintf(stderr, "%s data_version: FILE must be specified\n", + progname); return CMD_HELP; + } while ((c = getopt(argc, argv, "nrw")) != -1) { switch (c) { @@ -5444,20 +6948,32 @@ static int lfs_data_version(int argc, char **argv) data_version_flags |= LL_DV_WR_FLUSH; break; default: + fprintf(stderr, + "%s data_version: unrecognized option '%s'\n", + progname, argv[optind - 1]); return CMD_HELP; } } - if (optind == argc) + if (optind == argc) { + fprintf(stderr, "%s data_version: FILE must be specified\n", + progname); return CMD_HELP; + } path = argv[optind]; fd = open(path, O_RDONLY); - if (fd < 0) - err(errno, "cannot open file %s", path); + if (fd < 0) { + rc = -errno; + fprintf(stderr, "%s data_version: cannot open file '%s': %s\n", + progname, path, strerror(-rc)); + return rc; + } rc = llapi_get_data_version(fd, &data_version, data_version_flags); if (rc < 0) - err(errno, "cannot get version for %s", path); + fprintf(stderr, + "%s data_version: cannot get version for '%s': %s\n", + progname, path, strerror(-rc)); else printf("%ju" "\n", (uintmax_t)data_version); @@ -5531,11 +7047,14 @@ static int lfs_hsm_change_flags(int argc, char **argv, int mode) { .val = 'e', .name = "exists", .has_arg = no_argument }, { .val = 'l', .name = "lost", .has_arg = no_argument }, { .val = 'r', .name = "norelease", .has_arg = no_argument }, + { .val = 'i', .name = "archive-id", .has_arg = required_argument }, { .name = NULL } }; - char short_opts[] = "lraAde"; + char short_opts[] = "lraAdei:"; __u64 mask = 0; int c, rc; char *path; + __u32 archive_id = 0; + char *end = NULL; if (argc < 3) return CMD_HELP; @@ -5561,6 +7080,14 @@ static int lfs_hsm_change_flags(int argc, char **argv, int mode) case 'e': mask |= HS_EXISTS; break; + case 'i': + archive_id = strtol(optarg, &end, 10); + if (*end != '\0') { + fprintf(stderr, "invalid archive_id: '%s'\n", + end); + return CMD_HELP; + } + break; case '?': return CMD_HELP; default: @@ -5580,7 +7107,7 @@ static int lfs_hsm_change_flags(int argc, char **argv, int mode) /* If mode == 0, this means we apply the mask. */ if (mode == LFS_HSM_SET) - rc = llapi_hsm_state_set(path, mask, 0, 0); + rc = llapi_hsm_state_set(path, mask, 0, archive_id); else rc = llapi_hsm_state_set(path, 0, mask, 0); @@ -5974,12 +7501,6 @@ static const char *const ladvise_names[] = LU_LADVISE_NAMES; static const char *const lock_mode_names[] = LOCK_MODE_NAMES; -static const char *const lockahead_results[] = { - [LLA_RESULT_SENT] = "Lock request sent", - [LLA_RESULT_DIFFERENT] = "Different matching lock found", - [LLA_RESULT_SAME] = "Matching lock on identical extent found", -}; - int lfs_get_mode(const char *string) { enum lock_mode_user mode; @@ -6198,97 +7719,862 @@ static int lfs_ladvise(int argc, char **argv) ladvise_names[advice_type], path, strerror(errno)); - goto next; + goto next; + } + +next: + if (rc == 0 && rc2 < 0) + rc = rc2; + } + return rc; +} + +/** The input string contains a comma delimited list of component ids and + * ranges, for example "1,2-4,7". + */ +static int parse_mirror_ids(__u16 *ids, int size, char *arg) +{ + bool end_of_loop = false; + char *ptr = NULL; + int nr = 0; + int rc; + + if (arg == NULL) + return -EINVAL; + + 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 && size > 0; i++) { + int j; + + /* remove duplicate */ + for (j = 0; j < nr; j++) { + if (ids[j] == i) + break; + } + if (j == nr) { /* no duplicate */ + ids[nr++] = i; + --size; + } + } + + if (size == 0 && i < end_index) + break; + + *ptr = ','; + arg = ++ptr; + rc = 0; + } + if (!end_of_loop && ptr != NULL) + *ptr = ','; + + return rc < 0 ? rc : nr; +} + +/** + * struct verify_mirror_id - Mirror id to be verified. + * @mirror_id: A specified mirror id. + * @is_valid_id: @mirror_id is valid or not in the mirrored file. + */ +struct verify_mirror_id { + __u16 mirror_id; + bool is_valid_id; +}; + +/** + * compare_mirror_ids() - Compare mirror ids. + * @layout: Mirror component list. + * @cbdata: Callback data in verify_mirror_id structure. + * + * This is a callback function called by llapi_layout_comp_iterate() + * to compare the specified mirror id with the one in the current + * component of @layout. If they are the same, then the specified + * mirror id is valid. + * + * Return: a negative error code on failure or + * LLAPI_LAYOUT_ITER_CONT: Proceed iteration + * LLAPI_LAYOUT_ITER_STOP: Stop iteration + */ +static inline +int compare_mirror_ids(struct llapi_layout *layout, void *cbdata) +{ + struct verify_mirror_id *mirror_id_cbdata = + (struct verify_mirror_id *)cbdata; + uint32_t mirror_id; + int rc = 0; + + rc = llapi_layout_mirror_id_get(layout, &mirror_id); + if (rc < 0) { + rc = -errno; + fprintf(stderr, + "%s: llapi_layout_mirror_id_get failed: %s.\n", + progname, strerror(errno)); + return rc; + } + + if (mirror_id_cbdata->mirror_id == mirror_id) { + mirror_id_cbdata->is_valid_id = true; + return LLAPI_LAYOUT_ITER_STOP; + } + + return LLAPI_LAYOUT_ITER_CONT; +} + +/** + * verify_mirror_ids() - Verify specified mirror ids. + * @fname: Mirrored file name. + * @mirror_ids: Specified mirror ids to be verified. + * @ids_nr: Number of specified mirror ids. + * + * This function verifies that specified @mirror_ids are valid + * in the mirrored file @fname. + * + * Return: 0 on success or a negative error code on failure. + */ +static inline +int verify_mirror_ids(const char *fname, __u16 *mirror_ids, int ids_nr) +{ + struct llapi_layout *layout = NULL; + struct verify_mirror_id mirror_id_cbdata = { 0 }; + struct stat stbuf; + uint32_t flr_state; + int i; + int fd; + int rc = 0; + int rc2 = 0; + + if (ids_nr <= 0) + return -EINVAL; + + if (stat(fname, &stbuf) < 0) { + fprintf(stderr, "%s: cannot stat file '%s': %s.\n", + progname, fname, strerror(errno)); + rc = -errno; + goto error; + } + + if (!S_ISREG(stbuf.st_mode)) { + fprintf(stderr, "%s: '%s' is not a regular file.\n", + progname, fname); + rc = -EINVAL; + goto error; + } + + fd = open(fname, O_DIRECT | O_RDONLY); + if (fd < 0) { + fprintf(stderr, "%s: cannot open '%s': %s.\n", + progname, fname, strerror(errno)); + rc = -errno; + goto error; + } + + rc = llapi_lease_acquire(fd, LL_LEASE_RDLCK); + if (rc < 0) { + fprintf(stderr, "%s: '%s' llapi_lease_acquire failed: %s.\n", + progname, fname, strerror(errno)); + goto close_fd; + } + + layout = llapi_layout_get_by_fd(fd, 0); + if (layout == NULL) { + fprintf(stderr, "%s: '%s' llapi_layout_get_by_fd failed: %s.\n", + progname, fname, strerror(errno)); + rc = -errno; + llapi_lease_release(fd); + goto close_fd; + } + + rc = llapi_layout_flags_get(layout, &flr_state); + if (rc < 0) { + fprintf(stderr, "%s: '%s' llapi_layout_flags_get failed: %s.\n", + progname, fname, strerror(errno)); + rc = -errno; + goto free_layout; + } + + flr_state &= LCM_FL_FLR_MASK; + switch (flr_state) { + case LCM_FL_NONE: + rc = -EINVAL; + fprintf(stderr, "%s: '%s' file state error: %s.\n", + progname, fname, llapi_layout_flags_string(flr_state)); + goto free_layout; + default: + break; + } + + rc2 = 0; + for (i = 0; i < ids_nr; i++) { + mirror_id_cbdata.mirror_id = mirror_ids[i]; + mirror_id_cbdata.is_valid_id = false; + + rc = llapi_layout_comp_iterate(layout, compare_mirror_ids, + &mirror_id_cbdata); + if (rc < 0) { + rc = -errno; + fprintf(stderr, + "%s: '%s' failed to verify mirror id: %u.\n", + progname, fname, mirror_ids[i]); + goto free_layout; + } + + if (!mirror_id_cbdata.is_valid_id) { + rc2 = -EINVAL; + fprintf(stderr, + "%s: '%s' invalid specified mirror id: %u.\n", + progname, fname, mirror_ids[i]); + } + } + rc = rc2; + +free_layout: + llapi_layout_free(layout); + llapi_lease_release(fd); +close_fd: + close(fd); +error: + return rc; +} + +static inline +int lfs_mirror_resync_file(const char *fname, struct ll_ioc_lease *ioc, + __u16 *mirror_ids, int ids_nr) +{ + struct llapi_resync_comp comp_array[1024] = { { 0 } }; + struct llapi_layout *layout; + struct stat stbuf; + uint32_t flr_state; + uint64_t start; + uint64_t end; + int comp_size = 0; + int idx; + int fd; + int rc; + + if (stat(fname, &stbuf) < 0) { + fprintf(stderr, "%s: cannot stat file '%s': %s.\n", + progname, fname, strerror(errno)); + rc = -errno; + goto error; + } + if (!S_ISREG(stbuf.st_mode)) { + fprintf(stderr, "%s: '%s' is not a regular file.\n", + progname, fname); + rc = -EINVAL; + goto error; + } + + fd = open(fname, O_DIRECT | O_RDWR); + if (fd < 0) { + fprintf(stderr, "%s: cannot open '%s': %s.\n", + progname, fname, strerror(errno)); + rc = -errno; + goto error; + } + + layout = llapi_layout_get_by_fd(fd, 0); + if (layout == NULL) { + fprintf(stderr, "%s: '%s' llapi_layout_get_by_fd failed: %s.\n", + progname, fname, strerror(errno)); + rc = -errno; + goto close_fd; + } + + rc = llapi_layout_flags_get(layout, &flr_state); + if (rc) { + fprintf(stderr, "%s: '%s' llapi_layout_flags_get failed: %s.\n", + progname, fname, strerror(errno)); + rc = -errno; + goto free_layout; + } + + flr_state &= LCM_FL_FLR_MASK; + if (flr_state == LCM_FL_NONE) { + rc = -EINVAL; + fprintf(stderr, "%s: '%s' is not a FLR file.\n", + progname, fname); + goto free_layout; + } + + /* get stale component info */ + comp_size = llapi_mirror_find_stale(layout, comp_array, + ARRAY_SIZE(comp_array), + mirror_ids, ids_nr); + if (comp_size <= 0) { + rc = comp_size; + goto free_layout; + } + + ioc->lil_mode = LL_LEASE_WRLCK; + ioc->lil_flags = LL_LEASE_RESYNC; + rc = llapi_lease_set(fd, ioc); + if (rc < 0) { + if (rc == -EALREADY) + rc = 0; + else + fprintf(stderr, + "%s: '%s' llapi_lease_get_ext resync failed: %s.\n", + progname, fname, strerror(errno)); + goto free_layout; + } + + /* get the read range [start, end) */ + start = comp_array[0].lrc_start; + end = comp_array[0].lrc_end; + for (idx = 1; idx < comp_size; idx++) { + if (comp_array[idx].lrc_start < start) + start = comp_array[idx].lrc_start; + if (end < comp_array[idx].lrc_end) + end = comp_array[idx].lrc_end; + } + + rc = llapi_lease_check(fd); + if (rc != LL_LEASE_WRLCK) { + fprintf(stderr, "%s: '%s' lost lease lock.\n", + progname, fname); + goto free_layout; + } + + rc = llapi_mirror_resync_many(fd, layout, comp_array, comp_size, + start, end); + if (rc < 0) + fprintf(stderr, "%s: '%s' llapi_mirror_resync_many: %d.\n", + progname, fname, rc); + + /* prepare ioc for lease put */ + ioc->lil_mode = LL_LEASE_UNLCK; + ioc->lil_flags = LL_LEASE_RESYNC_DONE; + ioc->lil_count = 0; + for (idx = 0; idx < comp_size; idx++) { + if (comp_array[idx].lrc_synced) { + ioc->lil_ids[ioc->lil_count] = comp_array[idx].lrc_id; + ioc->lil_count++; + } + } + + rc = llapi_lease_set(fd, ioc); + if (rc <= 0) { + if (rc == 0) /* lost lease lock */ + rc = -EBUSY; + fprintf(stderr, "%s: resync file '%s' failed: %s.\n", + progname, fname, strerror(errno)); + goto free_layout; + } + /** + * llapi_lease_set returns lease mode when it request to unlock + * the lease lock + */ + rc = 0; + +free_layout: + llapi_layout_free(layout); +close_fd: + close(fd); +error: + return rc; +} + +static inline int lfs_mirror_resync(int argc, char **argv) +{ + struct ll_ioc_lease *ioc = NULL; + __u16 mirror_ids[128] = { 0 }; + int ids_nr = 0; + int c; + int rc = 0; + + struct option long_opts[] = { + { .val = 'o', .name = "only", .has_arg = required_argument }, + { .name = NULL } }; + + while ((c = getopt_long(argc, argv, "o:", long_opts, NULL)) >= 0) { + switch (c) { + case 'o': + rc = parse_mirror_ids(mirror_ids, + sizeof(mirror_ids) / sizeof(__u16), + optarg); + if (rc < 0) { + fprintf(stderr, + "%s: bad mirror ids '%s'.\n", + argv[0], optarg); + goto error; + } + ids_nr = rc; + break; + default: + fprintf(stderr, "%s: options '%s' unrecognized.\n", + argv[0], argv[optind - 1]); + rc = -EINVAL; + goto error; + } + } + + if (argc == optind) { + fprintf(stderr, "%s: no file name given.\n", argv[0]); + rc = CMD_HELP; + goto error; + } + + if (ids_nr > 0 && argc > optind + 1) { + fprintf(stderr, + "%s: option '--only' cannot be used upon multiple files.\n", + argv[0]); + rc = CMD_HELP; + goto error; + + } + + if (ids_nr > 0) { + rc = verify_mirror_ids(argv[optind], mirror_ids, ids_nr); + if (rc < 0) + goto error; + } + + /* set the lease on the file */ + ioc = calloc(sizeof(*ioc) + sizeof(__u32) * 4096, 1); + if (ioc == NULL) { + fprintf(stderr, "%s: cannot alloc id array for ioc: %s.\n", + argv[0], strerror(errno)); + rc = -errno; + goto error; + } + + for (; optind < argc; optind++) { + rc = lfs_mirror_resync_file(argv[optind], ioc, + mirror_ids, ids_nr); + /* ignore previous file's error, continue with next file */ + + /* reset ioc */ + memset(ioc, 0, sizeof(__u32) * 4096); + } + + free(ioc); +error: + return rc; +} + +/** + * struct verify_chunk - Mirror chunk to be verified. + * @chunk: [start, end) of the chunk. + * @mirror_count: Number of mirror ids in @mirror_id array. + * @mirror_id: Array of valid mirror ids that cover the chunk. + */ +struct verify_chunk { + struct lu_extent chunk; + unsigned int mirror_count; + __u16 mirror_id[LUSTRE_MIRROR_COUNT_MAX]; +}; + +/** + * print_chunks() - Print chunk information. + * @fname: Mirrored file name. + * @chunks: Array of chunks. + * @chunk_count: Number of chunks in @chunks array. + * + * This function prints [start, end) of each chunk in @chunks + * for mirrored file @fname, and also prints the valid mirror ids + * that cover the chunk. + * + * Return: void. + */ +static inline +void print_chunks(const char *fname, struct verify_chunk *chunks, + int chunk_count) +{ + int i; + int j; + + fprintf(stdout, "Chunks to be verified in %s:\n", fname); + for (i = 0; i < chunk_count; i++) { + fprintf(stdout, DEXT, PEXT(&chunks[i].chunk)); + + if (chunks[i].mirror_count == 0) + fprintf(stdout, "\t["); + else { + fprintf(stdout, "\t[%u", chunks[i].mirror_id[0]); + for (j = 1; j < chunks[i].mirror_count; j++) + fprintf(stdout, ", %u", chunks[i].mirror_id[j]); + } + fprintf(stdout, "]\t%u\n", chunks[i].mirror_count); + } + fprintf(stdout, "\n"); +} + +/** + * print_checksums() - Print CRC-32 checksum values. + * @chunk: A chunk and its corresponding valid mirror ids. + * @crc: CRC-32 checksum values on the chunk for each valid mirror. + * + * This function prints CRC-32 checksum values on @chunk for + * each valid mirror that covers it. + * + * Return: void. + */ +static inline +void print_checksums(struct verify_chunk *chunk, unsigned long *crc) +{ + int i; + + fprintf(stdout, + "CRC-32 checksum value for chunk "DEXT":\n", + PEXT(&chunk->chunk)); + for (i = 0; i < chunk->mirror_count; i++) + fprintf(stdout, "Mirror %u:\t%#lx\n", + chunk->mirror_id[i], crc[i]); + fprintf(stdout, "\n"); +} + +/** + * filter_mirror_id() - Filter specified mirror ids. + * @chunks: Array of chunks. + * @chunk_count: Number of chunks in @chunks array. + * @mirror_ids: Specified mirror ids to be verified. + * @ids_nr: Number of specified mirror ids. + * + * This function scans valid mirror ids that cover each chunk in @chunks + * and filters specified mirror ids. + * + * Return: void. + */ +static inline +void filter_mirror_id(struct verify_chunk *chunks, int chunk_count, + __u16 *mirror_ids, int ids_nr) +{ + int i; + int j; + int k; + __u16 valid_id[LUSTRE_MIRROR_COUNT_MAX] = { 0 }; + unsigned int valid_count = 0; + + for (i = 0; i < chunk_count; i++) { + if (chunks[i].mirror_count == 0) + continue; + + valid_count = 0; + for (j = 0; j < ids_nr; j++) { + for (k = 0; k < chunks[i].mirror_count; k++) { + if (chunks[i].mirror_id[k] == mirror_ids[j]) { + valid_id[valid_count] = mirror_ids[j]; + valid_count++; + break; + } + } + } + + memcpy(chunks[i].mirror_id, valid_id, + sizeof(__u16) * valid_count); + chunks[i].mirror_count = valid_count; + } +} + +/** + * lfs_mirror_prepare_chunk() - Find mirror chunks to be verified. + * @layout: Mirror component list. + * @chunks: Array of chunks. + * @chunks_size: Array size of @chunks. + * + * This function scans the components in @layout from offset 0 to LUSTRE_EOF + * to find out chunk segments and store them in @chunks array. + * + * The @mirror_id array in each element of @chunks will store the valid + * mirror ids that cover the chunk. If a mirror component covering the + * chunk has LCME_FL_STALE or LCME_FL_OFFLINE flag, then the mirror id + * will not be stored into the @mirror_id array, and the chunk for that + * mirror will not be verified. + * + * The @mirror_count in each element of @chunks will store the number of + * mirror ids in @mirror_id array. If @mirror_count is 0, it indicates the + * chunk is invalid in all of the mirrors. And if @mirror_count is 1, it + * indicates the chunk is valid in only one mirror. In both cases, the + * chunk will not be verified. + * + * Here is an example: + * + * 0 1M 2M 3M 4M EOF + * +------+-------------+--------------------+ + * | | | S | mirror1 + * +------+------+------+------+-------------+ + * | | S | S | | mirror2 + * +-------------+------+------+-------------+ + * + * prepared @chunks array will contain 5 elements: + * (([0, 1M), [1, 2], 2), + * ([1M, 2M), [1, 2], 2), + * ([2M, 3M), [1], 1), + * ([3M, 4M], [], 0), + * ([4M, EOF), [2], 1)) + * + * Return: the actual array size of @chunks on success + * or a negative error code on failure. + */ +static inline +int lfs_mirror_prepare_chunk(struct llapi_layout *layout, + struct verify_chunk *chunks, + size_t chunks_size) +{ + uint64_t start; + uint64_t end; + uint32_t mirror_id; + uint32_t flags; + int idx = 0; + int i = 0; + int rc = 0; + + memset(chunks, 0, sizeof(*chunks) * chunks_size); + + while (1) { + rc = llapi_layout_comp_use(layout, LLAPI_LAYOUT_COMP_USE_FIRST); + if (rc < 0) { + fprintf(stderr, + "%s: move to the first layout component: %s.\n", + progname, strerror(errno)); + goto error; + } + + i = 0; + rc = 0; + chunks[idx].chunk.e_end = LUSTRE_EOF; + while (rc == 0) { + rc = llapi_layout_comp_extent_get(layout, &start, &end); + if (rc < 0) { + fprintf(stderr, + "%s: llapi_layout_comp_extent_get failed: %s.\n", + progname, strerror(errno)); + goto error; + } + + if (start > chunks[idx].chunk.e_start || + end <= chunks[idx].chunk.e_start) + goto next; + + if (end < chunks[idx].chunk.e_end) + chunks[idx].chunk.e_end = end; + + rc = llapi_layout_comp_flags_get(layout, &flags); + if (rc < 0) { + fprintf(stderr, + "%s: llapi_layout_comp_flags_get failed: %s.\n", + progname, strerror(errno)); + goto error; + } + + if (flags & LCME_FL_STALE || flags & LCME_FL_OFFLINE) + goto next; + + rc = llapi_layout_mirror_id_get(layout, &mirror_id); + if (rc < 0) { + fprintf(stderr, + "%s: llapi_layout_mirror_id_get failed: %s.\n", + progname, strerror(errno)); + goto error; + } + + chunks[idx].mirror_id[i] = mirror_id; + i++; + if (i >= ARRAY_SIZE(chunks[idx].mirror_id)) { + fprintf(stderr, + "%s: mirror_id array is too small.\n", + progname); + rc = -EINVAL; + goto error; + } + + next: + rc = llapi_layout_comp_use(layout, + LLAPI_LAYOUT_COMP_USE_NEXT); + if (rc < 0) { + fprintf(stderr, + "%s: move to the next layout component: %s.\n", + progname, strerror(errno)); + goto error; + } + } /* loop through all components */ + + chunks[idx].mirror_count = i; + + if (chunks[idx].chunk.e_end == LUSTRE_EOF) + break; + + idx++; + if (idx >= chunks_size) { + fprintf(stderr, "%s: chunks array is too small.\n", + progname); + rc = -EINVAL; + goto error; } -next: - if (rc == 0 && rc2 < 0) - rc = rc2; + chunks[idx].chunk.e_start = chunks[idx - 1].chunk.e_end; } - return rc; + +error: + return rc < 0 ? rc : idx + 1; } -/** The input string contains a comma delimited list of component ids and - * ranges, for example "1,2-4,7". +/** + * lfs_mirror_verify_chunk() - Verify a chunk. + * @fd: File descriptor of the mirrored file. + * @file_size: Size of the mirrored file. + * @chunk: A chunk and its corresponding valid mirror ids. + * @verbose: Verbose mode. + * + * This function verifies a @chunk contains exactly the same data + * ammong the mirrors that cover it. + * + * If @verbose is specified, then the function will print where the + * differences are if the data do not match. Otherwise, it will + * just return an error in that case. + * + * Return: 0 on success or a negative error code on failure. */ -static int parse_mirror_ids(__u16 *ids, int size, char *arg) +static inline +int lfs_mirror_verify_chunk(int fd, size_t file_size, + struct verify_chunk *chunk, int verbose) { - bool end_of_loop = false; - char *ptr = NULL; - int nr = 0; - int rc; - - if (arg == NULL) - return -EINVAL; + const size_t buflen = 4 * 1024 * 1024; /* 4M */ + void *buf; + size_t page_size = sysconf(_SC_PAGESIZE); + ssize_t bytes_read; + ssize_t bytes_done; + size_t count; + off_t pos; + unsigned long crc; + unsigned long crc_array[LUSTRE_MIRROR_COUNT_MAX] = { 0 }; + int i; + int rc = 0; - while (!end_of_loop) { - int start_index; - int end_index; - int i; - char *endptr = NULL; + if (file_size == 0) + return 0; - rc = -EINVAL; - ptr = strchrnul(arg, ','); - end_of_loop = *ptr == '\0'; - *ptr = '\0'; + rc = posix_memalign(&buf, page_size, buflen); + if (rc) /* error code is returned directly */ + return -rc; - 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; + if (verbose > 1) { + fprintf(stdout, "Verifying chunk "DEXT" on mirror:", + PEXT(&chunk->chunk)); + for (i = 0; i < chunk->mirror_count; i++) + fprintf(stdout, " %u", chunk->mirror_id[i]); + fprintf(stdout, "\n"); + } + + bytes_done = 0; + count = MIN(chunk->chunk.e_end, file_size) - chunk->chunk.e_start; + pos = chunk->chunk.e_start; + while (bytes_done < count) { + /* compute initial CRC-32 checksum */ + crc = crc32(0L, Z_NULL, 0); + memset(crc_array, 0, sizeof(crc_array)); + + bytes_read = 0; + for (i = 0; i < chunk->mirror_count; i++) { + bytes_read = llapi_mirror_read(fd, chunk->mirror_id[i], + buf, buflen, pos); + if (bytes_read < 0) { + rc = bytes_read; + fprintf(stderr, + "%s: failed to read data from mirror %u: %s.\n", + progname, chunk->mirror_id[i], + strerror(-rc)); + goto error; + } - end_index = start_index; - if (*endptr == '-') { - end_index = strtol(endptr + 1, &endptr, 0); - if (*endptr != '\0') - break; - if (end_index < start_index) - break; + /* compute new CRC-32 checksum */ + crc_array[i] = crc32(crc, buf, bytes_read); } - for (i = start_index; i <= end_index && size > 0; i++) { - int j; + if (verbose) + print_checksums(chunk, crc_array); - /* remove duplicate */ - for (j = 0; j < nr; j++) { - if (ids[j] == i) - break; - } - if (j == nr) { /* no duplicate */ - ids[nr++] = i; - --size; + /* compare CRC-32 checksum values */ + for (i = 1; i < chunk->mirror_count; i++) { + if (crc_array[i] != crc_array[0]) { + rc = -EINVAL; + if (!verbose) + goto error; + + fprintf(stderr, + "%s: chunk "DEXT" has different checksum value on mirror %u and mirror %u.\n", + progname, PEXT(&chunk->chunk), + chunk->mirror_id[0], + chunk->mirror_id[i]); } } - if (size == 0 && i < end_index) - break; + pos += bytes_read; + bytes_done += bytes_read; + } - *ptr = ','; - arg = ++ptr; - rc = 0; + if (verbose > 1 && rc == 0) { + fprintf(stdout, "Verifying chunk "DEXT" on mirror:", + PEXT(&chunk->chunk)); + for (i = 0; i < chunk->mirror_count; i++) + fprintf(stdout, " %u", chunk->mirror_id[i]); + fprintf(stdout, " PASS\n\n"); } - if (!end_of_loop && ptr != NULL) - *ptr = ','; - return rc < 0 ? rc : nr; +error: + free(buf); + return rc; } +/** + * lfs_mirror_verify_file() - Verify a mirrored file. + * @fname: Mirrored file name. + * @mirror_ids: Specified mirror ids to be verified. + * @ids_nr: Number of specified mirror ids. + * @verbose: Verbose mode. + * + * This function verifies that each SYNC mirror of a mirrored file + * specified by @fname contains exactly the same data. + * + * If @mirror_ids is specified, then the function will verify the + * mirrors specified by @mirror_ids contain exactly the same data. + * + * If @verbose is specified, then the function will print where the + * differences are if the data do not match. Otherwise, it will + * just return an error in that case. + * + * Return: 0 on success or a negative error code on failure. + */ static inline -int lfs_mirror_resync_file(const char *fname, struct ll_ioc_lease *ioc, - __u16 *mirror_ids, int ids_nr) +int lfs_mirror_verify_file(const char *fname, __u16 *mirror_ids, int ids_nr, + int verbose) { - const char *progname = "lfs mirror resync"; - struct llapi_resync_comp comp_array[1024] = { { 0 } }; - struct llapi_layout *layout; + struct verify_chunk chunks_array[1024] = { }; + struct llapi_layout *layout = NULL; struct stat stbuf; uint32_t flr_state; - int comp_size = 0; - int idx; int fd; - int rc; + int chunk_count = 0; + int idx = 0; + int rc = 0; + int rc1 = 0; + int rc2 = 0; if (stat(fname, &stbuf) < 0) { fprintf(stderr, "%s: cannot stat file '%s': %s.\n", @@ -6296,6 +8582,7 @@ int lfs_mirror_resync_file(const char *fname, struct ll_ioc_lease *ioc, rc = -errno; goto error; } + if (!S_ISREG(stbuf.st_mode)) { fprintf(stderr, "%s: '%s' is not a regular file.\n", progname, fname); @@ -6303,7 +8590,15 @@ int lfs_mirror_resync_file(const char *fname, struct ll_ioc_lease *ioc, goto error; } - fd = open(fname, O_DIRECT | O_RDWR); + if (stbuf.st_size == 0) { + if (verbose) + fprintf(stdout, "%s: '%s' file size is 0.\n", + progname, fname); + rc = 0; + goto error; + } + + fd = open(fname, O_DIRECT | O_RDONLY); if (fd < 0) { fprintf(stderr, "%s: cannot open '%s': %s.\n", progname, fname, strerror(errno)); @@ -6311,12 +8606,10 @@ int lfs_mirror_resync_file(const char *fname, struct ll_ioc_lease *ioc, goto error; } - ioc->lil_mode = LL_LEASE_WRLCK; - ioc->lil_flags = LL_LEASE_RESYNC; - rc = llapi_lease_get_ext(fd, ioc); + rc = llapi_lease_acquire(fd, LL_LEASE_RDLCK); if (rc < 0) { - fprintf(stderr, "%s: '%s' llapi_lease_get_ext resync failed: " - "%s.\n", progname, fname, strerror(errno)); + fprintf(stderr, "%s: '%s' llapi_lease_acquire failed: %s.\n", + progname, fname, strerror(errno)); goto close_fd; } @@ -6325,185 +8618,197 @@ int lfs_mirror_resync_file(const char *fname, struct ll_ioc_lease *ioc, fprintf(stderr, "%s: '%s' llapi_layout_get_by_fd failed: %s.\n", progname, fname, strerror(errno)); rc = -errno; + llapi_lease_release(fd); goto close_fd; } rc = llapi_layout_flags_get(layout, &flr_state); - if (rc) { + if (rc < 0) { fprintf(stderr, "%s: '%s' llapi_layout_flags_get failed: %s.\n", progname, fname, strerror(errno)); rc = -errno; - goto close_fd; + goto free_layout; } flr_state &= LCM_FL_FLR_MASK; switch (flr_state) { - case LCM_FL_NOT_FLR: + case LCM_FL_NONE: rc = -EINVAL; - case LCM_FL_RDONLY: fprintf(stderr, "%s: '%s' file state error: %s.\n", - progname, fname, lcm_flags_string(flr_state)); - goto close_fd; + progname, fname, llapi_layout_flags_string(flr_state)); + goto free_layout; default: break; } - /* get stale component info */ - comp_size = llapi_mirror_find_stale(layout, comp_array, - ARRAY_SIZE(comp_array), - mirror_ids, ids_nr); - if (comp_size < 0) { - rc = comp_size; - goto close_fd; + /* find out mirror chunks to be verified */ + chunk_count = lfs_mirror_prepare_chunk(layout, chunks_array, + ARRAY_SIZE(chunks_array)); + if (chunk_count < 0) { + rc = chunk_count; + goto free_layout; } - idx = 0; - while (idx < comp_size) { - ssize_t result; - uint64_t end; - __u16 mirror_id; - int i; - - rc = llapi_lease_check(fd); - if (rc != LL_LEASE_WRLCK) { - fprintf(stderr, "%s: '%s' lost lease lock.\n", - progname, fname); - goto close_fd; - } + if (ids_nr > 0) + /* filter specified mirror ids */ + filter_mirror_id(chunks_array, chunk_count, mirror_ids, ids_nr); - mirror_id = comp_array[idx].lrc_mirror_id; - end = comp_array[idx].lrc_end; + if (verbose > 2) + print_chunks(fname, chunks_array, chunk_count); - /* try to combine adjacent component */ - for (i = idx + 1; i < comp_size; i++) { - if (mirror_id != comp_array[i].lrc_mirror_id || - end != comp_array[i].lrc_start) - break; - end = comp_array[i].lrc_end; + for (idx = 0; idx < chunk_count; idx++) { + if (chunks_array[idx].chunk.e_start >= stbuf.st_size) { + if (verbose) + fprintf(stdout, + "%s: '%s' chunk "DEXT" exceeds file size %#llx: skipped\n", + progname, fname, + PEXT(&chunks_array[idx].chunk), + (unsigned long long)stbuf.st_size); + break; } - result = llapi_mirror_resync_one(fd, layout, mirror_id, - comp_array[idx].lrc_start, - end); - if (result < 0) { - fprintf(stderr, "%s: '%s' llapi_mirror_resync_one: " - "%ld.\n", progname, fname, result); - rc = result; - goto close_fd; - } else if (result > 0) { - int j; + if (chunks_array[idx].mirror_count == 0) { + fprintf(stderr, + "%s: '%s' chunk "DEXT" is invalid in all of the mirrors: ", + progname, fname, + PEXT(&chunks_array[idx].chunk)); + if (verbose) { + fprintf(stderr, "skipped\n"); + continue; + } + rc = -EINVAL; + fprintf(stderr, "failed\n"); + goto free_layout; + } - /* mark synced components */ - for (j = idx; j < i; j++) - comp_array[j].lrc_synced = true; + if (chunks_array[idx].mirror_count == 1) { + if (verbose) + fprintf(stdout, + "%s: '%s' chunk "DEXT" is only valid in mirror %u: skipped\n", + progname, fname, + PEXT(&chunks_array[idx].chunk), + chunks_array[idx].mirror_id[0]); + continue; } - idx = i; - } + rc = llapi_lease_check(fd); + if (rc != LL_LEASE_RDLCK) { + fprintf(stderr, "%s: '%s' lost lease lock.\n", + progname, fname); + goto free_layout; + } - /* prepare ioc for lease put */ - ioc->lil_mode = LL_LEASE_UNLCK; - ioc->lil_flags = LL_LEASE_RESYNC_DONE; - ioc->lil_count = 0; - for (idx = 0; idx < comp_size; idx++) { - if (comp_array[idx].lrc_synced) { - ioc->lil_ids[ioc->lil_count] = comp_array[idx].lrc_id; - ioc->lil_count++; + /* verify one chunk */ + rc1 = lfs_mirror_verify_chunk(fd, stbuf.st_size, + &chunks_array[idx], verbose); + if (rc1 < 0) { + rc2 = rc1; + if (!verbose) { + rc = rc1; + goto free_layout; + } } } - llapi_layout_free(layout); - - rc = llapi_lease_get_ext(fd, ioc); - if (rc <= 0) { - if (rc == 0) /* lost lease lock */ - rc = -EBUSY; - fprintf(stderr, "%s: resync file '%s' failed: %s.\n", - progname, fname, strerror(errno)); - goto close_fd; - } - /** - * llapi_lease_get_ext returns lease mode when it request to unlock - * the lease lock - */ - rc = 0; + if (rc2 < 0) + rc = rc2; +free_layout: + llapi_layout_free(layout); + llapi_lease_release(fd); close_fd: close(fd); error: return rc; } -static inline int lfs_mirror_resync(int argc, char **argv) +/** + * lfs_mirror_verify() - Parse and execute lfs mirror verify command. + * @argc: The count of lfs mirror verify command line arguments. + * @argv: Array of strings for lfs mirror verify command line arguments. + * + * This function parses lfs mirror verify command and verifies the + * specified mirrored file(s). + * + * Return: 0 on success or a negative error code on failure. + */ +static inline int lfs_mirror_verify(int argc, char **argv) { - struct ll_ioc_lease *ioc = NULL; - __u16 mirror_ids[128] = { 0 }; + __u16 mirror_ids[LUSTRE_MIRROR_COUNT_MAX] = { 0 }; int ids_nr = 0; int c; + int verbose = 0; int rc = 0; + int rc1 = 0; + char cmd[PATH_MAX]; struct option long_opts[] = { { .val = 'o', .name = "only", .has_arg = required_argument }, + { .val = 'v', .name = "verbose", .has_arg = no_argument }, { .name = NULL } }; - while ((c = getopt_long(argc, argv, "o:", long_opts, NULL)) >= 0) { + snprintf(cmd, sizeof(cmd), "%s %s", progname, argv[0]); + progname = cmd; + while ((c = getopt_long(argc, argv, "o:v", long_opts, NULL)) >= 0) { switch (c) { case 'o': rc = parse_mirror_ids(mirror_ids, - sizeof(mirror_ids) / sizeof(__u16), - optarg); + ARRAY_SIZE(mirror_ids), + optarg); if (rc < 0) { fprintf(stderr, "%s: bad mirror ids '%s'.\n", - argv[0], optarg); + progname, optarg); goto error; } ids_nr = rc; + if (ids_nr < 2) { + fprintf(stderr, + "%s: at least 2 mirror ids needed with '--only' option.\n", + progname); + rc = CMD_HELP; + goto error; + } + break; + case 'v': + verbose++; break; default: fprintf(stderr, "%s: options '%s' unrecognized.\n", - argv[0], argv[optind - 1]); + progname, argv[optind - 1]); rc = -EINVAL; goto error; } } if (argc == optind) { - fprintf(stderr, "%s: no file name given.\n", argv[0]); + fprintf(stderr, "%s: no file name given.\n", progname); rc = CMD_HELP; goto error; } if (ids_nr > 0 && argc > optind + 1) { - fprintf(stderr, "%s: option '--only' cannot be used upon " - "multiple files.\n", argv[0]); + fprintf(stderr, + "%s: '--only' cannot be used upon multiple files.\n", + progname); rc = CMD_HELP; goto error; } - /* set the lease on the file */ - ioc = calloc(sizeof(*ioc) + sizeof(__u32) * 4096, 1); - if (ioc == NULL) { - fprintf(stderr, "%s: cannot alloc id array for ioc: %s.\n", - argv[0], strerror(errno)); - rc = -errno; - goto error; + if (ids_nr > 0) { + rc = verify_mirror_ids(argv[optind], mirror_ids, ids_nr); + if (rc < 0) + goto error; } + rc = 0; for (; optind < argc; optind++) { - rc = lfs_mirror_resync_file(argv[optind], ioc, - mirror_ids, ids_nr); - if (rc) - fprintf(stderr, "%s: resync file '%s' failed: %d\n", - argv[0], argv[optind], rc); - /* ignore previous file's error, continue with next file */ - - /* reset ioc */ - memset(ioc, 0, sizeof(__u32) * 4096); + rc1 = lfs_mirror_verify_file(argv[optind], mirror_ids, ids_nr, + verbose); + if (rc1 < 0) + rc = rc1; } - - free(ioc); error: return rc; } @@ -6538,6 +8843,93 @@ static int lfs_mirror(int argc, char **argv) return rc < 0 ? -rc : rc; } +static void lustre_som_swab(struct lustre_som_attrs *attrs) +{ +#if __BYTE_ORDER == __BIG_ENDIAN + __swab16s(&attrs->lsa_valid); + __swab64s(&attrs->lsa_size); + __swab64s(&attrs->lsa_blocks); +#endif +} + +enum lfs_som_type { + LFS_SOM_SIZE = 0x1, + LFS_SOM_BLOCKS = 0x2, + LFS_SOM_FLAGS = 0x4, + LFS_SOM_ATTR_ALL = LFS_SOM_SIZE | LFS_SOM_BLOCKS | + LFS_SOM_FLAGS, +}; + +static int lfs_getsom(int argc, char **argv) +{ + const char *path; + struct lustre_som_attrs *attrs; + char buf[sizeof(*attrs) + 64]; + enum lfs_som_type type = LFS_SOM_ATTR_ALL; + int rc = 0, c; + + while ((c = getopt(argc, argv, "sbf")) != -1) { + switch (c) { + case 's': + type = LFS_SOM_SIZE; + break; + case 'b': + type = LFS_SOM_BLOCKS; + break; + case 'f': + type = LFS_SOM_FLAGS; + break; + default: + fprintf(stderr, "%s: invalid option '%c'\n", + progname, optopt); + return CMD_HELP; + } + } + + argc -= optind; + argv += optind; + + if (argc != 1) { + fprintf(stderr, "%s: %s\n", + progname, argc == 0 ? "miss file target" : + "input more than 2 files"); + return CMD_HELP; + } + + path = argv[0]; + attrs = (void *)buf; + rc = lgetxattr(path, "trusted.som", attrs, sizeof(buf)); + if (rc < 0) { + fprintf(stderr, "%s failed to get som xattr: %s\n", argv[0], + strerror(-rc)); + return rc; + } + + lustre_som_swab(attrs); + + switch (type) { + case LFS_SOM_ATTR_ALL: + printf("file: %s size: %llu blocks: %llu flags: %x\n", + path, attrs->lsa_size, attrs->lsa_blocks, + attrs->lsa_valid); + break; + case LFS_SOM_SIZE: + printf("%llu\n", attrs->lsa_size); + break; + case LFS_SOM_BLOCKS: + printf("%llu\n", attrs->lsa_blocks); + break; + case LFS_SOM_FLAGS: + printf("%x\n", attrs->lsa_valid); + break; + default: + fprintf(stderr, "%s: unknown option\n", progname); + return CMD_HELP; + } + + return rc; +} + /** * lfs_mirror_list_commands() - List lfs mirror commands. * @argc: The count of command line arguments. @@ -6571,7 +8963,7 @@ int main(int argc, char **argv) int rc; /* Ensure that liblustreapi constructor has run */ - if (!liblustreapi_initialized) + if (!llapi_liblustreapi_initialized()) fprintf(stderr, "liblustreapi was not properly initialized\n"); setlinebuf(stdout); @@ -6579,11 +8971,14 @@ int main(int argc, char **argv) Parser_init("lfs > ", cmdlist); - progname = argv[0]; /* Used in error messages */ - if (argc > 1) + progname = program_invocation_short_name; /* Used in error messages */ + if (argc > 1) { + llapi_set_command_name(argv[1]); rc = Parser_execarg(argc - 1, argv + 1, cmdlist); - else + llapi_clear_command_name(); + } else { rc = Parser_commands(); + } return rc < 0 ? -rc : rc; }