X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre%2Futils%2Flfs.c;h=701868ae0ffc2b606fd7d592111803325c26a977;hp=622543732d60e463bb3723fb60f1b69cd2e7771e;hb=68635c3d9b3113621b93fd989f1a3f8f064385b9;hpb=757403191c37db75ed35b02c971846dced5d5119;ds=sidebyside diff --git a/lustre/utils/lfs.c b/lustre/utils/lfs.c index 6225437..701868a 100644 --- a/lustre/utils/lfs.c +++ b/lustre/utils/lfs.c @@ -98,8 +98,6 @@ 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); -static int lfs_ls(int argc, char **argv); static int lfs_poollist(int argc, char **argv); static int lfs_changelog(int argc, char **argv); static int lfs_changelog_clear(int argc, char **argv); @@ -119,6 +117,8 @@ 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_heat_get(int argc, char **argv); +static int lfs_heat_set(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); @@ -126,6 +126,7 @@ static inline int lfs_mirror_resync(int argc, char **argv); static inline int lfs_mirror_verify(int argc, char **argv); static inline int lfs_mirror_read(int argc, char **argv); static inline int lfs_mirror_write(int argc, char **argv); +static inline int lfs_mirror_copy(int argc, char **argv); enum setstripe_origin { SO_SETSTRIPE, @@ -163,6 +164,7 @@ static inline int lfs_mirror_split(int argc, char **argv) #define SSM_CMD_COMMON(cmd) \ "usage: "cmd" [--component-end|-E ]\n" \ " [--stripe-count|-c ]\n" \ + " [--overstripe-count|-C ]\n" \ " [--stripe-index|-i ]\n" \ " [--stripe-size|-S ]\n" \ " [--layout|-L ]\n" \ @@ -173,6 +175,9 @@ static inline int lfs_mirror_split(int argc, char **argv) #define SSM_HELP_COMMON \ "\tstripe_count: Number of OSTs to stripe over (0=fs default, -1 all)\n" \ + "\t Using -C instead of -c allows overstriping, which\n" \ + "\t will place more than one stripe per OST if\n" \ + "\t stripe_count is greater than the number of OSTs\n" \ "\tstart_ost_idx: OST index of first stripe (-1=default round robin)\n"\ "\tstripe_size: Number of bytes on each OST (0=fs default)\n" \ "\t Can be specified with K, M or G (for KB, MB, GB\n" \ @@ -234,28 +239,34 @@ static inline int lfs_mirror_split(int argc, char **argv) #define MIGRATE_USAGE \ SSM_CMD_COMMON("migrate ") \ - " [--block|-b]\n" \ - " [--non-block|-n]\n" \ - " [--non-direct|-D]\n" \ + " [--block|-b] [--non-block|-n]\n" \ + " [--non-direct|-D] [--verbose|-v]\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" \ + "\tnon-direct: Do not use direct I/O to copy file contents\n" \ + "\tverbose: Print each filename as it is migrated\n" \ #define SETDIRSTRIPE_USAGE \ " [--mdt-count|-c stripe_count>\n" \ - " [--mdt-index|-i mdt_index[,mdt_index,...]\n" \ " [--mdt-hash|-H mdt_hash]\n" \ - " [--default|-D] [--mode|-m mode] \n" \ + " [--mdt-index|-i mdt_index[,mdt_index,...]\n" \ + " [--default|-D] [--mode|-o mode] \n" \ "\tstripe_count: stripe count of the striped directory\n" \ "\tmdt_index: MDT index of first stripe\n" \ "\tmdt_hash: hash type of the striped directory. mdt types:\n" \ " fnv_1a_64 FNV-1a hash algorithm (default)\n" \ " all_char sum of characters % MDT_COUNT (not recommended)\n" \ + " space create subdirectories with balanced space usage\n" \ "\tdefault_stripe: set default dirstripe of the directory\n" \ - "\tmode: the mode of the directory\n" + "\tmode: the file access permission of the directory (octal)\n" \ + "To create dir with a foreign (free format) layout :\n" \ + "setdirstripe|mkdir --foreign[=] -x|-xattr " \ + "[--mode|-m mode] [--flags ] \n" \ + "\tmode: the mode of the directory\n" \ + "\tforeign_type: none or daos\n" /** * command_t mirror_cmdlist - lfs mirror commands. @@ -293,6 +304,10 @@ command_t mirror_cmdlist[] = { .pc_help = "Write to a specified mirror of a file.\n" "usage: lfs mirror write <--mirror-id|-N " "[--inputfile|-i ] \n" }, + { .pc_name = "copy", .pc_func = lfs_mirror_copy, + .pc_help = "Copy a specified mirror to other mirror(s) of a file.\n" + "usage: lfs mirror copy <--read-mirror|-i > " + "<--write-mirror|-o > \n" }, { .pc_name = "resync", .pc_func = lfs_mirror_resync, .pc_help = "Resynchronizes out-of-sync mirrored file(s).\n" "usage: lfs mirror resync [--only ] " @@ -316,6 +331,7 @@ command_t cmdlist[] = { "To create a file with specified striping/composite layout, or\n" "create/replace the default layout on an existing directory:\n" SSM_CMD_COMMON("setstripe") + " [--mode ]\n" " \n" " or\n" "To add component(s) to an existing composite file:\n" @@ -335,7 +351,11 @@ command_t cmdlist[] = { "\tcomp_id: Unique component ID to delete\n" "\tcomp_flags: 'init' indicating all instantiated components\n" "\t '^init' indicating all uninstantiated components\n" - "\t-I and -F cannot be specified at the same time\n"}, + "\t-I and -F cannot be specified at the same time\n" + "To create a file with a foreign (free format) layout:\n" + "usage: setstripe --foreign[=]\n" + " --xattr|-x [--flags ]\n" + " [--mode ] \n"}, {"getstripe", lfs_getstripe, 0, "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" @@ -363,7 +383,7 @@ command_t cmdlist[] = { "usage: getdirstripe [--mdt-count|-c] [--mdt-index|-m|-i]\n" " [--mdt-hash|-H] [--obd|-O ]\n" " [--recursive|-r] [--yaml|-y]\n" - " [--default|-D] ..."}, + " [--verbose|-v] [--default|-D] ..."}, {"mkdir", lfs_setdirstripe, 0, "To create a striped directory on a specified MDT. This can only\n" "be done on MDT0 with the right of administrator.\n" @@ -381,9 +401,9 @@ command_t cmdlist[] = { {"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" + " [[!] --atime|-A [+-]N[smhdwy]] [[!] --ctime|-C [+-]N[smhdwy]]\n" + " [[!] --mtime|-M [+-]N[smhdwy]] [[!] --blocks|-b N]\n" + " [--maxdepth|-D N] [[!] --mdt-index|--mdt|-m ]\n" " [[!] --name|-n ] [[!] --ost|-O ]\n" " [--print|-P] [--print0|-0] [[!] --size|-s [+-]N[bkMGTPE]]\n" " [[!] --stripe-count|-c [+-]]\n" @@ -392,7 +412,9 @@ command_t cmdlist[] = { " [[!] --gid|-g|--group|-G |]\n" " [[!] --uid|-u|--user|-U |] [[!] --pool ]\n" " [[!] --projid ]\n" + " [[!] --foreign[=]]\n" " [[!] --layout|-L released,raid0,mdt]\n" + " [[!] --foreign[=]]\n" " [[!] --component-count [+-]]\n" " [[!] --component-start [+-]N[kMGTPE]]\n" " [[!] --component-end|-E [+-]N[kMGTPE]]\n" @@ -401,32 +423,33 @@ command_t cmdlist[] = { " [[!] --mirror-state <[^]state>]\n" " [[!] --mdt-count|-T [+-]]\n" " [[!] --mdt-hash|-H \n" + " [[!] --mdt-index|-m ]\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" "\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, + {"check", lfs_check, 0, "Display the status of MGTs, MDTs or OSTs (as specified in the command)\n" "or all the servers (MGTs, MDTs and OSTs).\n" "usage: check "}, - {"osts", lfs_osts, 0, "list OSTs connected to client " - "[for specified path only]\n" "usage: osts [path]"}, - {"mdts", lfs_mdts, 0, "list MDTs connected to client " - "[for specified path only]\n" "usage: mdts [path]"}, - {"df", lfs_df, 0, - "report filesystem disk space usage or inodes usage" - "of each MDS and all OSDs or a batch belonging to a specific pool .\n" - "Usage: df [-i] [-h] [--lazy|-l] [--pool|-p [.] [path]"}, - {"getname", lfs_getname, 0, "list instances and specified mount points " - "[for specified path only]\n" - "Usage: getname [-h]|[path ...] "}, + {"osts", lfs_osts, 0, "list OSTs connected to client " + "[for specified path only]\n" "usage: osts [path]"}, + {"mdts", lfs_mdts, 0, "list MDTs connected to client " + "[for specified path only]\n" "usage: mdts [path]"}, + {"df", lfs_df, 0, + "report filesystem disk space usage or inodes usage " + "of each MDS and all OSDs or a batch belonging to a specific pool.\n" + "Usage: df [-i] [-h] [--lazy|-l] [--pool|-p [.] [path]"}, + {"getname", lfs_getname, 0, + "list instances and specified mount points [for specified path only]\n" + "Usage: getname [--help|-h] [--instance|-i] [--fsname|-n] [path ...]"}, #ifdef HAVE_SYS_QUOTA_H - {"setquota", lfs_setquota, 0, "Set filesystem quotas.\n" + {"setquota", lfs_setquota, 0, "Set filesystem quotas.\n" "usage: setquota <-u|-g|-p> ||||\n" - " -b -B \n" - " -i -I \n" + " -b -B \n" + " -i -I \n" " setquota <-u|--user|-g|--group|-p|--projid> ||||\n" " [--block-softlimit ]\n" " [--block-hardlimit ]\n" @@ -478,12 +501,6 @@ command_t cmdlist[] = { #endif {"flushctx", lfs_flushctx, 0, "Flush security context for current user.\n" "usage: flushctx [-k] [mountpoint...]"}, - {"cp", lfs_cp, 0, - "Remote user copy files and directories.\n" - "usage: cp [OPTION]... [-T] SOURCE DEST\n\tcp [OPTION]... SOURCE... DIRECTORY\n\tcp [OPTION]... -t DIRECTORY SOURCE..."}, - {"ls", lfs_ls, 0, - "Remote user list directory contents.\n" - "usage: ls [OPTION]... [FILE]..."}, {"changelog", lfs_changelog, 0, "Show the metadata changes on an MDT." "\nusage: changelog [startrec [endrec]]"}, @@ -541,9 +558,9 @@ command_t cmdlist[] = { "usage: swap_layouts "}, {"migrate", lfs_setstripe_migrate, 0, "migrate a directory between MDTs.\n" - "usage: migrate [--mdt|-m] \n" - " [--mdt-count|-c] \n" + "usage: migrate [--mdt-count|-c] \n" " [--mdt-hash|-H] \n" + " [--mdt-index|-m] \n" " [--verbose|-v]\n" " \n" "\tmdt: MDTs to stripe over, if only one MDT is specified\n" @@ -557,6 +574,7 @@ command_t cmdlist[] = { "layout\nto another (may be not safe with concurent writes).\n" "usage: migrate " "[--stripe-count|-c] \n" + "[--overstripe-count|-C] \n" " [--stripe-index|-i] \n" " [--stripe-size|-S] \n" " [--pool|-p] \n" @@ -566,12 +584,15 @@ command_t cmdlist[] = { " [--non-direct|-D]\n" " \n" "\tstripe_count: number of OSTs to stripe a file over\n" + "\t Using -C instead of -c allows overstriping, which\n" + "\t will place more than one stripe per OST if\n" + "\t stripe_count is greater than the number of OSTs\n" "\tstripe_ost_index: index of the first OST to stripe a file over\n" "\tstripe_size: number of bytes to store before moving to the next OST\n" "\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" + "\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"}, {"mv", lfs_mv, 0, "To move directories between MDTs. This command is deprecated, " @@ -593,12 +614,22 @@ command_t cmdlist[] = { "lfs mirror resync - resynchronize out-of-sync mirrored file(s)\n" "lfs mirror read - read a mirror content of a mirrored file\n" "lfs mirror write - write to a mirror of a mirrored file\n" + "lfs mirror copy - copy a mirror to other mirror(s) of a file\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"}, + {"heat_get", lfs_heat_get, 0, + "To get heat of files.\n" + "usage: heat_get ...\n"}, + {"heat_set", lfs_heat_set, 0, + "To set heat flags of files.\n" + "usage: heat_set [--clear|-c] [--off|-o] [--on|-O] ...\n" + "\t--clear|-c: Clear file heat for given files\n" + "\t--off|-o: Turn off file heat for given files\n" + "\t--on|-O: Turn on file heat for given files\n"}, {"help", Parser_help, 0, "help"}, {"exit", Parser_quit, 0, "quit"}, {"quit", Parser_quit, 0, "quit"}, @@ -621,13 +652,28 @@ static int check_hashtype(const char *hashtype) return 0; } +static uint32_t check_foreign_type_name(const char *foreign_type_name) +{ + uint32_t i; + + for (i = 0; i < LU_FOREIGN_TYPE_UNKNOWN; i++) { + if (lu_foreign_types[i].lft_name == NULL) + break; + if (strcmp(foreign_type_name, + lu_foreign_types[i].lft_name) == 0) + return lu_foreign_types[i].lft_type; + } + + return LU_FOREIGN_TYPE_UNKNOWN; +} static const char *error_loc = "syserror"; enum { - MIGRATION_NONBLOCK = 1 << 0, - MIGRATION_MIRROR = 1 << 1, - MIGRATION_NONDIRECT = 1 << 2, + MIGRATION_NONBLOCK = 0x0001, + MIGRATION_MIRROR = 0x0002, + MIGRATION_NONDIRECT = 0x0004, + MIGRATION_VERBOSE = 0x0008, }; static int lfs_component_create(char *fname, int open_flags, mode_t open_mode, @@ -1129,6 +1175,9 @@ out: if (rc < 0) fprintf(stderr, "error: %s: %s: %s: %s\n", progname, name, error_loc, strerror(-rc)); + else if (migration_flags & MIGRATION_VERBOSE) + printf("%s\n", name); + return rc; } @@ -1911,20 +1960,23 @@ free_layout: * 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 + * \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 + * \param[in/out] overstriping index list may contain duplicates * * \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) +static int parse_targets(__u32 *tgts, int size, int offset, char *arg, + unsigned long long *pattern) { int rc; int nr = offset; int slots = size - offset; char *ptr = NULL; + bool overstriped = false; bool end_of_loop; if (arg == NULL) @@ -1932,8 +1984,8 @@ static int parse_targets(__u32 *tgts, int size, int offset, char *arg) end_of_loop = false; while (!end_of_loop) { - int start_index; - int end_index; + int start_index = 0; + int end_index = 0; int i; char *endptr = NULL; @@ -1964,14 +2016,21 @@ static int parse_targets(__u32 *tgts, int size, int offset, char *arg) /* remove duplicate */ for (j = 0; j < offset; j++) { - if (tgts[j] == i) - break; + if (tgts[j] == i && pattern && + *pattern == LLAPI_LAYOUT_OVERSTRIPING) + overstriped = true; + else if (tgts[j] == i) + return -EINVAL; } - if (j == offset) { /* no duplicate */ + + j = offset; + + if (j == offset) { /* check complete */ tgts[nr++] = i; --slots; } } + if (slots == 0 && i < end_index) break; @@ -1983,6 +2042,9 @@ static int parse_targets(__u32 *tgts, int size, int offset, char *arg) if (!end_of_loop && ptr != NULL) *ptr = ','; + if (!overstriped && pattern) + *pattern = LLAPI_LAYOUT_DEFAULT; + return rc < 0 ? rc : nr; } @@ -2161,6 +2223,13 @@ static int comp_args_to_layout(struct llapi_layout **composite, } /* Data-on-MDT component has always single stripe up to end */ lsa->lsa_stripe_size = lsa->lsa_comp_end; + } else if (lsa->lsa_pattern == LLAPI_LAYOUT_OVERSTRIPING) { + rc = llapi_layout_pattern_set(layout, lsa->lsa_pattern); + if (rc) { + fprintf(stderr, "Set stripe pattern %#llx failed. %s\n", + lsa->lsa_pattern, strerror(errno)); + return rc; + } } rc = llapi_layout_stripe_size_set(layout, lsa->lsa_stripe_size); @@ -2286,6 +2355,20 @@ static int build_layout_from_yaml_node(struct cYAML *node, } else if (!strcmp(string, "pattern")) { if (!strcmp(node->cy_valuestring, "mdt")) lsa->lsa_pattern = LLAPI_LAYOUT_MDT; + if (!strcmp(node->cy_valuestring, + "raid0,overstriped")) + lsa->lsa_pattern = + LLAPI_LAYOUT_OVERSTRIPING; + } else if (!strcmp(string, "lcme_flags")) { + rc = comp_str2flags(node->cy_valuestring, + &lsa->lsa_comp_flags, + &lsa->lsa_comp_neg_flags); + if (rc) + return rc; + /* Only template flags have meaning in + * the layout for a new file + */ + lsa->lsa_comp_flags &= LCME_TEMPLATE_FLAGS; } } else if (node->cy_type == CYAML_TYPE_NUMBER) { if (!strcmp(string, "lcm_mirror_count")) { @@ -2535,11 +2618,13 @@ enum { LFS_COMP_ADD_OPT, LFS_COMP_NO_VERIFY_OPT, LFS_PROJID_OPT, - LFS_MIRROR_FLAGS_OPT, + LFS_LAYOUT_FLAGS_OPT, /* used for mirror and foreign flags */ LFS_MIRROR_ID_OPT, LFS_MIRROR_STATE_OPT, LFS_LAYOUT_COPY, LFS_MIRROR_INDEX_OPT, + LFS_LAYOUT_FOREIGN_OPT, + LFS_MODE_OPT, }; /* functions */ @@ -2561,6 +2646,7 @@ static int lfs_setstripe_internal(int argc, char **argv, unsigned long long size_units = 1; bool migrate_mode = false; bool migrate_mdt_mode = false; + bool setstripe_mode = false; bool migration_block = false; __u64 migration_flags = 0; __u32 tgts[LOV_MAX_STRIPE_COUNT] = { 0 }; @@ -2581,6 +2667,12 @@ static int lfs_setstripe_internal(int argc, char **argv, bool from_yaml = false; bool from_copy = false; char *template = NULL; + bool foreign_mode = false; + char *xattr = NULL; + uint32_t type = LU_FOREIGN_TYPE_NONE, flags = 0; + char *mode_opt = NULL; + mode_t previous_umask = 0; + mode_t mode = S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH; struct option long_opts[] = { /* find { .val = '0', .name = "null", .has_arg = no_argument }, */ @@ -2607,16 +2699,21 @@ static int lfs_setstripe_internal(int argc, char **argv, .has_arg = no_argument}, { .val = LFS_COMP_NO_VERIFY_OPT, .name = "no-verify", .has_arg = no_argument}, - { .val = LFS_MIRROR_FLAGS_OPT, + { .val = LFS_LAYOUT_FLAGS_OPT, .name = "flags", .has_arg = required_argument}, + { .val = LFS_LAYOUT_FOREIGN_OPT, + .name = "foreign", .has_arg = optional_argument}, { .val = LFS_MIRROR_ID_OPT, .name = "mirror-id", .has_arg = required_argument}, + { .val = LFS_MODE_OPT, + .name = "mode", .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}, { .val = 'c', .name = "mdt-count", .has_arg = required_argument}, -/* find { .val = 'C', .name = "ctime", .has_arg = required_argument }*/ + { .val = 'C', .name = "overstripe-count", + .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 */ @@ -2659,6 +2756,7 @@ static int lfs_setstripe_internal(int argc, char **argv, /* 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 = 'x', .name = "xattr", .has_arg = required_argument }, { .val = 'y', .name = "yaml", .has_arg = required_argument }, { .name = NULL } }; @@ -2666,12 +2764,13 @@ static int lfs_setstripe_internal(int argc, char **argv, migrate_mode = (opc == SO_MIGRATE); mirror_mode = (opc == SO_MIRROR_CREATE || opc == SO_MIRROR_EXTEND); + setstripe_mode = (opc == SO_SETSTRIPE); snprintf(cmd, sizeof(cmd), "%s %s", progname, argv[0]); progname = cmd; while ((c = getopt_long(argc, argv, - "bc:dDE:f:H:i:I:m:N::no:p:L:s:S:vy:", long_opts, - NULL)) >= 0) { + "bc:C:dDE:f:H:i:I:m:N::no:p:L:s:S:vx:y:", + long_opts, NULL)) >= 0) { switch (c) { case 0: /* Long options. */ @@ -2716,8 +2815,20 @@ static int lfs_setstripe_internal(int argc, char **argv, goto usage_error; } break; - case LFS_MIRROR_FLAGS_OPT: { - __u32 flags; + case LFS_LAYOUT_FLAGS_OPT: { + uint32_t neg_flags; + + /* check for numeric flags (foreign and mirror cases) */ + if (setstripe_mode && !mirror_mode && !last_mirror) { + flags = strtoul(optarg, &end, 16); + if (*end != '\0') { + fprintf(stderr, + "%s %s: bad flags '%s'\n", + progname, argv[0], optarg); + return CMD_HELP; + } + break; + } if (!mirror_mode || !last_mirror) { fprintf(stderr, "error: %s: --flags must be specified with --mirror-count|-N option\n", @@ -2726,11 +2837,11 @@ static int lfs_setstripe_internal(int argc, char **argv, } result = comp_str2flags(optarg, &last_mirror->m_flags, - &flags); + &neg_flags); if (result != 0) goto usage_error; - if (flags) { + if (neg_flags) { fprintf(stderr, "%s: inverted flags are not supported\n", progname); result = -EINVAL; @@ -2745,6 +2856,37 @@ static int lfs_setstripe_internal(int argc, char **argv, } break; } + case LFS_LAYOUT_FOREIGN_OPT: + if (optarg != NULL) { + /* check pure numeric */ + type = strtoul(optarg, &end, 0); + if (*end) { + /* check name */ + type = check_foreign_type_name(optarg); + if (type == LU_FOREIGN_TYPE_UNKNOWN) { + fprintf(stderr, + "%s %s: unrecognized foreign type '%s'\n", + progname, argv[0], + optarg); + return CMD_HELP; + } + } + } + foreign_mode = true; + break; + case LFS_MODE_OPT: + mode_opt = optarg; + 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_umask = umask(0); + } + break; case LFS_LAYOUT_COPY: from_copy = true; template = optarg; @@ -2758,6 +2900,9 @@ static int lfs_setstripe_internal(int argc, char **argv, } migration_block = true; break; + case 'C': + lsa.lsa_pattern = LLAPI_LAYOUT_OVERSTRIPING; + /* fall through */ case 'c': lsa.lsa_stripe_count = strtoul(optarg, &end, 0); if (*end != '\0') { @@ -2906,14 +3051,14 @@ static int lfs_setstripe_internal(int argc, char **argv, case 'm': if (!migrate_mode) { fprintf(stderr, - "%s %s: -m|--mdt is valid only for migrate command\n", + "%s %s: -m|--mdt-index is valid only for migrate command\n", progname, argv[0]); goto usage_error; } migrate_mdt_mode = true; lsa.lsa_nr_tgts = parse_targets(tgts, sizeof(tgts) / sizeof(__u32), - lsa.lsa_nr_tgts, optarg); + lsa.lsa_nr_tgts, optarg, NULL); if (lsa.lsa_nr_tgts < 0) { fprintf(stderr, "%s %s: invalid MDT target(s) '%s'\n", @@ -2982,9 +3127,15 @@ static int lfs_setstripe_internal(int argc, char **argv, fprintf(stderr, "warning: '--ost-list' is " "deprecated, use '--ost' instead\n"); #endif + /* -o allows overstriping, and must note it because + * parse_targets is shared with MDT striping, which + * does not allow duplicates + */ + lsa.lsa_pattern = LLAPI_LAYOUT_OVERSTRIPING; lsa.lsa_nr_tgts = parse_targets(tgts, sizeof(tgts) / sizeof(__u32), - lsa.lsa_nr_tgts, optarg); + lsa.lsa_nr_tgts, optarg, + &lsa.lsa_pattern); if (lsa.lsa_nr_tgts < 0) { fprintf(stderr, "%s %s: invalid OST target(s) '%s'\n", @@ -3024,6 +3175,10 @@ static int lfs_setstripe_internal(int argc, char **argv, goto usage_error; } migrate_mdt_param.fp_verbose = VERBOSE_DETAIL; + migration_flags = MIGRATION_VERBOSE; + break; + case 'x': + xattr = optarg; break; case 'y': from_yaml = true; @@ -3044,6 +3199,29 @@ static int lfs_setstripe_internal(int argc, char **argv, goto usage_error; } + if (xattr && !foreign_mode) { + /* only print a warning as this is harmless and will be ignored + */ + fprintf(stderr, + "%s %s: xattr has been specified for non-foreign layout\n", + progname, argv[0]); + } else if (foreign_mode && !xattr) { + fprintf(stderr, + "%s %s: xattr must be provided in foreign mode\n", + progname, argv[0]); + goto usage_error; + } + + if (foreign_mode && (!setstripe_mode || comp_add | comp_del || + comp_set || comp_id || delete || from_copy || + setstripe_args_specified(&lsa) || lsa.lsa_nr_tgts || + lsa.lsa_tgts)) { + fprintf(stderr, + "%s %s: only --xattr/--flags/--mode options are valid with --foreign\n", + progname, argv[0]); + return CMD_HELP; + } + if (mirror_mode && mirror_count == 0) { fprintf(stderr, "error: %s: --mirror-count|-N option is required\n", @@ -3211,7 +3389,7 @@ static int lfs_setstripe_internal(int argc, char **argv, lmu->lum_hash_type = LMV_HASH_TYPE_FNV_1A_64; if (lsa.lsa_pool_name) strncpy(lmu->lum_pool_name, lsa.lsa_pool_name, - sizeof(lmu->lum_pool_name)); + sizeof(lmu->lum_pool_name) - 1); if (lsa.lsa_nr_tgts > 1) { int i; @@ -3260,6 +3438,14 @@ static int lfs_setstripe_internal(int argc, char **argv, param->lsp_stripe_offset = -1; else param->lsp_stripe_offset = lsa.lsa_stripe_off; + param->lsp_stripe_pattern = + llapi_pattern_to_lov(lsa.lsa_pattern); + if (param->lsp_stripe_pattern == EINVAL) { + fprintf(stderr, "error: %s: invalid stripe pattern\n", + argv[0]); + free(param); + goto usage_error; + } param->lsp_pool = lsa.lsa_pool_name; param->lsp_is_specific = false; if (lsa.lsa_nr_tgts > 0) { @@ -3339,7 +3525,14 @@ static int lfs_setstripe_internal(int argc, char **argv, NULL); } else if (layout != NULL) { result = lfs_component_create(fname, O_CREAT | O_WRONLY, - 0666, layout); + mode, layout); + if (result >= 0) { + close(result); + result = 0; + } + } else if (foreign_mode) { + result = llapi_file_create_foreign(fname, mode, type, + flags, xattr); if (result >= 0) { close(result); result = 0; @@ -3347,7 +3540,7 @@ static int lfs_setstripe_internal(int argc, char **argv, } else { result = llapi_file_open_param(fname, O_CREAT | O_WRONLY, - 0666, param); + mode, param); if (result >= 0) { close(result); result = 0; @@ -3361,6 +3554,9 @@ static int lfs_setstripe_internal(int argc, char **argv, } } + if (mode_opt != NULL) + umask(previous_umask); + free(param); free(migrate_mdt_param.fp_lmv_md); llapi_layout_free(layout); @@ -3382,11 +3578,13 @@ static int lfs_poollist(int argc, char **argv) return llapi_poollist(argv[1]); } -static int set_time(time_t *time, time_t *set, char *str) +static time_t set_time(struct find_param *param, time_t *time, time_t *set, + char *str) { - time_t t; + long long t = 0; int res = 0; - char *endptr; + char *endptr = "AD"; + char *timebuf; if (str[0] == '+') res = 1; @@ -3396,23 +3594,48 @@ static int set_time(time_t *time, time_t *set, char *str) if (res) str++; - t = strtol(str, &endptr, 0); - if (*endptr != '\0') { - fprintf(stderr, - "%s find: bad time '%s': %s\n", - progname, str, strerror(EINVAL)); - return INT_MAX; + for (timebuf = str; *endptr && *(endptr + 1); timebuf = endptr + 1) { + long long val = strtoll(timebuf, &endptr, 0); + int unit = 1; + + switch (*endptr) { + case 'y': + unit *= 52; /* 52 weeks + 1 day below */ + case 'w': /* fallthrough */ + unit *= 7; + case '\0': /* days are default unit if none used */ + case 'd': /* fallthrough */ + unit = (unit + (*endptr == 'y')) * 24; + case 'h': /* fallthrough */ + unit *= 60; + case 'm': /* fallthrough */ + unit *= 60; + case 's': /* fallthrough */ + break; + /* don't need to multiply by 1 for seconds */ + default: + fprintf(stderr, + "%s find: bad time string '%s': %s\n", + progname, timebuf, strerror(EINVAL)); + return LONG_MAX; + } + + if (param->fp_time_margin == 0 || + (*endptr && unit < param->fp_time_margin)) + param->fp_time_margin = unit; + + t += val * unit; } - if (*time < t * 24 * 60 * 60) { + if (*time < t) { if (res != 0) str--; - fprintf(stderr, - "%s find: bad time '%s': too large\n", + fprintf(stderr, "%s find: bad time '%s': too large\n", progname, str); - return INT_MAX; + return LONG_MAX; } - *set = *time - t * 24 * 60 * 60; + *set = *time - t; + return res; } @@ -3484,6 +3707,8 @@ static int name2layout(__u32 *layout, char *name) *layout |= LOV_PATTERN_RAID0; else if (strcmp(layout_name, "mdt") == 0) *layout |= LOV_PATTERN_MDT; + else if (strcmp(layout_name, "overstriping") == 0) + *layout |= LOV_PATTERN_OVERSTRIPING; else return -1; } @@ -3498,6 +3723,7 @@ static int lfs_find(int argc, char **argv) struct find_param param = { .fp_max_depth = -1, .fp_quiet = 1, + .fp_time_margin = 24 * 60 * 60, }; struct option long_opts[] = { { .val = 'A', .name = "atime", .has_arg = required_argument }, @@ -3519,6 +3745,8 @@ static int lfs_find(int argc, char **argv) .has_arg = required_argument }, { .val = LFS_MIRROR_STATE_OPT, .name = "mirror-state", .has_arg = required_argument }, + { .val = LFS_LAYOUT_FOREIGN_OPT, + .name = "foreign", .has_arg = optional_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 }, @@ -3528,6 +3756,8 @@ static int lfs_find(int argc, char **argv) { .val = 'E', .name = "component-end", .has_arg = required_argument }, /* find { .val = 'F', .name = "fid", .has_arg = no_argument }, */ + { .val = LFS_LAYOUT_FOREIGN_OPT, + .name = "foreign", .has_arg = optional_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 }, @@ -3630,8 +3860,8 @@ static int lfs_find(int argc, char **argv) xsign = ¶m.fp_msign; param.fp_exclude_mtime = !!neg_opt; } - rc = set_time(&t, xtime, optarg); - if (rc == INT_MAX) { + rc = set_time(¶m, &t, xtime, optarg); + if (rc == LONG_MAX) { ret = -1; goto err; } @@ -3775,6 +4005,30 @@ static int lfs_find(int argc, char **argv) param.fp_check_comp_end = 1; param.fp_exclude_comp_end = !!neg_opt; break; + case LFS_LAYOUT_FOREIGN_OPT: { + /* all types by default */ + uint32_t type = LU_FOREIGN_TYPE_UNKNOWN; + + if (optarg != NULL) { + /* check pure numeric */ + type = strtoul(optarg, &endptr, 0); + if (*endptr) { + /* check name */ + type = check_foreign_type_name(optarg); + if (type == LU_FOREIGN_TYPE_UNKNOWN) { + fprintf(stderr, + "%s %s: unknown foreign type '%s'\n", + progname, argv[0], + optarg); + return CMD_HELP; + } + } + } + param.fp_foreign_type = type; + param.fp_check_foreign = 1; + param.fp_exclude_foreign = !!neg_opt; + break; + } case 'g': case 'G': rc = name2gid(¶m.fp_gid, optarg); @@ -4514,6 +4768,7 @@ static int lfs_getdirstripe(int argc, char **argv) { .val = 'O', .name = "obd", .has_arg = required_argument }, { .val = 'r', .name = "recursive", .has_arg = no_argument }, { .val = 'T', .name = "mdt-count", .has_arg = no_argument }, + { .val = 'v', .name = "verbose", .has_arg = no_argument }, { .val = 'y', .name = "yaml", .has_arg = no_argument }, { .name = NULL } }; int c, rc; @@ -4521,7 +4776,7 @@ static int lfs_getdirstripe(int argc, char **argv) param.fp_get_lmv = 1; while ((c = getopt_long(argc, argv, - "cDHimO:rtTy", long_opts, NULL)) != -1) + "cDHimO:rtTvy", long_opts, NULL)) != -1) { switch (c) { case 'c': @@ -4555,10 +4810,15 @@ static int lfs_getdirstripe(int argc, char **argv) case 'r': param.fp_recursive = 1; break; + case 'v': + param.fp_verbose |= VERBOSE_DETAIL; + break; case 'y': param.fp_yaml = 1; break; default: + fprintf(stderr, "%s %s: unrecognized option '%s'\n", + progname, argv[0], argv[optind - 1]); return CMD_HELP; } } @@ -4624,6 +4884,30 @@ static inline int obd_statfs_ratio(const struct obd_statfs *st, bool inodes) return (ratio - (int)ratio) > 0 ? (int)(ratio + 1) : (int)ratio; } +/* This is only used to reflect various problem states for lfs df, so we only + * translate the flags reflecting those states. + */ +static char obd_statfs_state_names[] = { + [OS_STATE_DEGRADED] = 'D', + [OS_STATE_READONLY] = 'R', + [OS_STATE_NOPRECREATE] = 'N', + [OS_STATE_ENOSPC] = 'S', + [OS_STATE_ENOINO] = 'I', +}; + +static char obd_statfs_state2char(int s) +{ + /* Not an error state, do not print here */ + if (s == OS_STATE_NONROT) + return '\0'; + /* Unknown name */ + if (s > ARRAY_SIZE(obd_statfs_state_names)/sizeof(char) || + obd_statfs_state_names[s] == 0) + return '?'; + + return obd_statfs_state_names[s]; +} + static int showdf(char *mntdir, struct obd_statfs *stat, char *uuid, enum mntdf_flags flags, char *type, int index, int rc) @@ -4697,21 +4981,16 @@ static int showdf(char *mntdir, struct obd_statfs *stat, printf("[%s:%d]", type, index); if (stat->os_state) { - /* - * Each character represents the matching - * OS_STATE_* bit. - */ - const char state_names[] = "DRSI"; - __u32 state; - __u32 i; + uint32_t state; + uint32_t i; printf(" "); - for (i = 0, state = stat->os_state; - state && i < sizeof(state_names); i++) { - if (!(state & (1 << i))) + for (i = 0, state = stat->os_state; state != 0; i++) { + uint32_t mask = 1 << i; + if (!(state & mask)) continue; - printf("%c", state_names[i]); - state ^= 1 << i; + printf("%c", obd_statfs_state2char(mask)); + state &= ~mask; } } @@ -4756,6 +5035,7 @@ static int mntdf(char *mntdir, char *fsname, char *pool, enum mntdf_flags flags, { .st_op = LL_STATFS_LOV, .st_name = "OST" }, { .st_name = NULL } }; struct ll_stat_type *tp; + __u64 ost_files = 0; __u64 ost_ffree = 0; __u32 index; __u32 type; @@ -4863,6 +5143,7 @@ static int mntdf(char *mntdir, char *fsname, char *pool, enum mntdf_flags flags, sum.os_ffree += stat_buf.os_ffree; sum.os_files += stat_buf.os_files; } else /* if (tp->st_op == LL_STATFS_LOV) */ { + ost_files += stat_buf.os_files; ost_ffree += stat_buf.os_ffree; } sum.os_blocks += stat_buf.os_blocks * @@ -4876,11 +5157,12 @@ static int mntdf(char *mntdir, char *fsname, char *pool, enum mntdf_flags flags, close(fd); - /* If we don't have as many objects free on the OST as inodes - * on the MDS, we reduce the total number of inodes to - * compensate, so that the "inodes in use" number is correct. - * Matches ll_statfs_internal() so the results are consistent. */ - if (ost_ffree < sum.os_ffree) { + /* If we have _some_ OSTs, but don't have as many free objects on the + * OST as inodes on the MDTs, reduce the reported number of inodes + * to compensate, so that the "inodes in use" number is correct. + * This should be kept in sync with ll_statfs_internal(). + */ + if (ost_files && ost_ffree < sum.os_ffree) { sum.os_files = (sum.os_files - sum.os_ffree) + ost_ffree; sum.os_ffree = ost_ffree; } @@ -4918,30 +5200,41 @@ static int ll_statfs_data_comp(const void *sd1, const void *sd2) /* 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; - + char *dname; + 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; + bool delete = false; + bool auto_distributed = false; + bool foreign_mode = false; + mode_t mode = S_IRWXU | S_IRWXG | S_IRWXO; + mode_t previous_mode = 0; + struct ll_statfs_buf *lsb = NULL; + char mntdir[PATH_MAX] = ""; + char *xattr = NULL; + __u32 type = LU_FOREIGN_TYPE_DAOS, flags = 0; 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 = LFS_LAYOUT_FLAGS_OPT, + .name = "flags", .has_arg = required_argument }, + { .val = LFS_LAYOUT_FOREIGN_OPT, + .name = "foreign", .has_arg = optional_argument}, { .val = 'H', .name = "mdt-hash", .has_arg = required_argument }, +#if LUSTRE_VERSION_CODE < OBD_OCD_VERSION(2, 17, 53, 0) { .val = 'i', .name = "mdt-index", .has_arg = required_argument }, + { .val = 'i', .name = "mdt", .has_arg = required_argument }, +#else + { .val = 'm', .name = "mdt-index", .has_arg = required_argument }, + { .val = 'm', .name = "mdt", .has_arg = required_argument }, +#endif #if LUSTRE_VERSION_CODE < OBD_OCD_VERSION(3, 0, 53, 0) { .val = 'i', .name = "index", .has_arg = required_argument }, #endif @@ -4951,12 +5244,14 @@ static int lfs_setdirstripe(int argc, char **argv) #endif { .val = 'T', .name = "mdt-count", .has_arg = required_argument }, /* setstripe { .val = 'y', .name = "yaml", .has_arg = no_argument }, */ + { .val = 'x', .name = "xattr", .has_arg = required_argument }, { .name = NULL } }; + int result = 0; setstripe_args_init(&lsa); - while ((c = getopt_long(argc, argv, "c:dDi:H:m:o:t:T:", long_opts, - NULL)) >= 0) { + while ((c = getopt_long(argc, argv, "c:dDi:H:m:o:t:T:x:", + long_opts, NULL)) >= 0) { switch (c) { case 0: /* Long options. */ @@ -4978,6 +5273,33 @@ static int lfs_setdirstripe(int argc, char **argv) case 'D': default_stripe = true; break; + case LFS_LAYOUT_FOREIGN_OPT: + if (optarg != NULL) { + /* check pure numeric */ + type = strtoul(optarg, &end, 0); + if (*end) { + /* check name */ + type = check_foreign_type_name(optarg); + if (type == LU_FOREIGN_TYPE_UNKNOWN) { + fprintf(stderr, + "%s %s: unknown foreign type '%s'\n", + progname, argv[0], + optarg); + return CMD_HELP; + } + } + } + foreign_mode = true; + break; + case LFS_LAYOUT_FLAGS_OPT: + flags = strtoul(optarg, &end, 16); + if (*end != '\0') { + fprintf(stderr, + "%s %s: bad flags '%s'\n", + progname, argv[0], optarg); + return CMD_HELP; + } + break; #if LUSTRE_VERSION_CODE < OBD_OCD_VERSION(3, 0, 53, 0) case 't': fprintf(stderr, "warning: '--hash-type' and '-t' " @@ -4993,27 +5315,32 @@ static int lfs_setdirstripe(int argc, char **argv) } break; case 'i': +#if LUSTRE_VERSION_CODE >= OBD_OCD_VERSION(2, 17, 53, 0) + case 'm': +#endif #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_pattern = LLAPI_LAYOUT_OVERSTRIPING; lsa.lsa_nr_tgts = parse_targets(mdts, sizeof(mdts) / sizeof(__u32), - lsa.lsa_nr_tgts, optarg); + lsa.lsa_nr_tgts, optarg, NULL); 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_pattern = 0; 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) +#if LUSTRE_VERSION_CODE < OBD_OCD_VERSION(2, 15, 53, 0) case 'm': fprintf(stderr, "warning: '-m' is deprecated, " "use '--mode' or '-o' instead\n"); @@ -5021,6 +5348,9 @@ static int lfs_setdirstripe(int argc, char **argv) case 'o': mode_opt = optarg; break; + case 'x': + xattr = optarg; + break; default: fprintf(stderr, "%s %s: unrecognized option '%s'\n", progname, argv[0], argv[optind - 1]); @@ -5034,8 +5364,30 @@ static int lfs_setdirstripe(int argc, char **argv) return CMD_HELP; } + if (xattr && !foreign_mode) { + /* only print a warning as this is armless and will be + * ignored + */ + fprintf(stderr, + "%s %s: xattr has been specified for non-foreign layout\n", + progname, argv[0]); + } else if (foreign_mode && !xattr) { + fprintf(stderr, + "%s %s: xattr must be provided in foreign mode\n", + progname, argv[0]); + return CMD_HELP; + } + + if (foreign_mode && (delete || default_stripe || lsa.lsa_nr_tgts || + lsa.lsa_tgts || setstripe_args_specified(&lsa))) { + fprintf(stderr, + "%s %s: only --xattr/--flags/--mode options are valid with --foreign\n", + progname, argv[0]); + return CMD_HELP; + } + if (!delete && lsa.lsa_stripe_off == LLAPI_LAYOUT_DEFAULT && - lsa.lsa_stripe_count == LLAPI_LAYOUT_DEFAULT) { + lsa.lsa_stripe_count == LLAPI_LAYOUT_DEFAULT && !foreign_mode) { fprintf(stderr, "%s %s: stripe offset and count must be specified\n", progname, argv[0]); @@ -5062,6 +5414,25 @@ static int lfs_setdirstripe(int argc, char **argv) previous_mode = umask(0); } + /* foreign LMV/dir case */ + if (foreign_mode) { + if (argc > optind + 1) { + fprintf(stderr, + "%s %s: cannot specify multiple foreign dirs\n", + progname, argv[0]); + return CMD_HELP; + } + + dname = argv[optind]; + result = llapi_dir_create_foreign(dname, mode, type, flags, + xattr); + if (result != 0) + fprintf(stderr, + "%s mkdir: can't create foreign dir '%s': %s\n", + progname, dname, strerror(-result)); + return result; + } + /* * initialize stripe parameters, in case param is converted to specific, * i.e, 'lfs mkdir -i -1 -c N', always allocate space for lsp_tgts. @@ -5104,113 +5475,124 @@ static int lfs_setdirstripe(int argc, char **argv) memcpy(param->lsp_tgts, mdts, sizeof(*mdts) * lsa.lsa_nr_tgts); } + if (!default_stripe && lsa.lsa_pattern == LMV_HASH_TYPE_SPACE) { + fprintf(stderr, "%s %s: can only specify -H space with -D\n", + progname, argv[0]); + free(param); + return CMD_HELP; + } + 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; - } - - if (!param->lsp_is_specific && - param->lsp_stripe_offset == -1) { - char path[PATH_MAX] = ""; + if (result) + fprintf(stderr, + "%s setdirstripe: cannot set default stripe on dir '%s': %s\n", + progname, dname, strerror(-result)); + continue; + } - if (!lsb) { - lsb = malloc(sizeof(*lsb)); - if (!lsb) { - result = -ENOMEM; - break; - } - } - lsb->sb_count = 0; + /* + * 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; + } - /* 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'; + /* + * TODO: when MDT can allocate object with QoS (LU-9435), below + * code should be removed, instead we should let LMV to allocate + * the starting MDT object, and then let LOD allocate other MDT + * objects. + */ + if (!param->lsp_is_specific && param->lsp_stripe_offset == -1) { + char path[PATH_MAX] = ""; - result = llapi_search_mounts(path, 0, mntdir, - NULL); - if (result < 0 || mntdir[0] == '\0') { - fprintf(stderr, - "No suitable Lustre mount found\n"); + if (!lsb) { + lsb = malloc(sizeof(*lsb)); + if (!lsb) { + result = -ENOMEM; break; } + } + lsb->sb_count = 0; - result = mntdf(mntdir, NULL, NULL, 0, - LL_STATFS_LMV, lsb); - if (result < 0) - break; + /* 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 (param->lsp_stripe_count > lsb->sb_count) { - fprintf(stderr, - "error: stripe count %d is too big\n", - param->lsp_stripe_count); - result = -ERANGE; - break; - } + result = llapi_search_mounts(path, 0, mntdir, NULL); + if (result < 0 || mntdir[0] == '\0') { + fprintf(stderr, + "No suitable Lustre mount found\n"); + break; + } - qsort(lsb->sb_buf, lsb->sb_count, - sizeof(struct ll_statfs_data), - ll_statfs_data_comp); + result = mntdf(mntdir, NULL, NULL, 0, LL_STATFS_LMV, + lsb); + if (result < 0) + break; - auto_distributed = true; + 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; } - if (auto_distributed) { - int r; - int nr = MAX(param->lsp_stripe_count, - lsb->sb_count / 2); + qsort(lsb->sb_buf, lsb->sb_count, + sizeof(struct ll_statfs_data), + ll_statfs_data_comp); - /* don't use server whose usage is above 90% */ - while (nr != param->lsp_stripe_count && - obd_statfs_ratio(&lsb->sb_buf[nr].sd_st, - false) > 90) - nr = MAX(param->lsp_stripe_count, - nr / 2); + auto_distributed = true; + } - /* get \a r between [0, nr) */ - r = rand() % nr; + if (auto_distributed) { + int r; + int nr = MAX(param->lsp_stripe_count, + lsb->sb_count / 2); - param->lsp_stripe_offset = - lsb->sb_buf[r].sd_index; - if (param->lsp_stripe_count > 1) { - int i = 0; + /* don't use server whose usage is above 90% */ + while (nr != param->lsp_stripe_count && + obd_statfs_ratio(&lsb->sb_buf[nr].sd_st, false) > + 90) + nr = MAX(param->lsp_stripe_count, nr / 2); - param->lsp_is_specific = true; - for (; i < param->lsp_stripe_count; i++) - param->lsp_tgts[(i + r) % nr] = - lsb->sb_buf[i].sd_index; - } - } + /* 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; - result = llapi_dir_create(dname, mode, param); + param->lsp_is_specific = true; + for (; i < param->lsp_stripe_count; i++) + param->lsp_tgts[(i + r) % nr] = + lsb->sb_buf[i].sd_index; + } } - if (result) { + result = llapi_dir_create(dname, mode, param); + if (result) fprintf(stderr, - "%s setdirstripe: cannot create stripe dir '%s': %s\n", + "%s setdirstripe: cannot create dir '%s': %s\n", progname, dname, strerror(-result)); - break; - } - dname = argv[++optind]; - } while (dname != NULL); + } while (!result && (dname = argv[++optind])); if (mode_opt != NULL) umask(previous_mode); @@ -5258,6 +5640,7 @@ static int lfs_mv(int argc, char **argv) int c; int rc = 0; struct option long_opts[] = { + { .val = 'm', .name = "mdt", .has_arg = required_argument }, { .val = 'm', .name = "mdt-index", .has_arg = required_argument }, { .val = 'v', .name = "verbose", .has_arg = no_argument }, { .name = NULL } }; @@ -5379,43 +5762,104 @@ static int lfs_df(int argc, char **argv) return rc; } +static int print_instance(const char *mntdir, char *fsname, size_t fsnamelen, + bool opt_instance, bool opt_fsname, bool opt_mntdir) +{ + char *buf = fsname; + + /* llapi_search_mounts() fills "fsname", but that is not called if + * explicit paths are specified on the command-line + */ + if (opt_instance || (opt_fsname && fsname[0] == '\0')) { + int rc = llapi_getname(mntdir, fsname, fsnamelen); + + if (rc < 0) { + fprintf(stderr, "cannot get instance for '%s': %s\n", + mntdir, strerror(-rc)); + return rc; + } + buf = fsname; + if (!opt_instance) { + /* print only the fsname name */ + buf = strchr(fsname, '-'); + if (buf) + *buf = '\0'; + buf = fsname; + } else if (!opt_fsname) { + /* print only the instance name */ + buf = strchr(fsname, '-'); + if (buf) + buf++; + else + buf = fsname; + } + } else if (opt_fsname) { + /* print only the fsname */ + buf = fsname; + } + + printf("%s %s\n", buf, opt_mntdir ? mntdir : ""); + + return 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)]; + struct option long_opts[] = { + { .val = 'h', .name = "help", .has_arg = no_argument }, + { .val = 'i', .name = "instance", .has_arg = no_argument }, + { .val = 'n', .name = "fsname", .has_arg = no_argument }, + { .name = NULL} }; + bool opt_instance = false, opt_fsname = false; + char fsname[PATH_MAX] = ""; + int rc = 0, rc2, c; - while ((c = getopt(argc, argv, "h")) != -1) - return CMD_HELP; + while ((c = getopt_long(argc, argv, "hin", long_opts, NULL)) != -1) { + switch (c) { + case 'i': + opt_instance = true; + break; + case 'n': + opt_fsname = true; + break; + case 'h': + default: + 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; - } + /* If neither option is given, print both instance and fsname */ + if (!opt_instance && !opt_fsname) + opt_instance = opt_fsname = true; - printf("%s %s\n", buf, mntdir); + if (optind == argc) { /* no paths specified, get all paths. */ + char mntdir[PATH_MAX] = "", path[PATH_MAX] = ""; + int index = 0; - 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; - } + while (!llapi_search_mounts(path, index++, mntdir, fsname)) { + rc2 = print_instance(mntdir, fsname, sizeof(fsname), + opt_instance, opt_fsname, true); + if (!rc) + rc = rc2; + path[0] = fsname[0] = mntdir[0] = '\0'; + } + } else { /* paths specified, only attempt to search these. */ + bool opt_mntdir; - printf("%s %s\n", buf, argv[optind]); - } - } - return rc; + /* if only one path is given, print only requested info */ + opt_mntdir = argc - optind > 1 || (opt_instance == opt_fsname); + + for (; optind < argc; optind++) { + rc2 = print_instance(argv[optind], fsname, + sizeof(fsname), opt_instance, + opt_fsname, opt_mntdir); + if (!rc) + rc = rc2; + fsname[0] = '\0'; + } + } + + return rc; } static int lfs_check(int argc, char **argv) @@ -6654,20 +7098,6 @@ static int lfs_flushctx(int argc, char **argv) return rc; } -static int lfs_cp(int argc, char **argv) -{ - fprintf(stderr, "remote client copy file(s).\n" - "obsolete, does not support it anymore.\n"); - return 0; -} - -static int lfs_ls(int argc, char **argv) -{ - fprintf(stderr, "remote client lists directory contents.\n" - "obsolete, does not support it anymore.\n"); - return 0; -} - static int lfs_changelog(int argc, char **argv) { void *changelog_priv; @@ -7866,18 +8296,139 @@ next: 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) +static const char *const heat_names[] = LU_HEAT_NAMES; + +static int lfs_heat_get(int argc, char **argv) { - bool end_of_loop = false; - char *ptr = NULL; - int nr = 0; - int rc; + struct lu_heat *heat; + int rc = 0, rc2; + char *path; + int fd; + int i; - if (arg == NULL) - return -EINVAL; + if (argc <= 1) + return CMD_HELP; + + heat = calloc(sizeof(*heat) + sizeof(__u64) * OBD_HEAT_COUNT, 1); + if (!heat) { + fprintf(stderr, "%s: memory allocation failed\n", argv[0]); + return -ENOMEM; + } + + optind = 1; + while (optind < argc) { + path = argv[optind++]; + + fd = open(path, O_RDONLY); + if (fd < 0) { + fprintf(stderr, "%s: cannot open file '%s': %s\n", + argv[0], path, strerror(errno)); + rc2 = -errno; + goto next; + } + + heat->lh_count = OBD_HEAT_COUNT; + rc2 = llapi_heat_get(fd, heat); + close(fd); + if (rc2 < 0) { + fprintf(stderr, "%s: cannot get heat of file '%s'" + ": %s\n", argv[0], path, strerror(errno)); + goto next; + } + + printf("flags: %x\n", heat->lh_flags); + for (i = 0; i < heat->lh_count; i++) + printf("%s: %llu\n", heat_names[i], heat->lh_heat[i]); +next: + if (rc == 0 && rc2 < 0) + rc = rc2; + } + + free(heat); + return rc; +} + +static int lfs_heat_set(int argc, char **argv) +{ + struct option long_opts[] = { + { .val = 'c', .name = "clear", .has_arg = no_argument }, + { .val = 'o', .name = "off", .has_arg = no_argument }, + { .val = 'O', .name = "on", .has_arg = no_argument }, + { .name = NULL } }; + enum lu_heat_flag flags = 0; + int rc = 0, rc2; + char *path; + int fd; + int c; + + if (argc <= 1) + return CMD_HELP; + + optind = 0; + while ((c = getopt_long(argc, argv, "coO", long_opts, NULL)) != -1) { + switch (c) { + case 'c': + flags |= LU_HEAT_FLAG_CLEAR; + break; + case 'o': + flags |= LU_HEAT_FLAG_CLEAR; + flags |= LU_HEAT_FLAG_OFF; + break; + case 'O': + flags &= ~LU_HEAT_FLAG_OFF; + break; + case '?': + return CMD_HELP; + default: + fprintf(stderr, "%s: option '%s' unrecognized\n", + argv[0], argv[optind - 1]); + return CMD_HELP; + } + } + + if (argc <= optind) { + fprintf(stderr, "%s: please give one or more file names\n", + argv[0]); + return CMD_HELP; + } + + while (optind < argc) { + path = argv[optind++]; + + fd = open(path, O_RDONLY); + if (fd < 0) { + fprintf(stderr, "%s: cannot open file '%s': %s\n", + argv[0], path, strerror(errno)); + rc2 = -errno; + goto next; + } + + rc2 = llapi_heat_set(fd, flags); + close(fd); + if (rc2 < 0) { + fprintf(stderr, "%s: cannot setflags heat of file '%s'" + ": %s\n", argv[0], path, strerror(errno)); + 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; @@ -8738,6 +9289,279 @@ close_fd: return rc; } +struct collect_ids_data { + __u16 *cid_ids; + int cid_count; + __u16 cid_exclude; +}; + +static int collect_mirror_id(struct llapi_layout *layout, void *cbdata) +{ + struct collect_ids_data *cid = cbdata; + uint32_t id; + int rc; + + rc = llapi_layout_mirror_id_get(layout, &id); + if (rc < 0) + return rc; + + if ((__u16)id != cid->cid_exclude) { + int i; + + for (i = 0; i < cid->cid_count; i++) { + /* already collected the mirror id */ + if (id == cid->cid_ids[i]) + return LLAPI_LAYOUT_ITER_CONT; + } + cid->cid_ids[cid->cid_count] = id; + cid->cid_count++; + } + + return LLAPI_LAYOUT_ITER_CONT; +} + +static inline int get_other_mirror_ids(int fd, __u16 *ids, __u16 exclude_id) +{ + struct llapi_layout *layout; + struct collect_ids_data cid = { .cid_ids = ids, + .cid_count = 0, + .cid_exclude = exclude_id, }; + int rc; + + layout = llapi_layout_get_by_fd(fd, 0); + if (layout == NULL) { + fprintf(stderr, "could not get layout\n"); + return -EINVAL; + } + + rc = llapi_layout_comp_iterate(layout, collect_mirror_id, &cid); + if (rc < 0) { + fprintf(stderr, "failed to iterate layout\n"); + llapi_layout_free(layout); + + return rc; + } + llapi_layout_free(layout); + + return cid.cid_count; +} + +static inline int lfs_mirror_copy(int argc, char **argv) +{ + int rc = CMD_HELP; + __u16 read_mirror_id = 0; + __u16 ids[128] = { 0 }; + int count = 0; + struct llapi_layout *layout = NULL; + struct llapi_resync_comp comp_array[1024] = { { 0 } }; + int comp_size = 0; + char *fname; + int fd = 0; + int c; + int i; + ssize_t copied; + struct ll_ioc_lease *ioc = NULL; + struct ll_ioc_lease_id *resync_ioc; + + struct option long_opts[] = { + { .val = 'i', .name = "read-mirror", .has_arg = required_argument }, + { .val = 'o', .name = "write-mirror", .has_arg = required_argument }, + { .name = NULL } }; + + while ((c = getopt_long(argc, argv, "i:o:", long_opts, NULL)) >= 0) { + char *end; + + switch (c) { + case 'i': + read_mirror_id = strtoul(optarg, &end, 0); + if (*end != '\0' || read_mirror_id == 0) { + fprintf(stderr, + "%s %s: invalid read mirror ID '%s'\n", + progname, argv[0], optarg); + return rc; + } + break; + case 'o': + if (!strcmp(optarg, "-1")) { + /* specify all other mirrors */ + ids[0] = (__u16)-1; + count = 1; + } else { + count = parse_mirror_ids((__u16 *)ids, + ARRAY_SIZE(ids), + optarg); + if (count < 0) + return rc; + } + break; + default: + fprintf(stderr, "%s: option '%s' unrecognized\n", + progname, argv[optind - 1]); + return -EINVAL; + } + } + + if (argc == optind) { + fprintf(stderr, "%s %s: no mirrored file provided\n", + progname, argv[0]); + return rc; + } else if (argc > optind + 1) { + fprintf(stderr, "%s %s: too many files\n", progname, argv[0]); + return rc; + } + + if (read_mirror_id == 0) { + fprintf(stderr, + "%s %s: no valid read mirror ID %d is provided\n", + progname, argv[0], read_mirror_id); + return rc; + } + + if (count == 0) { + fprintf(stderr, + "%s %s: no write mirror ID is provided\n", + progname, argv[0]); + return rc; + } + + for (i = 0; i < count; i++) { + if (read_mirror_id == ids[i]) { + fprintf(stderr, + "%s %s: read and write mirror ID cannot be the same\n", + progname, argv[0]); + return rc; + } + } + + /* open mirror file */ + fname = argv[optind]; + + fd = open(fname, O_DIRECT | O_RDWR); + if (fd < 0) { + fprintf(stderr, "%s %s: cannot open '%s': %s\n", + progname, argv[0], fname, strerror(errno)); + return rc; + } + + /* write to all other mirrors */ + if (ids[0] == (__u16)-1) { + count = get_other_mirror_ids(fd, ids, read_mirror_id); + if (count <= 0) { + rc = count; + fprintf(stderr, + "%s %s: failed to get other mirror ids in '%s': %d\n", + progname, argv[0], fname, rc); + goto close_fd; + } + } + + /* verify mirror id */ + rc = verify_mirror_id_by_fd(fd, read_mirror_id); + if (rc) { + fprintf(stderr, + "%s %s: cannot find mirror with ID %u in '%s'\n", + progname, argv[0], read_mirror_id, fname); + goto close_fd; + } + + for (i = 0; i < count; i++) { + rc = verify_mirror_id_by_fd(fd, ids[i]); + if (rc) { + fprintf(stderr, + "%s %s: cannot find mirror with ID %u in '%s'\n", + progname, argv[0], ids[i], fname); + goto close_fd; + } + } + + ioc = calloc(sizeof(*ioc) + sizeof(__u32) * 4096, 1); + if (ioc == NULL) { + fprintf(stderr, + "%s %s: cannot alloc comp id array for ioc: %s\n", + progname, argv[0], strerror(errno)); + rc = -errno; + goto close_fd; + } + + /* get stale component info */ + layout = llapi_layout_get_by_fd(fd, 0); + if (layout == NULL) { + fprintf(stderr, "%s %s: failed to get layout of '%s': %s\n", + progname, argv[0], fname, strerror(errno)); + rc = -errno; + goto free_ioc; + } + comp_size = llapi_mirror_find_stale(layout, comp_array, + ARRAY_SIZE(comp_array), + ids, count); + llapi_layout_free(layout); + if (comp_size < 0) { + rc = comp_size; + goto free_ioc; + } + + /* prepare target mirror components instantiation */ + resync_ioc = (struct ll_ioc_lease_id *)ioc; + resync_ioc->lil_mode = LL_LEASE_WRLCK; + resync_ioc->lil_flags = LL_LEASE_RESYNC; + if (count == 1) + resync_ioc->lil_mirror_id = ids[0]; + else + resync_ioc->lil_mirror_id = read_mirror_id | MIRROR_ID_NEG; + rc = llapi_lease_set(fd, ioc); + if (rc < 0) { + fprintf(stderr, + "%s %s: '%s' llapi_lease_get_ext failed: %s\n", + progname, argv[0], fname, strerror(errno)); + goto free_ioc; + } + + copied = llapi_mirror_copy_many(fd, read_mirror_id, ids, count); + if (copied < 0) { + rc = copied; + fprintf(stderr, "%s %s: copy error: %d\n", + progname, argv[0], rc); + goto free_ioc; + } + + fprintf(stdout, "mirror copied successfully: "); + for (i = 0; i < copied; i++) + fprintf(stdout, "%d ", ids[i]); + fprintf(stdout, "\n"); + + ioc->lil_mode = LL_LEASE_UNLCK; + ioc->lil_flags = LL_LEASE_RESYNC_DONE; + ioc->lil_count = 0; + for (i = 0; i < comp_size; i++) { + int j; + + for (j = 0; j < copied; j++) { + if (comp_array[i].lrc_mirror_id != ids[j]) + continue; + + ioc->lil_ids[ioc->lil_count] = comp_array[i].lrc_id; + ioc->lil_count++; + } + } + rc = llapi_lease_set(fd, ioc); + if (rc <= 0) { + if (rc == 0) + rc = -EBUSY; + fprintf(stderr, + "%s %s: release lease lock of '%s' failed: %s\n", + progname, argv[0], fname, strerror(errno)); + goto free_ioc; + } + + rc = 0; + +free_ioc: + free(ioc); +close_fd: + close(fd); + + return rc; +} /** * struct verify_chunk - Mirror chunk to be verified. * @chunk: [start, end) of the chunk. @@ -9074,8 +9898,6 @@ int lfs_mirror_verify_chunk(int fd, size_t file_size, 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",