X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre%2Futils%2Flfs.c;h=54e75a4904c262ca9d197e7e7fe5832f82d0431c;hp=b16af99de1a1ec4925b2b834c1c24dcbe92a2556;hb=cb499096d7de27dc886365900874eba33693ab06;hpb=c6e7c0788d7cd766880d12eae6679782283dc479 diff --git a/lustre/utils/lfs.c b/lustre/utils/lfs.c index b16af99..54e75a4 100644 --- a/lustre/utils/lfs.c +++ b/lustre/utils/lfs.c @@ -71,15 +71,13 @@ #include #include #include +#include #include #include #include #include -#include - -#ifndef ARRAY_SIZE -# define ARRAY_SIZE(a) ((sizeof(a)) / (sizeof((a)[0]))) -#endif /* !ARRAY_SIZE */ +#include +#include "lstddef.h" /* all functions */ static int lfs_find(int argc, char **argv); @@ -98,13 +96,12 @@ 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); static int lfs_fid2path(int argc, char **argv); static int lfs_path2fid(int argc, char **argv); +static int lfs_rmfid(int argc, char **argv); static int lfs_data_version(int argc, char **argv); static int lfs_hsm_state(int argc, char **argv); static int lfs_hsm_set(int argc, char **argv); @@ -119,6 +116,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); @@ -127,6 +126,17 @@ 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); +static int lfs_pcc_attach(int argc, char **argv); +static int lfs_pcc_attach_fid(int argc, char **argv); +static int lfs_pcc_detach(int argc, char **argv); +static int lfs_pcc_detach_fid(int argc, char **argv); +static int lfs_pcc_state(int argc, char **argv); +static int lfs_pcc(int argc, char **argv); +static int lfs_pcc_list_commands(int argc, char **argv); +static int lfs_migrate_to_dom(int fd, int fdv, char *name, + __u64 migration_flags, + struct llapi_stripe_param *param, + struct llapi_layout *layout); enum setstripe_origin { SO_SETSTRIPE, @@ -135,7 +145,9 @@ enum setstripe_origin { SO_MIRROR_CREATE, SO_MIRROR_EXTEND, SO_MIRROR_SPLIT, + SO_MIRROR_DELETE, }; + static int lfs_setstripe_internal(int argc, char **argv, enum setstripe_origin opc); @@ -143,41 +155,60 @@ static inline int lfs_setstripe(int argc, char **argv) { return lfs_setstripe_internal(argc, argv, SO_SETSTRIPE); } + static inline int lfs_setstripe_migrate(int argc, char **argv) { return lfs_setstripe_internal(argc, argv, SO_MIGRATE); } + static inline int lfs_mirror_create(int argc, char **argv) { return lfs_setstripe_internal(argc, argv, SO_MIRROR_CREATE); } + static inline int lfs_mirror_extend(int argc, char **argv) { 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); } +static inline int lfs_mirror_delete(int argc, char **argv) +{ + return lfs_setstripe_internal(argc, argv, SO_MIRROR_DELETE); +} + /* Setstripe and migrate share mostly the same parameters */ #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" \ + " [--extension-size|--ext-size|-z]\n" \ " [--layout|-L ]\n" \ - " [--pool|-p ]\n" \ + " [--mirror_count|-N[mirror_count]]\n" \ " [--ost|-o ]\n" \ + " [--pool|-p ]\n" \ " [--yaml|-y ]\n" \ " [--copy=]\n" #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" \ "\t respectively)\n" \ + "\textension_size:\n" \ + "\t Number of bytes the previous component is extended\n" \ + "\t each time. Can be specified with K, M, G (for KB,\n" \ + "\t MB, GB respectively)\n" \ "\tpool_name: Name of OST pool to use (default none)\n" \ "\tlayout: stripe pattern type: raid0, mdt (default raid0)\n"\ "\tost_indices: List of OST indices, can be repeated multiple times\n"\ @@ -185,7 +216,7 @@ static inline int lfs_mirror_split(int argc, char **argv) "\t -o ,-,\n" \ "\t Or:\n" \ "\t -o -o - -o \n" \ - "\t If --pool is set with --ost, then the OSTs\n" \ + "\t If --pool is set with --ost then the OSTs\n" \ "\t must be the members of the pool.\n" \ "\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" \ @@ -205,7 +236,7 @@ static inline int lfs_mirror_split(int argc, char **argv) "\t it must follow the option without a space.\n" \ "\t The option can also be repeated multiple times to\n" \ "\t separate mirrors that have different layouts.\n" \ - "\tsetstripe options: Mirror layout\n" \ + "\tSETSTRIPE_OPTIONS: Mirror layout as with 'setstripe'\n" \ "\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" \ @@ -222,8 +253,8 @@ static inline int lfs_mirror_split(int argc, char **argv) "\t file.\n" #define MIRROR_EXTEND_USAGE \ - " <--mirror-count|-N[mirror_count]>\n" \ - " [setstripe options|-f ]\n" \ + " {--mirror-count|-N[mirror_count]}\n" \ + " [SETSTRIPE_OPTIONS|-f|--file ]\n" \ " [--no-verify]\n" #define SETSTRIPE_USAGE \ @@ -253,10 +284,16 @@ static inline int lfs_mirror_split(int argc, char **argv) "\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" \ + " crush CRUSH hash algorithm (default)\n" \ + " fnv_1a_64 FNV-1a hash algorithm\n" \ " all_char sum of characters % MDT_COUNT (not recommended)\n" \ "\tdefault_stripe: set default dirstripe of the directory\n" \ - "\tmode: the file access permission of the directory (octal)\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|-o mode] [--flags ] \n" \ + "\tmode: the mode of the directory\n" \ + "\tforeign_type: none or daos\n" /** * command_t mirror_cmdlist - lfs mirror commands. @@ -266,22 +303,29 @@ command_t mirror_cmdlist[] = { .pc_help = "Create a mirrored file.\n" "usage: lfs mirror create " "<--mirror-count|-N[mirror_count]> " - "[setstripe options] ... \n" + "[SETSTRIPE_OPTIONS] ... ...\n" MIRROR_CREATE_HELP }, + { .pc_name = "delete", .pc_func = lfs_mirror_delete, + .pc_help = "Delete a mirror from a file.\n" + "usage: lfs mirror delete {--mirror-id |\n" + "\t --component-id|--comp-id|-I |\n" + "\t -p } ...\n" + }, { .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|-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" + "usage: lfs mirror split <--mirror-id |\n" + "\t --component-id|-I |-p > [--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" + "\tpool: Components on specified pool.\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" @@ -315,22 +359,54 @@ command_t mirror_cmdlist[] = { { .pc_help = NULL } }; +/** + * command_t pcc_cmdlist - lfs pcc commands. + */ +command_t pcc_cmdlist[] = { + { .pc_name = "attach", .pc_func = lfs_pcc_attach, + .pc_help = "Attach given files to the Persistent Client Cache.\n" + "usage: lfs pcc attach <--id|-i NUM> ...\n" + "\t-i: archive id for RW-PCC\n" }, + { .pc_name = "attach_fid", .pc_func = lfs_pcc_attach_fid, + .pc_help = "Attach given files into PCC by FID(s).\n" + "usage: lfs pcc attach_id <--id|-i NUM> <--mnt|-m mnt> " + " ...\n" + "\t-i: archive id for RW-PCC\n" + "\t-m: Lustre mount point\n" }, + { .pc_name = "state", .pc_func = lfs_pcc_state, + .pc_help = "Display the PCC state for given files.\n" + "usage: lfs pcc state ...\n" }, + { .pc_name = "detach", .pc_func = lfs_pcc_detach, + .pc_help = "Detach given files from the Persistent Client Cache.\n" + "usage: lfs pcc detach ...\n" }, + { .pc_name = "detach_fid", .pc_func = lfs_pcc_detach_fid, + .pc_help = "Detach given files from PCC by FID(s).\n" + "usage: lfs pcc detach_fid ...\n" }, + { .pc_name = "list-commands", .pc_func = lfs_pcc_list_commands, + .pc_help = "list commands supported by lfs pcc"}, + { .pc_name = "help", .pc_func = Parser_help, .pc_help = "help" }, + { .pc_name = "exit", .pc_func = Parser_quit, .pc_help = "quit" }, + { .pc_name = "quit", .pc_func = Parser_quit, .pc_help = "quit" }, + { .pc_help = NULL } +}; + /* all available commands */ command_t cmdlist[] = { {"setstripe", lfs_setstripe, 0, "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" SSM_CMD_COMMON("setstripe --component-add") SSM_HELP_COMMON "To totally delete the default striping from an existing directory:\n" - "usage: setstripe -d \n" + "usage: setstripe [--delete|-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" + "usage: setstripe {--mirror-count|-N}[mirror_count] [SETSTRIPE_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" @@ -340,7 +416,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" @@ -352,14 +432,15 @@ command_t cmdlist[] = { " [--component-id[=comp_id]|-I[comp_id]]\n" " [--component-flags[=comp_flags]]\n" " [--component-count]\n" + " [--extension-size|--ext-size|-z]\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" - "be done on MDT0 with the right of administrator.\n" + "Create striped directory on specified MDT, same as mkdir.\n" + "May be restricted to root or group users, depending on settings.\n" "usage: setdirstripe [OPTION] \n" SETDIRSTRIPE_USAGE}, {"getdirstripe", lfs_getdirstripe, 0, @@ -368,10 +449,9 @@ 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" + "Create striped directory on specified MDT, same as setdirstripe.\n" "usage: mkdir [OPTION] \n" SETDIRSTRIPE_USAGE}, {"rm_entry", lfs_rmentry, 0, @@ -386,60 +466,67 @@ 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" + " [[!] --atime|-A [+-]N[smhdwy]] [[!] --ctime|-C [+-]N[smhdwy]]\n" + " [[!] --mtime|-M [+-]N[smhdwy]]\n" + " [[!] --btime|--Btime|-B [+-]N[smhdwy]]\n" + " [[!] --newer[XY] ] [[!] --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" " [[!] --stripe-index|-i ]\n" " [[!] --stripe-size|-S [+-]N[kMGT]] [[!] --type|-t ]\n" + " [[!] --extension-size|--ext-size|-z [+-]N[kMGT]]\n" " [[!] --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" - " [[!] --component-flags ]\n" + " [[!] --component-flags {init,stale,prefer,offline,nosync,extension}]\n" " [[!] --mirror-count|-N [+-]]\n" " [[!] --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" + "\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 [--inodes|-i] [--human-readable|-h] [--lazy|-l]\n" + " [--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" - " [--inode-softlimit ]\n" - " [--inode-hardlimit ] \n" + " [--block-softlimit ]\n" + " [--block-hardlimit ]\n" + " [--inode-softlimit ]\n" + " [--inode-hardlimit ] \n" " setquota [-t] <-u|--user|-g|--group|-p|--projid>\n" - " [--block-grace ]\n" - " [--inode-grace ] \n" + " [--block-grace 'notify'|]\n" + " [--inode-grace 'notify'|] \n" " setquota <-U|-G|-P>\n" " -b -B \n" " -i -I \n" @@ -450,9 +537,9 @@ command_t cmdlist[] = { " [--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" + " -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" " -d can be used instead of --default\n\n" "Note: The total quota space will be split into many qunits and\n" @@ -462,8 +549,11 @@ command_t cmdlist[] = { " 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" - " quota space."}, - {"quota", lfs_quota, 0, "Display disk usage and limits.\n" + " quota space.\n\n" + " When setting the grace time, 'notify' can be used as grace to\n" + " be notified after the quota is over soft limit but prevents\n" + " the soft limit from becoming the hard limit."}, + {"quota", lfs_quota, 0, "Display disk usage and limits.\n" "usage: quota [-q] [-v] [-h] [-o |-i |-I " "]\n" " [<-u|-g|-p> ||||] \n" @@ -481,32 +571,26 @@ command_t cmdlist[] = { " 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...]"}, - {"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]]"}, - {"changelog_clear", lfs_changelog_clear, 0, - "Indicate that old changelog records up to are no longer of " - "interest to consumer , allowing the system to free up space.\n" - "An of 0 means all records.\n" - "usage: changelog_clear "}, + {"flushctx", lfs_flushctx, 0, "Flush security context for current user.\n" + "usage: flushctx [-k] [mountpoint...]"}, + {"changelog", lfs_changelog, 0, + "Show the metadata changes on an MDT." + "\nusage: changelog [startrec [endrec]]"}, + {"changelog_clear", lfs_changelog_clear, 0, + "Indicate that old changelog records up to are no longer of " + "interest to consumer , allowing the system to free up space.\n" + "An of 0 means all records.\n" + "usage: changelog_clear "}, {"fid2path", lfs_fid2path, 0, "Resolve the full path(s) for given FID(s). For a specific hardlink " "specify link number .\n" - /* "For a historical link name, specify changelog record .\n" */ - "usage: fid2path [--link ] ..." - /* [ --rec ] */ }, + "usage: fid2path [-c] [--link|-l ] ..."}, {"path2fid", lfs_path2fid, 0, "Display the fid(s) for a given path(s).\n" "usage: path2fid [--parents] ..."}, + {"rmfid", lfs_rmfid, 0, "Remove file(s) by FID(s)\n" + "usage: rmfid ..."}, {"data_version", lfs_data_version, 0, "Display file data version for " - "a given path.\n" "usage: data_version -[n|r|w] "}, + "a given path.\n" "usage: data_version [-n|-r|-w] "}, {"hsm_state", lfs_hsm_state, 0, "Display the HSM information (states, " "undergoing actions) for given files.\n usage: hsm_state ..."}, {"hsm_set", lfs_hsm_set, 0, "Set HSM user flag on specified files.\n" @@ -555,13 +639,15 @@ command_t cmdlist[] = { " it's the MDT index of first stripe\n" "\tmdt_count: number of MDTs to stripe a directory over\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\n" + " all_char (type 1)sum of characters % MDT_COUNT\n" + " fnv_1a_64 (type 2)FNV-1a hash algorithm (default)\n" + " crush (type 3)CRUSH hash algorithm\n" "\n" "migrate file objects from one OST " "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" @@ -571,6 +657,9 @@ 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" @@ -605,6 +694,22 @@ command_t cmdlist[] = { "\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"}, + {"pcc", lfs_pcc, pcc_cmdlist, + "lfs commands used to interact with PCC features:\n" + "lfs pcc attach - attach given files to Persistent Client Cache\n" + "lfs pcc attach_fid - attach given files into PCC by FID(s)\n" + "lfs pcc state - display the PCC state for given files\n" + "lfs pcc detach - detach given files from Persistent Client Cache\n" + "lfs pcc detach_fid - detach given files from PCC by FID(s)\n"}, {"help", Parser_help, 0, "help"}, {"exit", Parser_quit, 0, "quit"}, {"quit", Parser_quit, 0, "quit"}, @@ -615,11 +720,16 @@ command_t cmdlist[] = { { 0, 0, 0, NULL } }; - static int check_hashtype(const char *hashtype) { + int type_num = atoi(hashtype); int i; + /* numeric hash type */ + if (hashtype && strlen(hashtype) == 1 && + (type_num > 0 && type_num < LMV_HASH_TYPE_MAX)) + return type_num; + /* string hash type */ for (i = LMV_HASH_TYPE_ALL_CHARS; i < LMV_HASH_TYPE_MAX; i++) if (strcmp(hashtype, mdt_hash_name[i]) == 0) return i; @@ -627,6 +737,20 @@ 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) + 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"; @@ -657,7 +781,7 @@ migrate_open_files(const char *name, __u64 migration_flags, struct stat st; struct stat stv; - if (param == NULL && layout == NULL) { + if (!param && !layout) { error_loc = "layout information"; return -EINVAL; } @@ -670,8 +794,8 @@ migrate_open_files(const char *name, __u64 migration_flags, strncpy(parent, name, sizeof(parent)); ptr = strrchr(parent, '/'); - if (ptr == NULL) { - if (getcwd(parent, sizeof(parent)) == NULL) { + if (!ptr) { + if (!getcwd(parent, sizeof(parent))) { error_loc = "getcwd"; return -errno; } @@ -683,7 +807,8 @@ migrate_open_files(const char *name, __u64 migration_flags, /* open file, direct io */ /* even if the file is only read, WR mode is nedeed to allow - * layout swap on fd */ + * layout swap on fd + */ rflags = O_RDWR; if (!(migration_flags & MIGRATION_NONDIRECT)) rflags |= O_DIRECT; @@ -714,12 +839,12 @@ migrate_open_files(const char *name, __u64 migration_flags, } /* create, open a volatile file, use caching (ie no directio) */ - if (param != NULL) - fdv = llapi_file_open_param(volatile_file, open_flags, - open_mode, param); - else + if (layout) fdv = lfs_component_create(volatile_file, open_flags, open_mode, layout); + else + fdv = llapi_file_open_param(volatile_file, open_flags, + open_mode, param); } while (fdv < 0 && (rc = fdv) == -EEXIST); if (rc < 0) { @@ -727,11 +852,14 @@ migrate_open_files(const char *name, __u64 migration_flags, goto out; } - /* In case the MDT does not support creation of volatile files - * we should try to unlink it. */ + /* + * In case the MDT does not support creation of volatile files + * we should try to unlink it. + */ (void)unlink(volatile_file); - /* Not-owner (root?) special case. + /* + * Not-owner (root?) special case. * Need to set owner/group of volatile file like original. * This will allow to pass related check during layout_swap. */ @@ -785,7 +913,7 @@ static int migrate_copy_data(int fd_src, int fd_dst, int (*check_file)(int)) int rc; layout = llapi_layout_get_by_fd(fd_src, 0); - if (layout != NULL) { + if (layout) { uint64_t stripe_size; rc = llapi_layout_stripe_size_get(layout, &stripe_size); @@ -801,8 +929,10 @@ static int migrate_copy_data(int fd_src, int fd_dst, int (*check_file)(int)) return -rc; while (1) { - /* read new data only if we have written all - * previously read data */ + /* + * read new data only if we have written all + * previously read data + */ if (wpos == rpos) { if (check_file) { rc = check_file(fd_src); @@ -874,9 +1004,11 @@ static int migrate_block(int fd, int fdv) gid = random(); while (gid == 0); - /* The grouplock blocks all concurrent accesses to the file. + /* + * The grouplock blocks all concurrent accesses to the file. * It has to be taken after llapi_get_data_version as it would - * block it too. */ + * block it too. + */ rc = llapi_group_lock(fd, gid); if (rc < 0) { error_loc = "cannot get group lock"; @@ -896,11 +1028,13 @@ static int migrate_block(int fd, int fdv) goto out_unlock; } - /* swap layouts + /* + * swap layouts * for a migration we need to check data version on file did * not change. * - * Pass in gid=0 since we already own grouplock. */ + * Pass in gid=0 since we already own grouplock. + */ rc = llapi_fswap_layouts_grouplock(fd, fdv, dv1, 0, 0, SWAP_LAYOUTS_CHECK_DV1); if (rc == -EAGAIN) { @@ -996,16 +1130,31 @@ static int lfs_component_set(char *fname, int comp_id, } if (neg_flags) { + if (neg_flags & LCME_FL_STALE) { + fprintf(stderr, + "%s: cannot clear 'stale' flags from component. Please use lfs-mirror-resync(1) instead\n", + progname); + return -EINVAL; + } + 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); + if (rc) { + if (errno == EUCLEAN) { + rc = -errno; + fprintf(stderr, + "%s: cannot set 'stale' flag on component '%#x' of the last non-stale mirror of '%s'\n", + progname, comp_id, fname); + } else { + 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; } @@ -1024,7 +1173,6 @@ static int lfs_component_del(char *fname, __u32 comp_id, if ((flags && comp_id) || (!flags && !comp_id)) return -EINVAL; - /* LCME_FL_INIT is the only supported flag in PFL */ if (flags) { if (flags & ~LCME_KNOWN_FLAGS) { fprintf(stderr, @@ -1050,7 +1198,7 @@ static int lfs_component_add(char *fname, struct llapi_layout *layout) { int rc; - if (layout == NULL) + if (!layout) return -EINVAL; rc = llapi_layout_file_comp_add(fname, layout); @@ -1066,7 +1214,7 @@ static int lfs_component_create(char *fname, int open_flags, mode_t open_mode, struct stat st; int fd; - if (layout == NULL) + if (!layout) return -EINVAL; fd = lstat(fname, &st); @@ -1087,6 +1235,8 @@ static int lfs_migrate(char *name, __u64 migration_flags, struct llapi_stripe_param *param, struct llapi_layout *layout) { + struct llapi_layout *existing; + uint64_t dom_new, dom_cur; int fd = -1; int fdv = -1; int rc; @@ -1096,11 +1246,44 @@ static int lfs_migrate(char *name, __u64 migration_flags, if (rc < 0) goto out; + rc = llapi_layout_dom_size(layout, &dom_new); + if (rc) { + error_loc = "cannot get new layout DoM size"; + goto out; + } + /* special case for migration to DOM layout*/ + existing = llapi_layout_get_by_fd(fd, 0); + if (!existing) { + error_loc = "cannot get existing layout"; + goto out; + } + + rc = llapi_layout_dom_size(existing, &dom_cur); + if (rc) { + error_loc = "cannot get current layout DoM size"; + goto out; + } + + /* + * if file has DoM layout already then migration is possible to + * the new layout with the same DoM component via swap layout, + * if new layout used bigger DOM size, then mirroring is used + */ + if (dom_new > dom_cur) { + rc = lfs_migrate_to_dom(fd, fdv, name, migration_flags, param, + layout); + if (rc) + error_loc = "cannot migrate to DOM layout"; + goto out_closed; + } + if (!(migration_flags & MIGRATION_NONBLOCK)) { - /* Blocking mode (forced if servers do not support file lease). + /* + * Blocking mode (forced if servers do not support file lease). * It is also the default mode, since we cannot distinguish * between a broken lease and a server that does not support - * atomic swap/close (LU-6785) */ + * atomic swap/close (LU-6785) + */ rc = migrate_block(fd, fdv); goto out; } @@ -1117,9 +1300,11 @@ static int lfs_migrate(char *name, __u64 migration_flags, goto out; } - /* Atomically put lease, swap layouts and close. + /* + * Atomically put lease, swap layouts and close. * for a migration we need to check data version on file did - * not change. */ + * not change. + */ rc = llapi_fswap_layouts(fd, fdv, 0, 0, SWAP_LAYOUTS_CLOSE); if (rc < 0) { error_loc = "cannot swap layout"; @@ -1132,7 +1317,7 @@ out: if (fdv >= 0) close(fdv); - +out_closed: if (rc < 0) fprintf(stderr, "error: %s: %s: %s: %s\n", progname, name, error_loc, strerror(-rc)); @@ -1146,7 +1331,7 @@ static int comp_str2flags(char *string, __u32 *flags, __u32 *neg_flags) { char *name; - if (string == NULL) + if (!string) return -EINVAL; *flags = 0; @@ -1188,7 +1373,7 @@ static int comp_str2flags(char *string, __u32 *flags, __u32 *neg_flags) static int mirror_str2state(char *string, __u16 *state, __u16 *neg_state) { - if (string == NULL) + if (!string) return -EINVAL; *state = 0; @@ -1227,71 +1412,9 @@ struct mirror_args { struct llapi_layout *m_layout; const char *m_file; struct mirror_args *m_next; + bool m_inherit; }; -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; - uint64_t pattern; - int rc; - - /* LU-10112: do not support dom+flr in phase 1 */ - rc = llapi_layout_comp_use(layout, LLAPI_LAYOUT_COMP_USE_FIRST); - if (rc) - return -errno; - - rc = llapi_layout_pattern_get(layout, &pattern); - if (rc) - return -errno; - - if (pattern == LOV_PATTERN_MDT || pattern == LLAPI_LAYOUT_MDT) { - fprintf(stderr, "error: %s: doesn't support dom+flr for now\n", - progname); - return -ENOTSUP; - } - - rc = llapi_layout_comp_use(layout, LLAPI_LAYOUT_COMP_USE_LAST); - if (rc) - return -errno; - - rc = llapi_layout_comp_extent_get(layout, &start, &end); - if (rc) - return -errno; - - if (end != LUSTRE_EOF) { - fprintf(stderr, "error: %s: mirror layout doesn't reach eof\n", - progname); - return -EINVAL; - } - - rc = llapi_layout_comp_iterate(layout, mirror_sanity_check_flags, NULL); - return rc; -} - /** * enum mirror_flags - Flags for extending a mirrored file. * @MF_NO_VERIFY: Indicates not to verify the mirror(s) from victim file(s) @@ -1306,6 +1429,7 @@ enum mirror_flags { MF_NO_VERIFY = 0x1, MF_DESTROY = 0x2, MF_COMP_ID = 0x4, + MF_COMP_POOL = 0x8, }; /** @@ -1324,7 +1448,7 @@ static int mirror_create_sanity_check(const char *fname, bool has_m_file = false; bool has_m_layout = false; - if (list == NULL) + if (!list) return -EINVAL; if (fname) { @@ -1338,21 +1462,24 @@ static int mirror_create_sanity_check(const char *fname, return -ENODATA; } - rc = mirror_sanity_check_one(layout); + rc = llapi_layout_sanity(layout, false, true); + llapi_layout_free(layout); - if (rc) + if (rc) { + llapi_layout_sanity_perror(rc); return rc; + } } - while (list != NULL) { - if (list->m_file != NULL) { + while (list) { + if (list->m_file) { has_m_file = true; llapi_layout_free(list->m_layout); list->m_layout = llapi_layout_get_by_path(list->m_file, 0); - if (list->m_layout == NULL) { + if (!list->m_layout) { fprintf(stderr, "error: %s: file '%s' has no layout\n", progname, list->m_file); @@ -1360,16 +1487,18 @@ static int mirror_create_sanity_check(const char *fname, } } else { has_m_layout = true; - if (list->m_layout == NULL) { + if (!list->m_layout) { fprintf(stderr, "error: %s: no mirror layout\n", progname); return -EINVAL; } } - rc = mirror_sanity_check_one(list->m_layout); - if (rc) + rc = llapi_layout_sanity(list->m_layout, false, true); + if (rc) { + llapi_layout_sanity_perror(rc); return rc; + } list = list->m_next; } @@ -1426,7 +1555,7 @@ static int mirror_create(char *fname, struct mirror_args *mirror_list) return rc; cur_mirror = mirror_list; - while (cur_mirror != NULL) { + while (cur_mirror) { rc = llapi_layout_comp_iterate(cur_mirror->m_layout, mirror_set_flags, &cur_mirror->m_flags); @@ -1441,8 +1570,8 @@ static int mirror_create(char *fname, struct mirror_args *mirror_list) rc = llapi_layout_merge(&layout, cur_mirror->m_layout); if (rc) { rc = -errno; - fprintf(stderr, "error: %s: " - "merge layout failed: %s\n", + fprintf(stderr, + "error: %s: merge layout failed: %s\n", progname, strerror(errno)); goto error; } @@ -1451,7 +1580,7 @@ static int mirror_create(char *fname, struct mirror_args *mirror_list) cur_mirror = cur_mirror->m_next; } - if (layout == NULL) { + if (!layout) { fprintf(stderr, "error: %s: layout is NULL\n", progname); return -EINVAL; } @@ -1505,8 +1634,10 @@ static ssize_t mirror_file_compare(int fd, int fdv) if (bytes_read != read(fdv, buf + buflen, buflen)) break; - /* XXX: should compute the checksum on each buffer and then - * compare checksum to avoid cache collision */ + /* + * XXX: should compute the checksum on each buffer and then + * compare checksum to avoid cache collision + */ if (memcmp(buf, buf + buflen, bytes_read)) break; @@ -1589,7 +1720,6 @@ static int mirror_extend_file(const char *fname, const char *victim_file, if (rc < 0) { error_loc = "cannot get data version"; goto out; - } /* Make sure we keep original atime/mtime values */ @@ -1635,14 +1765,36 @@ out: return rc; } -static int mirror_extend_layout(char *name, struct llapi_layout *layout) +static int mirror_extend_layout(char *name, struct llapi_layout *m_layout, + bool inherit) { + struct llapi_layout *f_layout = NULL; struct ll_ioc_lease *data = NULL; int fd = -1; int fdv = -1; - int rc; + int rc = 0; - rc = migrate_open_files(name, 0, NULL, layout, &fd, &fdv); + if (inherit) { + f_layout = llapi_layout_get_by_path(name, 0); + if (!f_layout) { + fprintf(stderr, "%s: cannot get layout\n", progname); + goto out; + } + rc = llapi_layout_get_last_init_comp(f_layout); + if (rc) { + fprintf(stderr, "%s: cannot get the last init comp\n", + progname); + goto out; + } + rc = llapi_layout_mirror_inherit(f_layout, m_layout); + if (rc) { + fprintf(stderr, + "%s: cannot inherit from the last init comp\n", + progname); + goto out; + } + } + rc = migrate_open_files(name, 0, NULL, m_layout, &fd, &fdv); if (rc < 0) goto out; @@ -1702,7 +1854,7 @@ static int mirror_extend(char *fname, struct mirror_args *mirror_list, return rc; while (mirror_list) { - if (mirror_list->m_file != NULL) { + if (mirror_list->m_file) { rc = mirror_extend_file(fname, mirror_list->m_file, mirror_flags); } else { @@ -1710,7 +1862,8 @@ static int mirror_extend(char *fname, struct mirror_args *mirror_list, while (mirror_count > 0) { rc = mirror_extend_layout(fname, - mirror_list->m_layout); + mirror_list->m_layout, + mirror_list->m_inherit); if (rc) break; @@ -1755,7 +1908,100 @@ static int find_comp_id(struct llapi_layout *layout, void *cbdata) return LLAPI_LAYOUT_ITER_CONT; } -static int mirror_split(const char *fname, __u32 id, + +struct pool_to_id_cbdata { + const char *pool; + __u32 id; +}; + +static int find_comp_id_by_pool(struct llapi_layout *layout, void *cbdata) +{ + char buf[LOV_MAXPOOLNAME + 1]; + struct pool_to_id_cbdata *d = (void *)cbdata; + uint32_t id; + int rc; + + rc = llapi_layout_pool_name_get(layout, buf, sizeof(buf)); + if (rc < 0) + return rc; + if (strcmp(d->pool, buf)) + return LLAPI_LAYOUT_ITER_CONT; + + rc = llapi_layout_mirror_id_get(layout, &id); + if (rc < 0) + return rc; + d->id = id; + + return LLAPI_LAYOUT_ITER_STOP; +} + +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; +} + +/** + * last_non_stale_mirror() - Check if a mirror is the last non-stale mirror. + * @mirror_id: Mirror id to be checked. + * @layout: Mirror component list. + * + * This function checks if a mirror with specified @mirror_id is the last + * non-stale mirror of a layout @layout. + * + * Return: true or false. + */ +static inline +bool last_non_stale_mirror(__u16 mirror_id, struct llapi_layout *layout) +{ + __u16 mirror_ids[128] = { 0 }; + struct collect_ids_data cid = { .cid_ids = mirror_ids, + .cid_count = 0, + .cid_exclude = mirror_id, }; + int i; + + llapi_layout_comp_iterate(layout, collect_mirror_id, &cid); + + for (i = 0; i < cid.cid_count; i++) { + struct llapi_resync_comp comp_array[1024] = { { 0 } }; + int comp_size = 0; + + comp_size = llapi_mirror_find_stale(layout, comp_array, + ARRAY_SIZE(comp_array), + &mirror_ids[i], 1); + if (comp_size == 0) + return false; + } + + return true; +} + +static int mirror_split(const char *fname, __u32 id, const char *pool, enum mirror_flags mflags, const char *victim_file) { struct llapi_layout *layout; @@ -1765,6 +2011,7 @@ static int mirror_split(const char *fname, __u32 id, char *ptr; struct ll_ioc_lease *data; uint16_t mirror_count; + __u32 mirror_id; int mdt_index; int fd, fdv; int rc; @@ -1778,9 +2025,11 @@ static int mirror_split(const char *fname, __u32 id, return -EINVAL; } - rc = mirror_sanity_check_one(layout); - if (rc) + rc = llapi_layout_sanity(layout, false, true); + if (rc) { + llapi_layout_sanity_perror(rc); goto free_layout; + } rc = llapi_layout_mirror_count_get(layout, &mirror_count); if (rc) { @@ -1796,21 +2045,40 @@ static int mirror_split(const char *fname, __u32 id, goto free_layout; } - if (mflags & MF_COMP_ID) { + if (mflags & MF_COMP_POOL) { + struct pool_to_id_cbdata data = { .pool = pool }; + + rc = llapi_layout_comp_iterate(layout, find_comp_id_by_pool, + &data); + mirror_id = data.id; + } else if (mflags & MF_COMP_ID) { rc = llapi_layout_comp_iterate(layout, find_comp_id, &id); - id = mirror_id_of(id); + mirror_id = mirror_id_of(id); } else { rc = llapi_layout_comp_iterate(layout, find_mirror_id, &id); + 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; + if (mflags & MF_COMP_POOL) { + fprintf(stderr, + "error %s: file '%s' does not contain mirror with pool '%s'\n", + progname, fname, pool); + goto free_layout; + } else if (mflags & MF_COMP_ID) { + fprintf(stderr, + "error %s: file '%s' does not contain mirror with comp-id %u\n", + progname, fname, id); + goto free_layout; + } else { + fprintf(stderr, + "error %s: file '%s' does not contain mirror with id %u\n", + progname, fname, id); + goto free_layout; + } } fd = open(fname, O_RDWR); @@ -1830,8 +2098,8 @@ static int mirror_split(const char *fname, __u32 id, } strncpy(parent, fname, sizeof(parent)); ptr = strrchr(parent, '/'); - if (ptr == NULL) { - if (getcwd(parent, sizeof(parent)) == NULL) { + if (!ptr) { + if (!getcwd(parent, sizeof(parent))) { fprintf(stderr, "error %s: getcwd failed: %s\n", progname, strerror(errno)); rc = -errno; @@ -1850,14 +2118,22 @@ static int mirror_split(const char *fname, __u32 id, goto close_fd; } - if (victim_file == NULL) { + if (!victim_file) { /* use a temp file to store the splitted layout */ if (mflags & MF_DESTROY) { + if (last_non_stale_mirror(mirror_id, layout)) { + rc = -EUCLEAN; + fprintf(stderr, + "%s: cannot destroy the last non-stale mirror of file '%s'\n", + progname, fname); + goto close_fd; + } + fdv = llapi_create_volatile_idx(parent, mdt_index, O_LOV_DELAY_CREATE); } else { snprintf(victim, sizeof(victim), "%s.mirror~%u", - fname, id); + fname, mirror_id); fdv = open(victim, flags, S_IRUSR | S_IWUSR); } } else { @@ -1892,7 +2168,7 @@ static int mirror_split(const char *fname, __u32 id, data->lil_flags = LL_LEASE_LAYOUT_SPLIT; data->lil_count = 2; data->lil_ids[0] = fdv; - data->lil_ids[1] = id; + data->lil_ids[1] = mirror_id; rc = llapi_lease_set(fd, data); if (rc <= 0) { if (rc == 0) /* lost lease lock */ @@ -1914,36 +2190,105 @@ 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) +static inline +int lfs_mirror_resync_file(const char *fname, struct ll_ioc_lease *ioc, + __u16 *mirror_ids, int ids_nr); + +static int lfs_migrate_to_dom(int fd, int fdv, char *name, + __u64 migration_flags, + struct llapi_stripe_param *param, + struct llapi_layout *layout) { + struct ll_ioc_lease *data = NULL; int rc; - int nr = offset; - int slots = size - offset; - char *ptr = NULL; - bool end_of_loop; - if (arg == NULL) - return -EINVAL; + rc = llapi_lease_acquire(fd, LL_LEASE_RDLCK); + if (rc < 0) { + error_loc = "cannot get lease"; + goto out_close; + } - end_of_loop = false; - while (!end_of_loop) { - int start_index; - int end_index; + /* Atomically put lease, merge layouts, resync and close. */ + data = calloc(1, offsetof(typeof(*data), lil_ids[1024])); + if (!data) { + error_loc = "memory allocation"; + goto out_close; + } + 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_close; + } else if (rc == 0) { + rc = -EBUSY; + error_loc = "lost lease lock"; + goto out_close; + } + close(fd); + close(fdv); + + rc = lfs_mirror_resync_file(name, data, NULL, 0); + if (rc) { + error_loc = "cannot resync file"; + goto out; + } + + /* delete first mirror now */ + rc = mirror_split(name, 1, NULL, MF_DESTROY, NULL); + if (rc < 0) + error_loc = "cannot delete old layout"; + goto out; + +out_close: + close(fd); + close(fdv); +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); + if (data) + free(data); + 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 + * \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, + 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) + return -EINVAL; + + end_of_loop = false; + while (!end_of_loop) { + int start_index = 0; + int end_index = 0; int i; char *endptr = NULL; @@ -1974,14 +2319,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; @@ -1990,15 +2342,19 @@ static int parse_targets(__u32 *tgts, int size, int offset, char *arg) offset = nr; rc = 0; } - if (!end_of_loop && ptr != NULL) + if (!end_of_loop && ptr) *ptr = ','; + if (!overstriped && pattern) + *pattern = LLAPI_LAYOUT_DEFAULT; + return rc < 0 ? rc : nr; } struct lfs_setstripe_args { unsigned long long lsa_comp_end; unsigned long long lsa_stripe_size; + unsigned long long lsa_extension_size; long long lsa_stripe_count; long long lsa_stripe_off; __u32 lsa_comp_flags; @@ -2007,6 +2363,7 @@ struct lfs_setstripe_args { unsigned int lsa_mirror_count; int lsa_nr_tgts; bool lsa_first_comp; + bool lsa_extension_comp; __u32 *lsa_tgts; char *lsa_pool_name; }; @@ -2060,7 +2417,6 @@ static inline bool setstripe_args_specified(struct lfs_setstripe_args *lsa) lsa->lsa_stripe_count != LLAPI_LAYOUT_DEFAULT || lsa->lsa_stripe_off != LLAPI_LAYOUT_DEFAULT || lsa->lsa_pattern != LLAPI_LAYOUT_RAID0 || - lsa->lsa_pool_name != NULL || lsa->lsa_comp_end != 0); } @@ -2080,21 +2436,27 @@ static int comp_args_to_layout(struct llapi_layout **composite, { struct llapi_layout *layout = *composite; uint64_t prev_end = 0; + uint64_t size; int i = 0, rc; - if (layout == NULL) { +new_comp: + if (!layout) { layout = llapi_layout_alloc(); - if (layout == NULL) { + if (!layout) { fprintf(stderr, "Alloc llapi_layout failed. %s\n", strerror(errno)); - return -ENOMEM; + errno = ENOMEM; + return -1; } *composite = layout; + lsa->lsa_first_comp = true; } else { uint64_t start; - /* Get current component extent, current component - * must be the tail component. */ + /* + * Get current component extent, current component + * must be the tail component. + */ rc = llapi_layout_comp_extent_get(layout, &start, &prev_end); if (rc) { fprintf(stderr, "Get comp extent failed. %s\n", @@ -2102,81 +2464,119 @@ static int comp_args_to_layout(struct llapi_layout **composite, return rc; } - if (lsa->lsa_first_comp) + if (lsa->lsa_first_comp) { prev_end = 0; - - if (lsa->lsa_first_comp) rc = llapi_layout_add_first_comp(layout); - else + } 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_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 (set_extent) { + uint64_t comp_end = lsa->lsa_comp_end; + + /* + * The extendable component is 0-length, so it can be removed + * if there is insufficient space to extend it. + */ + if (lsa->lsa_extension_comp) + comp_end = prev_end; + rc = llapi_layout_comp_extent_set(layout, prev_end, - lsa->lsa_comp_end); + comp_end); if (rc) { - fprintf(stderr, "Set extent [%lu, %llu) failed. %s\n", - prev_end, lsa->lsa_comp_end, strerror(errno)); + fprintf(stderr, "Set extent [%lu, %lu) failed. %s\n", + prev_end, comp_end, strerror(errno)); return rc; } } + /* reset lsa_first_comp */ + lsa->lsa_first_comp = false; /* Data-on-MDT component setting */ if (lsa->lsa_pattern == LLAPI_LAYOUT_MDT) { - /* In case of Data-on-MDT patterns the only extra option - * applicable is stripe size option. */ + /* + * In case of Data-on-MDT patterns the only extra option + * applicable is stripe size option. + */ if (lsa->lsa_stripe_count != LLAPI_LAYOUT_DEFAULT) { - fprintf(stderr, "Option 'stripe-count' can't be " - "specified with Data-on-MDT component: %lld\n", + fprintf(stderr, + "Option 'stripe-count' can't be specified with Data-on-MDT component: %lld\n", lsa->lsa_stripe_count); - return -EINVAL; + errno = EINVAL; + return -1; } if (lsa->lsa_stripe_size != LLAPI_LAYOUT_DEFAULT) { - fprintf(stderr, "Option 'stripe-size' can't be " - "specified with Data-on-MDT component: %llu\n", + fprintf(stderr, + "Option 'stripe-size' can't be specified with Data-on-MDT component: %llu\n", lsa->lsa_stripe_size); - return -EINVAL; + errno = EINVAL; + return -1; } if (lsa->lsa_nr_tgts != 0) { - fprintf(stderr, "Option 'ost-list' can't be specified " - "with Data-on-MDT component: '%i'\n", + fprintf(stderr, + "Option 'ost-list' can't be specified with Data-on-MDT component: '%i'\n", lsa->lsa_nr_tgts); - return -EINVAL; + errno = EINVAL; + return -1; } if (lsa->lsa_stripe_off != LLAPI_LAYOUT_DEFAULT) { - fprintf(stderr, "Option 'stripe-offset' can't be " - "specified with Data-on-MDT component: %lld\n", + fprintf(stderr, + "Option 'stripe-offset' can't be specified with Data-on-MDT component: %lld\n", lsa->lsa_stripe_off); - return -EINVAL; + errno = EINVAL; + return -1; } if (lsa->lsa_pool_name != 0) { - fprintf(stderr, "Option 'pool' can't be specified " - "with Data-on-MDT component: '%s'\n", + fprintf(stderr, + "Option 'pool' can't be specified with Data-on-MDT component: '%s'\n", lsa->lsa_pool_name); - return -EINVAL; + errno = EINVAL; + return -1; } 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)); + lsa->lsa_pattern, + strerror(errno)); return rc; } /* 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); + size = lsa->lsa_comp_flags & LCME_FL_EXTENSION ? + lsa->lsa_extension_size : lsa->lsa_stripe_size; + + if (lsa->lsa_comp_flags & LCME_FL_EXTENSION) + rc = llapi_layout_extension_size_set(layout, size); + else + rc = llapi_layout_stripe_size_set(layout, size); + if (rc) { - fprintf(stderr, "Set stripe size %llu failed: %s\n", - lsa->lsa_stripe_size, strerror(errno)); + fprintf(stderr, "Set stripe size %lu failed: %s\n", + size, strerror(errno)); return rc; } @@ -2187,14 +2587,7 @@ 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) { + if (lsa->lsa_pool_name) { rc = llapi_layout_pool_name_set(layout, lsa->lsa_pool_name); if (rc) { fprintf(stderr, "Set pool name: %s failed. %s\n", @@ -2216,8 +2609,10 @@ static int comp_args_to_layout(struct llapi_layout **composite, lsa->lsa_stripe_count != LLAPI_LAYOUT_WIDE && 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; + lsa->lsa_stripe_count, + lsa->lsa_nr_tgts); + errno = EINVAL; + return -1; } for (i = 0; i < lsa->lsa_nr_tgts; i++) { rc = llapi_layout_ost_index_set(layout, i, @@ -2235,7 +2630,14 @@ static int comp_args_to_layout(struct llapi_layout **composite, return rc; } - return 0; + /* Create the second, virtual component of extension space */ + if (lsa->lsa_extension_comp) { + lsa->lsa_comp_flags |= LCME_FL_EXTENSION; + lsa->lsa_extension_comp = false; + goto new_comp; + } + + return rc; } static int build_component(struct llapi_layout **layout, @@ -2262,26 +2664,78 @@ static int build_component(struct llapi_layout **layout, return rc; } +static int build_prev_component(struct llapi_layout **layout, + struct lfs_setstripe_args *prev, + struct lfs_setstripe_args *lsa, + bool set_extent) +{ + int extension = lsa->lsa_comp_flags & LCME_FL_EXTENSION; + int rc; + + if (prev->lsa_stripe_size) { + if (extension) { + prev->lsa_comp_end = lsa->lsa_comp_end; + prev->lsa_extension_size = lsa->lsa_extension_size; + prev->lsa_extension_comp = true; + } + + rc = build_component(layout, prev, true); + if (rc) + return rc; + } + + /* + * Copy lsa to previous lsa; + * if this is an extension component, make the previous invalid; + */ + if (extension) + prev->lsa_stripe_size = 0; + else + *prev = *lsa; + + return 0; +} + static int build_layout_from_yaml_node(struct cYAML *node, struct llapi_layout **layout, struct lfs_setstripe_args *lsa, - __u32 *osts) + struct lfs_setstripe_args *prevp) { + struct lfs_setstripe_args prev = { 0 }; + __u32 *osts = lsa->lsa_tgts; char *string; int rc = 0; + if (!prevp) + prevp = &prev; + while (node) { + string = node->cy_string; + if (node->cy_type == CYAML_TYPE_OBJECT) { /* go deep to sub blocks */ + if (string && !strncmp(string, "component", 9) && + strncmp(string, "component0", 10) && + strncmp(string, "components", 10)) { + rc = build_prev_component(layout, prevp, lsa, + true); + if (rc) + return rc; + + /* initialize lsa. */ + setstripe_args_init(lsa); + lsa->lsa_first_comp = false; + lsa->lsa_tgts = osts; + } + rc = build_layout_from_yaml_node(node->cy_child, layout, - lsa, osts); + lsa, prevp); if (rc) return rc; } else { - if (node->cy_string == NULL) + if (!node->cy_string) return -EINVAL; - string = node->cy_string; /* skip leading lmm_ if present, to simplify parsing */ if (strncmp(string, "lmm_", 4) == 0) string += 4; @@ -2296,13 +2750,18 @@ 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 + /* + * Only template flags have meaning in * the layout for a new file */ lsa->lsa_comp_flags &= LCME_TEMPLATE_FLAGS; @@ -2311,18 +2770,8 @@ static int build_layout_from_yaml_node(struct cYAML *node, 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; @@ -2332,6 +2781,9 @@ static int build_layout_from_yaml_node(struct cYAML *node, lsa->lsa_stripe_count = node->cy_valueint; } else if (!strcmp(string, "stripe_size")) { lsa->lsa_stripe_size = node->cy_valueint; + } else if (!strcmp(string, "extension_size")) { + lsa->lsa_extension_size = node->cy_valueint; + lsa->lsa_extension_comp = true; } else if (!strcmp(string, "stripe_offset")) { lsa->lsa_stripe_off = node->cy_valueint; } else if (!strcmp(string, "l_ost_idx")) { @@ -2343,6 +2795,15 @@ static int build_layout_from_yaml_node(struct cYAML *node, node = node->cy_next; } + if (prevp == &prev) { + rc = build_prev_component(layout, prevp, lsa, true); + if (rc) + return rc; + + if (!(lsa->lsa_comp_flags & LCME_FL_EXTENSION)) + rc = build_component(layout, lsa, *layout != NULL); + } + return rc; } @@ -2370,13 +2831,11 @@ static int lfs_comp_create_from_yaml(char *template, setstripe_args_init(lsa); lsa->lsa_tgts = osts; - rc = build_layout_from_yaml_node(tree, layout, lsa, osts); + rc = build_layout_from_yaml_node(tree, layout, lsa, NULL); 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); @@ -2387,53 +2846,64 @@ err: 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. */ -static int adjust_first_extent(char *fname, struct llapi_layout *layout) +/** + * Get the extension size from the next (SEL) component and extend the + * current component on it. The start of the next component is to be + * adjusted as well. + * + * \param[in] layout the current layout + * \param[in] start the start of the current component + * \param[in,out] end the end of the current component + * \param[in] offset the offset to adjust the end position to instead of + * extension size + * + * \retval 0 - extended successfully + * \retval < 0 - error + */ +static int layout_extend_comp(struct llapi_layout *layout, + uint64_t start, uint64_t *end, + uint64_t offset) { - struct llapi_layout *head; - uint64_t start, end, stripe_size, prev_end = 0; + uint64_t size, next_start, next_end; int rc; - if (layout == NULL) { + rc = llapi_layout_comp_use(layout, LLAPI_LAYOUT_COMP_USE_NEXT); + if (rc < 0) { fprintf(stderr, - "%s setstripe: layout must be specified\n", - progname); - return -EINVAL; + "%s setstripe: cannot move component cursor: %s\n", + progname, strerror(errno)); + return rc; } - errno = 0; - head = llapi_layout_get_by_path(fname, 0); - if (head == NULL) { + /* + * Even if the @size will not be used below, this will fail if + * this is not a SEL component - a good confirmation we are + * working on right components. + */ + rc = llapi_layout_extension_size_get(layout, &size); + if (rc < 0) { fprintf(stderr, - "%s setstripe: cannot read layout from '%s': %s\n", - progname, fname, strerror(errno)); - return -EINVAL; - } else if (errno == ENODATA) { - /* file without LOVEA, this component-add will be turned - * into a component-create. */ - llapi_layout_free(head); - return -ENODATA; - } else if (!llapi_layout_is_composite(head)) { - fprintf(stderr, "%s setstripe: '%s' not a composite file\n", - progname, fname); - llapi_layout_free(head); - return -EINVAL; + "%s setstripe: cannot get component ext size: %s\n", + progname, strerror(errno)); + return rc; } - rc = llapi_layout_comp_extent_get(head, &start, &prev_end); + rc = llapi_layout_comp_extent_get(layout, &next_start, &next_end); if (rc) { - fprintf(stderr, "%s setstripe: cannot get prev extent: %s\n", + fprintf(stderr, "%s setstripe: cannot get extent: %s\n", progname, strerror(errno)); - llapi_layout_free(head); return rc; } - llapi_layout_free(head); + next_start += offset ?: size; + rc = llapi_layout_comp_extent_set(layout, next_start, next_end); + if (rc) { + fprintf(stderr, "%s setstripe: cannot set extent: %s\n", + progname, strerror(errno)); + return rc; + } - /* Make sure we use the first component of the layout to be added. */ - rc = llapi_layout_comp_use(layout, LLAPI_LAYOUT_COMP_USE_FIRST); + rc = llapi_layout_comp_use(layout, LLAPI_LAYOUT_COMP_USE_PREV); if (rc < 0) { fprintf(stderr, "%s setstripe: cannot move component cursor: %s\n", @@ -2441,32 +2911,107 @@ static int adjust_first_extent(char *fname, struct llapi_layout *layout) return rc; } - rc = llapi_layout_comp_extent_get(layout, &start, &end); + *end += offset ?: size; + rc = llapi_layout_comp_extent_set(layout, start, *end); if (rc) { - fprintf(stderr, "%s setstripe: cannot get extent: %s\n", + fprintf(stderr, "%s setstripe: cannot set extent: %s\n", progname, strerror(errno)); return rc; } - if (start > prev_end || end <= prev_end) { + return 0; +} + +/** + * 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. + * + * In the create mode, we need to check if the first component is an extendable + * SEL component and extend its length to the extension size (first component + * of the PFL file is initialised at the create time, cannot be 0-lenght. + */ +static int layout_adjust_first_extent(char *fname, struct llapi_layout *layout, + bool comp_add) +{ + struct llapi_layout *head; + uint64_t start = 0, prev_end = 0; + uint64_t end; + int rc, ret = 0; + + if (!layout || !(comp_add || llapi_layout_is_composite(layout))) + return 0; + + errno = 0; + while (comp_add) { + head = llapi_layout_get_by_path(fname, 0); + if (!head) { + fprintf(stderr, + "%s setstripe: cannot read layout from '%s': %s\n", + progname, fname, strerror(errno)); + return -EINVAL; + } else if (errno == ENODATA) { + /* + * file without LOVEA, this component-add will be turned + * into a component-create. + */ + llapi_layout_free(head); + ret = -ENODATA; + + /* + * the new layout will be added to an empty one, it + * still needs to be adjusted below + */ + comp_add = 0; + break; + } else if (!llapi_layout_is_composite(head)) { + fprintf(stderr, + "%s setstripe: '%s' not a composite file\n", + progname, fname); + llapi_layout_free(head); + return -EINVAL; + } + + rc = llapi_layout_comp_extent_get(head, &start, &prev_end); + if (rc) { + fprintf(stderr, + "%s setstripe: cannot get prev extent: %s\n", + progname, strerror(errno)); + llapi_layout_free(head); + return rc; + } + + llapi_layout_free(head); + break; + } + + /* Make sure we use the first component of the layout to be added. */ + rc = llapi_layout_comp_use(layout, LLAPI_LAYOUT_COMP_USE_FIRST); + if (rc < 0) { fprintf(stderr, - "%s setstripe: first extent [%lu, %lu) not adjacent with extent end %lu\n", - progname, start, end, prev_end); - return -EINVAL; + "%s setstripe: cannot move component cursor: %s\n", + progname, strerror(errno)); + return rc; } - rc = llapi_layout_stripe_size_get(layout, &stripe_size); + rc = llapi_layout_comp_extent_get(layout, &start, &end); if (rc) { - fprintf(stderr, "%s setstripe: cannot get stripe size: %s\n", + fprintf(stderr, "%s setstripe: cannot get extent: %s\n", progname, strerror(errno)); return rc; } - if (stripe_size != LLAPI_LAYOUT_DEFAULT && - (prev_end & (stripe_size - 1))) { + if (start == 0 && end == 0) { + rc = layout_extend_comp(layout, start, &end, + comp_add ? prev_end : 0); + if (rc) + return rc; + } + + if (start > prev_end || end < prev_end) { fprintf(stderr, - "%s setstripe: stripe size %lu not aligned with %lu\n", - progname, stripe_size, prev_end); + "%s setstripe: first extent [%lu, %lu) not adjacent with extent end %lu\n", + progname, start, end, prev_end); return -EINVAL; } @@ -2478,7 +3023,24 @@ static int adjust_first_extent(char *fname, struct llapi_layout *layout) return rc; } - return 0; + return ret; +} + +static int mirror_adjust_first_extents(struct mirror_args *list) +{ + int rc = 0; + + if (!list) + return 0; + + while (list) { + rc = layout_adjust_first_extent(NULL, list->m_layout, false); + if (rc) + break; + list = list->m_next; + } + + return rc; } static inline bool arg_is_eof(char *arg) @@ -2500,8 +3062,10 @@ static struct mirror_args *lfs_mirror_alloc(void) while (1) { mirror = calloc(1, sizeof(*mirror)); - if (mirror != NULL) + if (mirror) { + mirror->m_inherit = false; break; + } sleep(1); } @@ -2521,7 +3085,7 @@ static struct mirror_args *lfs_mirror_alloc(void) */ static void lfs_mirror_free(struct mirror_args *mirror) { - if (mirror->m_layout != NULL) + if (mirror->m_layout) llapi_layout_free(mirror->m_layout); free(mirror); } @@ -2538,7 +3102,7 @@ static void lfs_mirror_list_free(struct mirror_args *mirror_list) { struct mirror_args *next_mirror = NULL; - while (mirror_list != NULL) { + while (mirror_list) { next_mirror = mirror_list->m_next; lfs_mirror_free(mirror_list); mirror_list = next_mirror; @@ -2555,11 +3119,14 @@ 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, + LFS_NEWERXY_OPT, }; /* functions */ @@ -2581,6 +3148,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 }; @@ -2601,12 +3169,19 @@ 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 }, */ /* find { .val = 'A', .name = "atime", .has_arg = required_argument }*/ /* --block is only valid in migrate mode */ { .val = 'b', .name = "block", .has_arg = no_argument }, +/* find { .val = 'B', .name = "btime", .has_arg = required_argument }*/ { .val = LFS_COMP_ADD_OPT, .name = "comp-add", .has_arg = no_argument }, { .val = LFS_COMP_ADD_OPT, @@ -2627,16 +3202,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 */ @@ -2654,6 +3234,7 @@ static int lfs_setstripe_internal(int argc, char **argv, { .val = 'i', .name = "stripe_index", .has_arg = required_argument}, { .val = 'I', .name = "comp-id", .has_arg = required_argument}, { .val = 'I', .name = "component-id", .has_arg = required_argument}, +/* find { .val = 'l', .name = "lazy", .has_arg = no_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}, @@ -2679,19 +3260,28 @@ 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 }, + { .val = 'z', .name = "ext-size", .has_arg = required_argument}, + { .val = 'z', .name = "extension-size", .has_arg = required_argument}, { .name = NULL } }; setstripe_args_init(&lsa); migrate_mode = (opc == SO_MIGRATE); mirror_mode = (opc == SO_MIRROR_CREATE || opc == SO_MIRROR_EXTEND); + setstripe_mode = (opc == SO_SETSTRIPE); + if (opc == SO_MIRROR_DELETE) { + delete = 1; + mirror_flags = MF_DESTROY; + } 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:z:", + long_opts, NULL)) >= 0) { + size_units = 1; switch (c) { case 0: /* Long options. */ @@ -2708,18 +3298,11 @@ static int lfs_setstripe_internal(int argc, char **argv, if (result != 0) goto usage_error; if (mirror_mode && lsa.lsa_comp_neg_flags) { - fprintf(stderr, "%s: inverted flags are not supported\n", - progname); - goto usage_error; - } - 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", + "%s: inverted flags are not supported\n", progname); - result = -EINVAL; - goto error; + goto usage_error; } - break; case LFS_COMP_SET_OPT: comp_set = 1; @@ -2736,27 +3319,41 @@ 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", + 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); + &neg_flags); if (result != 0) goto usage_error; - if (flags) { - fprintf(stderr, "%s: inverted flags are not supported\n", + if (neg_flags) { + fprintf(stderr, + "%s: inverted flags are not supported\n", progname); result = -EINVAL; goto usage_error; } - if (last_mirror->m_flags & ~LCME_USER_FLAGS) { + if (last_mirror->m_flags & ~LCME_USER_MIRROR_FLAGS) { fprintf(stderr, "%s: unsupported mirror flags: %s\n", progname, optarg); @@ -2765,6 +3362,37 @@ static int lfs_setstripe_internal(int argc, char **argv, } break; } + case LFS_LAYOUT_FOREIGN_OPT: + if (optarg) { + /* 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) { + 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; @@ -2778,6 +3406,15 @@ static int lfs_setstripe_internal(int argc, char **argv, } migration_block = true; break; + case 'C': + if (lsa.lsa_pattern == LLAPI_LAYOUT_MDT) { + fprintf(stderr, + "%s %s: -C|--overstripe-count incompatible with DoM layout\n", + progname, argv[0]); + goto usage_error; + } + lsa.lsa_pattern = LLAPI_LAYOUT_OVERSTRIPING; + /* fall through */ case 'c': lsa.lsa_stripe_count = strtoul(optarg, &end, 0); if (*end != '\0') { @@ -2806,8 +3443,7 @@ static int lfs_setstripe_internal(int argc, char **argv, case 'D': if (!migrate_mode) { fprintf(stderr, - "%s %s: -D|--non-direct is valid " - "only for migrate command\n", + "%s %s: -D|--non-direct is valid only for migrate command\n", progname, argv[0]); goto usage_error; } @@ -2817,9 +3453,8 @@ static int lfs_setstripe_internal(int argc, char **argv, if (lsa.lsa_comp_end != 0) { result = comp_args_to_layout(lpp, &lsa, true); if (result) { - fprintf(stderr, - "%s %s: invalid layout\n", - progname, argv[0]); + fprintf(stderr, "%s: invalid layout\n", + progname); goto usage_error; } @@ -2842,7 +3477,8 @@ static int lfs_setstripe_internal(int argc, char **argv, break; case 'H': if (!migrate_mode) { - fprintf(stderr, "--mdt-hash is valid only for migrate command\n"); + fprintf(stderr, + "--mdt-hash is valid only for migrate command\n"); return CMD_HELP; } @@ -2883,7 +3519,7 @@ static int lfs_setstripe_internal(int argc, char **argv, goto usage_error; } if (opc == SO_MIRROR_EXTEND) { - if (last_mirror == NULL) { + if (!last_mirror) { fprintf(stderr, "error: %s: '-N' must exist in front of '%s'\n", progname, argv[optopt + 1]); @@ -2893,7 +3529,7 @@ static int lfs_setstripe_internal(int argc, char **argv, last_mirror->m_count = 1; } else { /* mirror split */ - if (mirror_list == NULL) + if (!mirror_list) mirror_list = lfs_mirror_alloc(); mirror_list->m_file = optarg; } @@ -2902,24 +3538,24 @@ static int lfs_setstripe_internal(int argc, char **argv, case 'L': if (strcmp(argv[optind - 1], "mdt") == 0) { /* Can be only the first component */ - if (layout != NULL) { + if (layout) { result = -EINVAL; - fprintf(stderr, "error: 'mdt' layout " - "can be only the first one\n"); + fprintf(stderr, + "error: 'mdt' layout can be only the first one\n"); goto error; } if (lsa.lsa_comp_end > (1ULL << 30)) { /* 1Gb */ result = -EFBIG; - fprintf(stderr, "error: 'mdt' layout " - "size is too big\n"); + fprintf(stderr, + "error: 'mdt' layout size is too big\n"); goto error; } lsa.lsa_pattern = LLAPI_LAYOUT_MDT; } else if (strcmp(argv[optind - 1], "raid0") != 0) { result = -EINVAL; - fprintf(stderr, "error: layout '%s' is " - "unknown, supported layouts are: " - "'mdt', 'raid0'\n", argv[optind]); + fprintf(stderr, + "error: layout '%s' is unknown, supported layouts are: 'mdt', 'raid0'\n", + argv[optind]); goto error; } break; @@ -2933,7 +3569,7 @@ static int lfs_setstripe_internal(int argc, char **argv, 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", @@ -2960,7 +3596,7 @@ static int lfs_setstripe_internal(int argc, char **argv, mirror_mode = true; } mirror_count = 1; - if (optarg != NULL) { + if (optarg) { mirror_count = strtoul(optarg, &end, 0); if (*end != '\0' || mirror_count == 0) { fprintf(stderr, @@ -2974,11 +3610,13 @@ static int lfs_setstripe_internal(int argc, char **argv, new_mirror = lfs_mirror_alloc(); new_mirror->m_count = mirror_count; - if (mirror_list == NULL) + if (!mirror_list) mirror_list = new_mirror; - if (last_mirror != NULL) { + if (last_mirror) { /* wrap up last mirror */ + if (!setstripe_args_specified(&lsa)) + last_mirror->m_inherit = true; if (lsa.lsa_comp_end == 0) lsa.lsa_comp_end = LUSTRE_EOF; @@ -2999,12 +3637,25 @@ static int lfs_setstripe_internal(int argc, char **argv, case 'o': #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"); + fprintf(stderr, + "warning: '--ost-list' is deprecated, use '--ost' instead\n"); #endif + if (lsa.lsa_pattern == LLAPI_LAYOUT_MDT) { + fprintf(stderr, + "%s %s: -o|--ost incompatible with DoM layout\n", + progname, argv[0]); + goto usage_error; + } + /* + * -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", @@ -3017,7 +3668,7 @@ static int lfs_setstripe_internal(int argc, char **argv, lsa.lsa_stripe_off = tgts[0]; break; case 'p': - if (optarg == NULL) + if (!optarg) goto usage_error; lsa.lsa_pool_name = optarg; @@ -3046,10 +3697,26 @@ static int lfs_setstripe_internal(int argc, char **argv, migrate_mdt_param.fp_verbose = VERBOSE_DETAIL; migration_flags = MIGRATION_VERBOSE; break; + case 'x': + xattr = optarg; + break; case 'y': from_yaml = true; template = optarg; break; + case 'z': + result = llapi_parse_size(optarg, + &lsa.lsa_extension_size, + &size_units, 0); + if (result) { + fprintf(stderr, + "%s %s: invalid extension size '%s'\n", + progname, argv[0], optarg); + goto usage_error; + } + + lsa.lsa_extension_comp = true; + break; default: fprintf(stderr, "%s %s: unrecognized option '%s'\n", progname, argv[0], argv[optind - 1]); @@ -3065,6 +3732,35 @@ static int lfs_setstripe_internal(int argc, char **argv, goto usage_error; } + /* lfs migrate $filename should keep the file's layout by default */ + if (migrate_mode && !setstripe_args_specified(&lsa) && !layout && + !from_yaml) + from_copy = true; + + 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", @@ -3074,14 +3770,20 @@ static int lfs_setstripe_internal(int argc, char **argv, } if (mirror_mode) { + if (!setstripe_args_specified(&lsa)) + last_mirror->m_inherit = true; if (lsa.lsa_comp_end == 0) lsa.lsa_comp_end = LUSTRE_EOF; } if (lsa.lsa_comp_end != 0) { result = comp_args_to_layout(lpp, &lsa, true); - if (result) + if (result) { + fprintf(stderr, "error: %s: invalid layout\n", + progname); + result = -EINVAL; goto error; + } } if (mirror_flags & MF_NO_VERIFY) { @@ -3100,11 +3802,9 @@ static int lfs_setstripe_internal(int argc, char **argv, } } - /* 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 && !comp_id) { - fprintf(stderr, "%s %s: --component-set doesn't have component-id set\n", + fprintf(stderr, + "%s %s: --component-set doesn't have component-id set\n", progname, argv[0]); goto usage_error; } @@ -3151,26 +3851,20 @@ static int lfs_setstripe_internal(int argc, char **argv, } if (mirror_mode) { - fprintf(stderr, "error: %s: can't use --component-add " - "or --component-del for mirror operation\n", + fprintf(stderr, + "error: %s: can't use --component-add or --component-del for mirror operation\n", progname); goto usage_error; } } if (comp_add) { - if (layout == NULL) { + if (!layout) { fprintf(stderr, "%s %s: option -E must be specified with --component-add\n", progname, argv[0]); goto usage_error; } - - result = adjust_first_extent(fname, layout); - if (result == -ENODATA) - comp_add = 0; - else if (result != 0) - goto error; } if (from_yaml && from_copy) { @@ -3182,8 +3876,8 @@ static int lfs_setstripe_internal(int argc, char **argv, 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", + fprintf(stderr, + "error: %s: can't specify --yaml or --copy with -c, -S, -i, -o, -p or -E options.\n", argv[0]); goto error; } @@ -3195,11 +3889,11 @@ static int lfs_setstripe_internal(int argc, char **argv, goto usage_error; } - if (!comp_del && !comp_set && (opc != SO_MIRROR_SPLIT) && - comp_id != 0) { + if (!comp_del && !comp_set && opc != SO_MIRROR_SPLIT && + opc != SO_MIRROR_DELETE && comp_id != 0) { fprintf(stderr, - "%s %s: option -I can only be used with --component-del or --component-set or lfs mirror split\n", - progname, argv[0]); + "%s: option -I can only be used with --component-del or --component-set or lfs mirror split\n", + progname); goto usage_error; } @@ -3229,10 +3923,12 @@ static int lfs_setstripe_internal(int argc, char **argv, if (lsa.lsa_pattern != LLAPI_LAYOUT_RAID0) lmu->lum_hash_type = lsa.lsa_pattern; else - lmu->lum_hash_type = LMV_HASH_TYPE_FNV_1A_64; - if (lsa.lsa_pool_name) + lmu->lum_hash_type = LMV_HASH_TYPE_UNKNOWN; + 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); + lmu->lum_pool_name[sizeof(lmu->lum_pool_name) - 1] = 0; + } if (lsa.lsa_nr_tgts > 1) { int i; @@ -3242,7 +3938,7 @@ static int lfs_setstripe_internal(int argc, char **argv, fprintf(stderr, "error: %s: stripe count %lld doesn't match the number of MDTs: %d\n", progname, lsa.lsa_stripe_count, - lsa.lsa_nr_tgts); + lsa.lsa_nr_tgts); free(lmu); goto usage_error; } @@ -3257,11 +3953,11 @@ static int lfs_setstripe_internal(int argc, char **argv, migrate_mdt_param.fp_lmv_md = lmu; migrate_mdt_param.fp_migrate = 1; - } else if (layout == NULL) { + } else if (!layout) { /* initialize stripe parameters */ param = calloc(1, offsetof(typeof(*param), lsp_osts[lsa.lsa_nr_tgts])); - if (param == NULL) { + if (!param) { fprintf(stderr, "%s %s: cannot allocate memory for parameters: %s\n", progname, argv[0], strerror(ENOMEM)); @@ -3281,6 +3977,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) { @@ -3288,9 +3992,9 @@ static int lfs_setstripe_internal(int argc, char **argv, lsa.lsa_stripe_count != LLAPI_LAYOUT_DEFAULT && lsa.lsa_stripe_count != LLAPI_LAYOUT_WIDE && 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, + 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_tgts); free(param); goto usage_error; @@ -3308,22 +4012,39 @@ static int lfs_setstripe_internal(int argc, char **argv, result = lfs_comp_create_from_yaml(template, &layout, &lsa, tgts); if (result) { - fprintf(stderr, "error: %s: can't create composite " - "layout from template file %s\n", + 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); + } + + if (layout != NULL || mirror_list != NULL) { + if (mirror_list) + result = mirror_adjust_first_extents(mirror_list); + else + result = layout_adjust_first_extent(fname, layout, + comp_add); + if (result == -ENODATA) + comp_add = 0; + else if (result != 0) { + fprintf(stderr, "error: %s: invalid layout\n", + progname); goto error; } } for (fname = argv[optind]; fname != NULL; fname = argv[++optind]) { + if (from_copy) { + layout = llapi_layout_get_by_path(template ?: fname, 0); + if (!layout) { + fprintf(stderr, + "%s: can't create composite layout from file %s.\n", + progname, template ?: fname); + goto error; + } + } + if (migrate_mdt_mode) { result = llapi_migrate_mdt(fname, &migrate_mdt_param); } else if (migrate_mode) { @@ -3344,23 +4065,33 @@ static int lfs_setstripe_internal(int argc, char **argv, } 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) { + } else if (opc == SO_MIRROR_SPLIT || opc == SO_MIRROR_DELETE) { + if (!mirror_id && !comp_id && !lsa.lsa_pool_name) { fprintf(stderr, - "%s %s: no mirror id or component id is specified\n", - progname, argv[0]); + "%s: no mirror specified to delete from '%s'\n", + progname, fname); goto usage_error; } - if (mirror_id != 0) + if (lsa.lsa_pool_name) + mirror_flags |= MF_COMP_POOL; + else if (mirror_id != 0) comp_id = mirror_id; else mirror_flags |= MF_COMP_ID; - result = mirror_split(fname, comp_id, mirror_flags, + result = mirror_split(fname, comp_id, lsa.lsa_pool_name, + mirror_flags, has_m_file ? mirror_list->m_file : NULL); - } else if (layout != NULL) { + } else if (layout) { 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; @@ -3368,7 +4099,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; @@ -3382,6 +4113,9 @@ static int lfs_setstripe_internal(int argc, char **argv, } } + if (mode_opt) + umask(previous_umask); + free(param); free(migrate_mdt_param.fp_lmv_md); llapi_layout_free(layout); @@ -3397,17 +4131,19 @@ error: static int lfs_poollist(int argc, char **argv) { - if (argc != 2) - return CMD_HELP; + if (argc != 2) + return CMD_HELP; - return llapi_poollist(argv[1]); + 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; @@ -3417,23 +4153,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; } @@ -3442,7 +4203,7 @@ static int name2uid(unsigned int *id, const char *name) struct passwd *passwd; passwd = getpwnam(name); - if (passwd == NULL) + if (!passwd) return -ENOENT; *id = passwd->pw_uid; @@ -3454,7 +4215,7 @@ static int name2gid(unsigned int *id, const char *name) struct group *group; group = getgrnam(name); - if (group == NULL) + if (!group) return -ENOENT; *id = group->gr_gid; @@ -3471,7 +4232,7 @@ static int uid2name(char **name, unsigned int id) struct passwd *passwd; passwd = getpwuid(id); - if (passwd == NULL) + if (!passwd) return -ENOENT; *name = passwd->pw_name; @@ -3483,7 +4244,7 @@ static inline int gid2name(char **name, unsigned int id) struct group *group; group = getgrgid(id); - if (group == NULL) + if (!group) return -ENOENT; *name = group->gr_name; @@ -3497,7 +4258,7 @@ static int name2layout(__u32 *layout, char *name) *layout = 0; for (ptr = name; ; ptr = NULL) { layout_name = strtok(ptr, ","); - if (layout_name == NULL) + if (!layout_name) break; if (strcmp(layout_name, "released") == 0) *layout |= LOV_PATTERN_F_RELEASED; @@ -3505,6 +4266,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; } @@ -3519,10 +4282,13 @@ 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[] = { + struct option long_opts[] = { { .val = 'A', .name = "atime", .has_arg = required_argument }, { .val = 'b', .name = "blocks", .has_arg = required_argument }, + { .val = 'B', .name = "btime", .has_arg = required_argument }, + { .val = 'B', .name = "Btime", .has_arg = required_argument }, { .val = LFS_COMP_COUNT_OPT, .name = "comp-count", .has_arg = required_argument }, { .val = LFS_COMP_COUNT_OPT, @@ -3540,6 +4306,60 @@ 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 = LFS_NEWERXY_OPT, + .name = "newer", .has_arg = required_argument}, + { .val = LFS_NEWERXY_OPT, + .name = "neweraa", .has_arg = required_argument}, + { .val = LFS_NEWERXY_OPT, + .name = "neweram", .has_arg = required_argument}, + { .val = LFS_NEWERXY_OPT, + .name = "newerac", .has_arg = required_argument}, + { .val = LFS_NEWERXY_OPT, + .name = "newerab", .has_arg = required_argument}, + { .val = LFS_NEWERXY_OPT, + .name = "newerma", .has_arg = required_argument}, + { .val = LFS_NEWERXY_OPT, + .name = "newermm", .has_arg = required_argument}, + { .val = LFS_NEWERXY_OPT, + .name = "newermc", .has_arg = required_argument}, + { .val = LFS_NEWERXY_OPT, + .name = "newermb", .has_arg = required_argument}, + { .val = LFS_NEWERXY_OPT, + .name = "newerca", .has_arg = required_argument}, + { .val = LFS_NEWERXY_OPT, + .name = "newercm", .has_arg = required_argument}, + { .val = LFS_NEWERXY_OPT, + .name = "newercc", .has_arg = required_argument}, + { .val = LFS_NEWERXY_OPT, + .name = "newercb", .has_arg = required_argument}, + { .val = LFS_NEWERXY_OPT, + .name = "newerba", .has_arg = required_argument}, + { .val = LFS_NEWERXY_OPT, + .name = "newerbm", .has_arg = required_argument}, + { .val = LFS_NEWERXY_OPT, + .name = "newerbc", .has_arg = required_argument}, + { .val = LFS_NEWERXY_OPT, + .name = "newerbb", .has_arg = required_argument}, + { .val = LFS_NEWERXY_OPT, + .name = "newerBa", .has_arg = required_argument}, + { .val = LFS_NEWERXY_OPT, + .name = "newerBm", .has_arg = required_argument}, + { .val = LFS_NEWERXY_OPT, + .name = "newerBc", .has_arg = required_argument}, + { .val = LFS_NEWERXY_OPT, + .name = "newerBB", .has_arg = required_argument}, + { .val = LFS_NEWERXY_OPT, + .name = "newerat", .has_arg = required_argument}, + { .val = LFS_NEWERXY_OPT, + .name = "newermt", .has_arg = required_argument}, + { .val = LFS_NEWERXY_OPT, + .name = "newerct", .has_arg = required_argument}, + { .val = LFS_NEWERXY_OPT, + .name = "newerbt", .has_arg = required_argument}, + { .val = LFS_NEWERXY_OPT, + .name = "newerBt", .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 }, @@ -3549,12 +4369,15 @@ 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 }, { .val = 'i', .name = "stripe-index", .has_arg = required_argument }, { .val = 'i', .name = "stripe_index", .has_arg = required_argument }, /* getstripe { .val = 'I', .name = "comp-id", .has_arg = required_argument }*/ + { .val = 'l', .name = "lazy", .has_arg = no_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 }, @@ -3582,61 +4405,75 @@ 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 }, + { .val = 'z', .name = "extension-size", + .has_arg = required_argument }, + { .val = 'z', .name = "ext-size", .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; - int neg_opt = 0; - time_t *xtime; - int *xsign; - int isoption; - char *endptr; + int optidx = 0; + int pathstart = -1; + int pathend = -1; + int pathbad = -1; + int neg_opt = 0; + time_t *xtime; + int *xsign; + int isoption; + char *endptr; - time(&t); + time(&t); /* when getopt_long_only() hits '!' it returns 1, puts "!" in optarg */ while ((c = getopt_long_only(argc, argv, - "-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; - if (neg_opt) - --neg_opt; - /* '!' is part of option */ - /* when getopt_long_only() finds a string which is not - * an option nor a known option argument it returns 1 - * in that case if we already have found pathstart and pathend - * (i.e. we have the list of pathnames), - * the only supported value is "!" - */ - isoption = (c != 1) || (strcmp(optarg, "!") == 0); - if (!isoption && pathend != -1) { - fprintf(stderr, "err: %s: filename|dirname must either " - "precede options or follow options\n", - argv[0]); - ret = CMD_HELP; - goto err; - } - if (!isoption && pathstart == -1) - pathstart = optind - 1; - if (isoption && pathstart != -1 && pathend == -1) - pathend = optind - 2; - switch (c) { - case 0: - /* Long options. */ - break; - case 1: - /* unknown; opt is "!" or path component, - * checking done above. - */ - if (strcmp(optarg, "!") == 0) - neg_opt = 2; - break; + "-0A:b:B:c:C:D:E:g:G:H:i:L:m:M:n:N:O:Ppqrs:S:t:T:u:U:vz:", + long_opts, &optidx)) >= 0) { + xtime = NULL; + xsign = NULL; + if (neg_opt) + --neg_opt; + /* '!' is part of option */ + /* + * when getopt_long_only() finds a string which is not + * an option nor a known option argument it returns 1 + * in that case if we already have found pathstart and pathend + * (i.e. we have the list of pathnames), + * the only supported value is "!" + */ + isoption = (c != 1) || (strcmp(optarg, "!") == 0); + if (!isoption && pathend != -1) { + fprintf(stderr, + "err: %s: filename|dirname must either precede options or follow options\n", + argv[0]); + ret = CMD_HELP; + goto err; + } + if (!isoption && pathstart == -1) + pathstart = optind - 1; + if (isoption && pathstart != -1 && pathend == -1) + pathend = optind - 2; + switch (c) { + case 0: + /* Long options. */ + break; + case 1: + /* + * unknown; opt is "!" or path component, + * checking done above. + */ + if (strcmp(optarg, "!") == 0) + neg_opt = 2; + break; case 'A': xtime = ¶m.fp_atime; xsign = ¶m.fp_asign; param.fp_exclude_atime = !!neg_opt; + /* no break, this falls through to 'B' for btime */ + case 'B': + if (c == 'B') { + xtime = ¶m.fp_btime; + xsign = ¶m.fp_bsign; + param.fp_exclude_btime = !!neg_opt; + } /* no break, this falls through to 'C' for ctime */ case 'C': if (c == 'C') { @@ -3651,8 +4488,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; } @@ -3690,8 +4527,9 @@ static int lfs_find(int argc, char **argv) param.fp_comp_count = strtoul(optarg, &endptr, 0); if (*endptr != '\0') { - fprintf(stderr, "error: bad component count " - "'%s'\n", optarg); + fprintf(stderr, + "error: bad component count '%s'\n", + optarg); goto err; } param.fp_check_comp_count = 1; @@ -3701,13 +4539,15 @@ static int lfs_find(int argc, char **argv) rc = comp_str2flags(optarg, ¶m.fp_comp_flags, ¶m.fp_comp_neg_flags); if (rc) { - fprintf(stderr, "error: bad component flags " - "'%s'\n", optarg); + fprintf(stderr, + "error: bad component flags '%s'\n", + optarg); goto err; } param.fp_check_comp_flags = 1; if (neg_opt) { __u32 flags = param.fp_comp_neg_flags; + param.fp_comp_neg_flags = param.fp_comp_flags; param.fp_comp_flags = flags; } @@ -3724,8 +4564,9 @@ static int lfs_find(int argc, char **argv) rc = llapi_parse_size(optarg, ¶m.fp_comp_start, ¶m.fp_comp_start_units, 0); if (rc) { - fprintf(stderr, "error: bad component start " - "'%s'\n", optarg); + fprintf(stderr, + "error: bad component start '%s'\n", + optarg); goto err; } param.fp_check_comp_start = 1; @@ -3743,30 +4584,32 @@ static int lfs_find(int argc, char **argv) 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] == '+') { + case 'c': + if (optarg[0] == '+') { param.fp_stripe_count_sign = -1; - optarg++; - } else if (optarg[0] == '-') { + optarg++; + } else if (optarg[0] == '-') { param.fp_stripe_count_sign = 1; - optarg++; - } + optarg++; + } param.fp_stripe_count = strtoul(optarg, &endptr, 0); - if (*endptr != '\0') { - fprintf(stderr,"error: bad stripe_count '%s'\n", - optarg); - ret = -1; - goto err; - } + if (*endptr != '\0') { + fprintf(stderr, + "error: bad stripe_count '%s'\n", + optarg); + ret = -1; + goto err; + } param.fp_check_stripe_count = 1; param.fp_exclude_stripe_count = !!neg_opt; - break; + break; case 'D': param.fp_max_depth = strtol(optarg, 0, 0); break; @@ -3789,28 +4632,200 @@ static int lfs_find(int argc, char **argv) ¶m.fp_comp_end_units, 0); } if (rc) { - fprintf(stderr, "error: bad component end " - "'%s'\n", optarg); + fprintf(stderr, + "error: bad component end '%s'\n", + optarg); goto err; } 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) { + /* 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 LFS_NEWERXY_OPT: { + char x = 'm'; + char y = 'm'; + int xidx; + int negidx; + time_t *newery; + time_t ref = time(NULL); + + /* no need to check bad options, they won't get here */ + if (strlen(long_opts[optidx].name) == 7) { + x = long_opts[optidx].name[5]; + y = long_opts[optidx].name[6]; + } + + if (y == 't') { + static const char *const fmts[] = { + "%Y-%m-%d %H:%M:%S", + "%Y-%m-%d %H:%M", + "%Y-%m-%d", + "%H:%M:%S", /* sometime today */ + "%H:%M", + "@%s", + "%s", + NULL }; + struct tm tm; + bool found = false; + int i; + + for (i = 0; fmts[i] != NULL; i++) { + char *ptr; + + /* Init for times relative to today */ + if (strncmp(fmts[i], "%H", 2) == 0) + localtime_r(&ref, &tm); + else + memset(&tm, 0, sizeof(tm)); + ptr = strptime(optarg, fmts[i], &tm); + /* Skip spaces */ + while (ptr && isspace(*ptr)) + ptr++; + if (ptr == optarg + strlen(optarg)) { + found = true; + break; + } + } + + if (!found) { + fprintf(stderr, + "%s: invalid time '%s'\n", + progname, optarg); + fprintf(stderr, + "supported formats are:\n "); + for (i = 0; fmts[i] != NULL; i++) + fprintf(stderr, "'%s', ", + fmts[i]); + fprintf(stderr, "\n"); + ret = -EINVAL; + goto err; + } + + ref = mktime(&tm); + } else if (y == 'b' || y == 'B') { + lstatx_t stx; + + rc = llapi_get_lum_file(optarg, NULL, &stx, + NULL, 0); + if (rc || !(stx.stx_mask & STATX_BTIME)) { + if (!(stx.stx_mask & STATX_BTIME)) + ret = -EOPNOTSUPP; + else + ret = -errno; + fprintf(stderr, + "%s: get btime failed '%s': %s\n", + progname, optarg, + strerror(-ret)); + goto err; + } + + ref = stx.stx_btime.tv_sec; + } else { + struct stat statbuf; + + if (stat(optarg, &statbuf) < 0) { + fprintf(stderr, + "%s: cannot stat file '%s': %s\n", + progname, optarg, + strerror(errno)); + ret = -errno; + goto err; + } + + switch (y) { + case 'a': + ref = statbuf.st_atime; + break; + case 'm': + ref = statbuf.st_mtime; + break; + case 'c': + ref = statbuf.st_ctime; + break; + default: + fprintf(stderr, + "%s: invalid Y argument: '%c'\n", + progname, x); + ret = -EINVAL; + goto err; + } + } + + switch (x) { + case 'a': + xidx = NEWERXY_ATIME; + break; + case 'm': + xidx = NEWERXY_MTIME; + break; + case 'c': + xidx = NEWERXY_CTIME; + break; + case 'b': + case 'B': + xidx = NEWERXY_BTIME; + break; + default: + fprintf(stderr, + "%s: invalid X argument: '%c'\n", + progname, x); + ret = -EINVAL; + goto err; + } + + negidx = !!neg_opt; + newery = ¶m.fp_newery[xidx][negidx]; + + if (*newery == 0) { + *newery = ref; + } else { + if (negidx) + *newery = *newery > ref ? ref : *newery; + else + *newery = *newery > ref ? *newery : ref; + } + param.fp_newerxy = 1; + break; + } case 'g': case 'G': rc = name2gid(¶m.fp_gid, optarg); if (rc) { param.fp_gid = strtoul(optarg, &endptr, 10); - if (*endptr != '\0') { - fprintf(stderr, "Group/GID: %s cannot " - "be found.\n", optarg); - ret = -1; - goto err; - } - } + if (*endptr != '\0') { + fprintf(stderr, + "Group/GID: %s cannot be found.\n", + optarg); + ret = -1; + goto err; + } + } param.fp_exclude_gid = !!neg_opt; param.fp_check_gid = 1; - break; + break; case 'H': param.fp_hash_type = check_hashtype(optarg); if (param.fp_hash_type == 0) { @@ -3822,6 +4837,9 @@ static int lfs_find(int argc, char **argv) param.fp_check_hash_type = 1; param.fp_exclude_hash_type = !!neg_opt; break; + case 'l': + param.fp_lazy = 1; + break; case 'L': ret = name2layout(¶m.fp_layout, optarg); if (ret) @@ -3835,19 +4853,20 @@ static int lfs_find(int argc, char **argv) if (rc) { param.fp_uid = strtoul(optarg, &endptr, 10); if (*endptr != '\0') { - fprintf(stderr, "User/UID: %s cannot " - "be found.\n", optarg); - ret = -1; - goto err; - } - } + fprintf(stderr, + "User/UID: %s cannot be found.\n", + optarg); + ret = -1; + goto err; + } + } param.fp_exclude_uid = !!neg_opt; param.fp_check_uid = 1; - break; - case 'n': + break; + case 'n': param.fp_pattern = (char *)optarg; param.fp_exclude_pattern = !!neg_opt; - break; + break; case 'N': if (optarg[0] == '+') { param.fp_mirror_count_sign = -1; @@ -3867,56 +4886,57 @@ static int lfs_find(int argc, char **argv) param.fp_check_mirror_count = 1; param.fp_exclude_mirror_count = !!neg_opt; break; - case 'm': - case 'i': - case 'O': { - char *buf, *token, *next, *p; - int len = 1; - void *tmp; - - buf = strdup(optarg); - if (buf == NULL) { - ret = -ENOMEM; - goto err; - } + case 'm': + case 'i': + case 'O': { + char *buf, *token, *next, *p; + int len = 1; + void *tmp; + + buf = strdup(optarg); + if (!buf) { + ret = -ENOMEM; + goto err; + } param.fp_exclude_obd = !!neg_opt; - token = buf; - while (token && *token) { - token = strchr(token, ','); - if (token) { - len++; - token++; - } - } - if (c == 'm') { + token = buf; + while (token && *token) { + token = strchr(token, ','); + if (token) { + len++; + token++; + } + } + if (c == 'm') { param.fp_exclude_mdt = !!neg_opt; param.fp_num_alloc_mdts += len; tmp = realloc(param.fp_mdt_uuid, param.fp_num_alloc_mdts * sizeof(*param.fp_mdt_uuid)); - if (tmp == NULL) { + if (!tmp) { ret = -ENOMEM; goto err_free; } param.fp_mdt_uuid = tmp; - } else { + } else { param.fp_exclude_obd = !!neg_opt; param.fp_num_alloc_obds += len; tmp = realloc(param.fp_obd_uuid, param.fp_num_alloc_obds * sizeof(*param.fp_obd_uuid)); - if (tmp == NULL) { + if (!tmp) { ret = -ENOMEM; goto err_free; } param.fp_obd_uuid = tmp; - } - for (token = buf; token && *token; token = next) { + } + for (token = buf; token && *token; token = next) { struct obd_uuid *puuid; + if (c == 'm') { puuid = ¶m.fp_mdt_uuid[param.fp_num_mdts++]; @@ -3924,12 +4944,12 @@ static int lfs_find(int argc, char **argv) puuid = ¶m.fp_obd_uuid[param.fp_num_obds++]; } - p = strchr(token, ','); - next = 0; - if (p) { - *p = 0; - next = p+1; - } + p = strchr(token, ','); + next = 0; + if (p) { + *p = 0; + next = p+1; + } if (strlen(token) > sizeof(puuid->uuid) - 1) { ret = -E2BIG; @@ -4077,31 +5097,55 @@ err_free: param.fp_check_mdt_count = 1; param.fp_exclude_mdt_count = !!neg_opt; break; - default: - ret = CMD_HELP; - goto err; - }; - } - - if (pathstart == -1) { - fprintf(stderr, "error: %s: no filename|pathname\n", - argv[0]); - ret = CMD_HELP; - goto err; - } else if (pathend == -1) { - /* no options */ - pathend = argc; - } + case 'z': + if (optarg[0] == '+') { + param.fp_ext_size_sign = -1; + optarg++; + } else if (optarg[0] == '-') { + param.fp_ext_size_sign = 1; + optarg++; + } + + ret = llapi_parse_size(optarg, ¶m.fp_ext_size, + ¶m.fp_ext_size_units, 0); + if (ret) { + fprintf(stderr, "error: bad ext-size '%s'\n", + optarg); + goto err; + } + param.fp_ext_size /= SEL_UNIT_SIZE; + param.fp_ext_size_units /= SEL_UNIT_SIZE; + param.fp_check_ext_size = 1; + param.fp_exclude_ext_size = !!neg_opt; + break; + default: + ret = CMD_HELP; + goto err; + }; + } + + if (pathstart == -1) { + fprintf(stderr, "error: %s: no filename|pathname\n", + argv[0]); + ret = CMD_HELP; + goto err; + } else if (pathend == -1) { + /* no options */ + pathend = argc; + } do { rc = llapi_find(argv[pathstart], ¶m); - if (rc != 0 && ret == 0) + if (rc && !ret) { ret = rc; + pathbad = pathstart; + } } while (++pathstart < pathend); - if (ret) - fprintf(stderr, "error: %s failed for %s.\n", - argv[0], argv[optind - 1]); + if (ret) + fprintf(stderr, "%s: failed for '%s': %s\n", + progname, argv[pathbad], strerror(-rc)); + err: if (param.fp_obd_uuid && param.fp_num_alloc_obds) free(param.fp_obd_uuid); @@ -4109,7 +5153,7 @@ err: if (param.fp_mdt_uuid && param.fp_num_alloc_mdts) free(param.fp_mdt_uuid); - return ret; + return ret; } static int lfs_getstripe_internal(int argc, char **argv, @@ -4118,6 +5162,8 @@ static int lfs_getstripe_internal(int argc, char **argv, struct option long_opts[] = { /* find { .val = 'A', .name = "atime", .has_arg = required_argument }*/ /* find { .val = 'b', .name = "blocks", .has_arg = required_argument }*/ +/* find { .val = 'B', .name = "btime", .has_arg = required_argument }*/ +/* find { .val = 'B', .name = "Btime", .has_arg = required_argument }*/ { .val = LFS_COMP_COUNT_OPT, .name = "comp-count", .has_arg = no_argument }, { .val = LFS_COMP_COUNT_OPT, @@ -4149,6 +5195,7 @@ static int lfs_getstripe_internal(int argc, char **argv, { .val = 'i', .name = "stripe_index", .has_arg = no_argument }, { .val = 'I', .name = "comp-id", .has_arg = optional_argument }, { .val = 'I', .name = "component-id", .has_arg = optional_argument }, +/* find { .val = 'l', .name = "lazy", .has_arg = no_argument }, */ { .val = 'L', .name = "layout", .has_arg = no_argument }, { .val = 'm', .name = "mdt", .has_arg = no_argument }, { .val = 'm', .name = "mdt-index", .has_arg = no_argument }, @@ -4171,6 +5218,8 @@ static int lfs_getstripe_internal(int argc, char **argv, /* 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 }, + { .val = 'z', .name = "extension-size", .has_arg = no_argument }, + { .val = 'z', .name = "ext-size", .has_arg = no_argument }, { .name = NULL } }; int c, rc; int neg_opt = 0; @@ -4179,7 +5228,7 @@ static int lfs_getstripe_internal(int argc, char **argv, char *end, *tmp; while ((c = getopt_long(argc, argv, - "-cdDE::FghiI::LmMNoO:pqrRsSvy", + "-cdDE::FghiI::LmMNoO:pqrRsSvyz", long_opts, NULL)) != -1) { if (neg_opt) --neg_opt; @@ -4214,13 +5263,13 @@ static int lfs_getstripe_internal(int argc, char **argv, param->fp_max_depth = 0; break; case LFS_COMP_FLAGS_OPT: - if (optarg != NULL) { + if (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", + fprintf(stderr, + "error: %s bad component flags '%s'.\n", argv[0], optarg); return CMD_HELP; } @@ -4231,7 +5280,7 @@ static int lfs_getstripe_internal(int argc, char **argv, } break; case LFS_COMP_START_OPT: - if (optarg != NULL) { + if (optarg) { tmp = optarg; if (tmp[0] == '+') { param->fp_comp_start_sign = -1; @@ -4244,13 +5293,12 @@ static int lfs_getstripe_internal(int argc, char **argv, ¶m->fp_comp_start, ¶m->fp_comp_start_units, 0); if (rc != 0) { - fprintf(stderr, "error: %s bad " - "component start '%s'.\n", + fprintf(stderr, + "error: %s bad component start '%s'.\n", argv[0], tmp); return CMD_HELP; - } else { - param->fp_check_comp_start = 1; } + param->fp_check_comp_start = 1; } else { param->fp_verbose |= VERBOSE_COMP_START; param->fp_max_depth = 0; @@ -4315,7 +5363,7 @@ static int lfs_getstripe_internal(int argc, char **argv, param->fp_get_default_lmv = 1; break; case 'E': - if (optarg != NULL) { + if (optarg) { tmp = optarg; if (tmp[0] == '+') { param->fp_comp_end_sign = -1; @@ -4335,8 +5383,8 @@ static int lfs_getstripe_internal(int argc, char **argv, ¶m->fp_comp_end_units, 0); } if (rc != 0) { - fprintf(stderr, "error: %s bad " - "component end '%s'.\n", + fprintf(stderr, + "error: %s bad component end '%s'.\n", argv[0], tmp); return CMD_HELP; } @@ -4365,17 +5413,16 @@ static int lfs_getstripe_internal(int argc, char **argv, } break; case 'I': - if (optarg != NULL) { + if (optarg) { param->fp_comp_id = strtoul(optarg, &end, 0); if (*end != '\0' || param->fp_comp_id == 0 || param->fp_comp_id > LCME_ID_MAX) { - fprintf(stderr, "error: %s bad " - "component id '%s'\n", + fprintf(stderr, + "error: %s bad component id '%s'\n", argv[0], optarg); return CMD_HELP; - } else { - param->fp_check_comp_id = 1; } + param->fp_check_comp_id = 1; } else { param->fp_max_depth = 0; param->fp_verbose |= VERBOSE_COMP_ID; @@ -4389,8 +5436,8 @@ static int lfs_getstripe_internal(int argc, char **argv, break; #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"); + fprintf(stderr, + "warning: '-M' deprecated, use '--mdt-index' or '-m' instead\n"); #endif case 'm': if (!(param->fp_verbose & VERBOSE_DETAIL)) @@ -4439,6 +5486,12 @@ static int lfs_getstripe_internal(int argc, char **argv, case 'y': param->fp_yaml = 1; break; + case 'z': + if (!(param->fp_verbose & VERBOSE_DETAIL)) { + param->fp_verbose |= VERBOSE_EXT_SIZE; + param->fp_max_depth = 0; + } + break; default: return CMD_HELP; } @@ -4478,40 +5531,40 @@ static int lfs_getstripe_internal(int argc, char **argv, static int lfs_tgts(int argc, char **argv) { - char mntdir[PATH_MAX] = {'\0'}, path[PATH_MAX] = {'\0'}; - struct find_param param; - int index = 0, rc=0; + char mntdir[PATH_MAX] = {'\0'}, path[PATH_MAX] = {'\0'}; + struct find_param param; + int index = 0, rc = 0; - if (argc > 2) - return CMD_HELP; + if (argc > 2) + return CMD_HELP; - if (argc == 2 && !realpath(argv[1], path)) { - rc = -errno; - fprintf(stderr, "error: invalid path '%s': %s\n", - argv[1], strerror(-rc)); - return rc; - } + if (argc == 2 && !realpath(argv[1], path)) { + rc = -errno; + fprintf(stderr, "error: invalid path '%s': %s\n", + argv[1], strerror(-rc)); + return rc; + } - while (!llapi_search_mounts(path, index++, mntdir, NULL)) { - /* Check if we have a mount point */ - if (mntdir[0] == '\0') - continue; + while (!llapi_search_mounts(path, index++, mntdir, NULL)) { + /* Check if we have a mount point */ + if (mntdir[0] == '\0') + continue; - memset(¶m, 0, sizeof(param)); - if (!strcmp(argv[0], "mdts")) + memset(¶m, 0, sizeof(param)); + if (!strcmp(argv[0], "mdts")) param.fp_get_lmv = 1; - rc = llapi_ostlist(mntdir, ¶m); - if (rc) { - fprintf(stderr, "error: %s: failed on %s\n", - argv[0], mntdir); - } - if (path[0] != '\0') - break; - memset(mntdir, 0, PATH_MAX); - } + rc = llapi_ostlist(mntdir, ¶m); + if (rc) { + fprintf(stderr, "error: %s: failed on %s\n", + argv[0], mntdir); + } + if (path[0] != '\0') + break; + memset(mntdir, 0, PATH_MAX); + } - return rc; + return rc; } static int lfs_getstripe(int argc, char **argv) @@ -4535,6 +5588,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; @@ -4542,8 +5596,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': case 'T': @@ -4558,8 +5611,8 @@ static int lfs_getdirstripe(int argc, char **argv) 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"); + fprintf(stderr, + "warning: '-t' deprecated, use '--mdt-hash' or '-H' instead\n"); #endif case 'H': param.fp_verbose |= VERBOSE_HASH_TYPE; @@ -4576,10 +5629,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; } } @@ -4645,6 +5703,28 @@ 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 to identify various problem states for "lfs df" if .osn_err = true, + * so only show flags reflecting those states by default. Informational states + * are only shown with "-v" and use lower-case names to distinguish them. + * UNUSED[12] were for "EROFS = 30" until 1.6 but are now available for use. + */ +static struct obd_statfs_state_names { + enum obd_statfs_state osn_state; + const char osn_name; + bool osn_err; +} oss_names[] = { + { .osn_state = OS_STATFS_DEGRADED, .osn_name = 'D', .osn_err = true }, + { .osn_state = OS_STATFS_READONLY, .osn_name = 'R', .osn_err = true }, + { .osn_state = OS_STATFS_NOPRECREATE,.osn_name = 'N', .osn_err = true }, + { .osn_state = OS_STATFS_UNUSED1, .osn_name = '?', .osn_err = true }, + { .osn_state = OS_STATFS_UNUSED2, .osn_name = '?', .osn_err = true }, + { .osn_state = OS_STATFS_ENOSPC, .osn_name = 'S', .osn_err = true }, + { .osn_state = OS_STATFS_ENOINO, .osn_name = 'I', .osn_err = true }, + { .osn_state = OS_STATFS_SUM, .osn_name = 'a', /* aggregate */ }, + { .osn_state = OS_STATFS_NONROT, .osn_name = 'f', /* flash */ }, +}; + static int showdf(char *mntdir, struct obd_statfs *stat, char *uuid, enum mntdf_flags flags, char *type, int index, int rc) @@ -4718,21 +5798,14 @@ 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 i; printf(" "); - for (i = 0, state = stat->os_state; - state && i < sizeof(state_names); i++) { - if (!(state & (1 << i))) - continue; - printf("%c", state_names[i]); - state ^= 1 << i; + for (i = 0; i < ARRAY_SIZE(oss_names); i++) { + if (oss_names[i].osn_state & stat->os_state && + (oss_names[i].osn_err || + flags & MNTDF_VERBOSE)) + printf("%c", oss_names[i].osn_name); } } @@ -4777,6 +5850,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; @@ -4786,7 +5860,7 @@ static int mntdf(char *mntdir, char *fsname, char *pool, enum mntdf_flags flags, if (pool) { poolname = strchr(pool, '.'); - if (poolname != NULL) { + if (poolname) { if (strncmp(fsname, pool, strlen(fsname))) { fprintf(stderr, "filesystem name incorrect\n"); return -ENODEV; @@ -4840,7 +5914,8 @@ static int mntdf(char *mntdir, char *fsname, char *pool, enum mntdf_flags flags, rc = rc2; } - /* If we have OSTs then don't report MDT block counts. + /* + * If we have OSTs then don't report MDT block counts. * For MDT-only filesystems the expectation is that all * layouts have a DoM component. For filesystems with * OSTs, files are not necessarily going to store data @@ -4859,11 +5934,13 @@ static int mntdf(char *mntdir, char *fsname, char *pool, enum mntdf_flags flags, obd_uuid2str(&uuid_buf)) != 1) continue; - /* the llapi_obd_statfs() call may have returned with + /* + * the llapi_obd_statfs() call may have returned with * an error, but if it filled in uuid_buf we will at * lease use that to print out a message for that OBD. * If we didn't get anything in the uuid_buf, then fill - * it in so that we can print an error message. */ + * it in so that we can print an error message. + */ if (uuid_buf.uuid[0] == '\0') snprintf(uuid_buf.uuid, sizeof(uuid_buf.uuid), "%s%04x", tp->st_name, index); @@ -4884,6 +5961,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 * @@ -4897,11 +5975,13 @@ 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; } @@ -4914,58 +5994,39 @@ static int mntdf(char *mntdir, char *fsname, char *pool, enum mntdf_flags flags, return rc; } -static int ll_statfs_data_comp(const void *sd1, const void *sd2) -{ - 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, false); - int r2 = obd_statfs_ratio(st2, false); - 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; -} - /* 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 foreign_mode = false; + mode_t mode = S_IRWXU | S_IRWXG | S_IRWXO; + mode_t previous_mode = 0; + 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 +/* find { .val = 'l', .name = "lazy", .has_arg = no_argument }, */ { .val = 'm', .name = "mdt-index", .has_arg = required_argument }, { .val = 'm', .name = "mdt", .has_arg = required_argument }, #endif @@ -4978,12 +6039,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. */ @@ -5005,10 +6068,37 @@ static int lfs_setdirstripe(int argc, char **argv) case 'D': default_stripe = true; break; + case LFS_LAYOUT_FOREIGN_OPT: + if (optarg) { + /* 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' " - "deprecated, use '--mdt-hash' or '-H' instead\n"); + fprintf(stderr, + "warning: '--hash-type' and '-t' deprecated, use '--mdt-hash' or '-H' instead\n"); #endif case 'H': lsa.lsa_pattern = check_hashtype(optarg); @@ -5031,7 +6121,7 @@ static int lfs_setdirstripe(int argc, char **argv) #endif 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", @@ -5045,12 +6135,15 @@ static int lfs_setdirstripe(int argc, char **argv) break; #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"); + fprintf(stderr, + "warning: '-m' is deprecated, use '--mode' or '-o' instead\n"); #endif 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]); @@ -5064,8 +6157,31 @@ 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]); @@ -5081,7 +6197,7 @@ static int lfs_setdirstripe(int argc, char **argv) return CMD_HELP; } - if (mode_opt != NULL) { + if (mode_opt) { mode = strtoul(mode_opt, &end, 8); if (*end != '\0') { fprintf(stderr, @@ -5092,6 +6208,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. @@ -5099,13 +6234,18 @@ static int lfs_setdirstripe(int argc, char **argv) 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) { + if (!param) { fprintf(stderr, "%s %s: cannot allocate memory for parameters: %s\n", progname, argv[0], strerror(ENOMEM)); return CMD_HELP; } + /* if "lfs setdirstripe -D -i -1" is used, assume 1-stripe directory */ + if (default_stripe && lsa.lsa_stripe_off == -1 && + (lsa.lsa_stripe_count == LLAPI_LAYOUT_DEFAULT || + lsa.lsa_stripe_count == 0)) + lsa.lsa_stripe_count = 1; if (lsa.lsa_stripe_count != LLAPI_LAYOUT_DEFAULT) param->lsp_stripe_count = lsa.lsa_stripe_count; if (lsa.lsa_stripe_off == LLAPI_LAYOUT_DEFAULT) @@ -5115,16 +6255,17 @@ static int lfs_setdirstripe(int argc, char **argv) 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_stripe_pattern = LMV_HASH_TYPE_UNKNOWN; 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); + 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; } @@ -5134,118 +6275,27 @@ static int lfs_setdirstripe(int argc, char **argv) memcpy(param->lsp_tgts, mdts, sizeof(*mdts) * lsa.lsa_nr_tgts); } - 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 (!lsb) { - lsb = malloc(sizeof(*lsb)); - if (!lsb) { - result = -ENOMEM; - break; - } - } - lsb->sb_count = 0; - - /* 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'; - - result = llapi_search_mounts(path, 0, mntdir, - NULL); - if (result < 0 || mntdir[0] == '\0') { - fprintf(stderr, - "No suitable Lustre mount found\n"); - break; - } - - result = mntdf(mntdir, NULL, NULL, 0, - LL_STATFS_LMV, lsb); - if (result < 0) - break; - - 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; - } - - qsort(lsb->sb_buf, lsb->sb_count, - sizeof(struct ll_statfs_data), - ll_statfs_data_comp); - - auto_distributed = true; - } - - 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, - false) > 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); + dname = argv[optind]; + do { + if (default_stripe) { + result = llapi_dir_set_default_lmv(dname, param); + if (result) + fprintf(stderr, + "%s setdirstripe: cannot set default stripe on dir '%s': %s\n", + progname, dname, strerror(-result)); + continue; } - 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) + if (mode_opt) umask(previous_mode); - free(lsb); free(param); return result; } @@ -5265,11 +6315,12 @@ static int lfs_rmentry(int argc, char **argv) index = 1; dname = argv[index]; - while (dname != NULL) { + while (dname) { result = llapi_direntry_remove(dname); if (result) { - fprintf(stderr, "error: %s: remove dir entry '%s' " - "failed\n", argv[0], dname); + fprintf(stderr, + "error: %s: remove dir entry '%s' failed\n", + argv[0], dname); break; } dname = argv[++index]; @@ -5297,8 +6348,8 @@ static int lfs_mv(int argc, char **argv) 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"); + fprintf(stderr, + "warning: '-M' deprecated, use '--mdt-index' or '-m' instead\n"); #endif case 'm': lmu.lum_stripe_offset = strtoul(optarg, &end, 0); @@ -5318,7 +6369,7 @@ static int lfs_mv(int argc, char **argv) } } - if (lmu.lum_stripe_offset == -1) { + if (lmu.lum_stripe_offset == LMV_OFFSET_DEFAULT) { fprintf(stderr, "%s mv: MDT index must be specified\n", progname); return CMD_HELP; @@ -5329,6 +6380,7 @@ static int lfs_mv(int argc, char **argv) return CMD_HELP; } + lmu.lum_hash_type = LMV_HASH_TYPE_UNKNOWN; /* initialize migrate mdt parameters */ param.fp_lmv_md = &lmu; @@ -5336,19 +6388,19 @@ static int lfs_mv(int argc, char **argv) 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, + progname, argv[optind], lmu.lum_stripe_offset, strerror(-rc)); return rc; } static int lfs_osts(int argc, char **argv) { - return lfs_tgts(argc, argv); + return lfs_tgts(argc, argv); } static int lfs_mdts(int argc, char **argv) { - return lfs_tgts(argc, argv); + return lfs_tgts(argc, argv); } static int lfs_df(int argc, char **argv) @@ -5410,43 +6462,91 @@ static int lfs_df(int argc, char **argv) return rc; } +static int print_instance(const char *mntdir, char *buf, size_t buflen, + bool opt_instance, bool opt_fsname, bool opt_mntdir) +{ + int rc = 0; + + if (opt_fsname == opt_instance) { /* both true or both false */ + rc = llapi_getname(mntdir, buf, buflen); + } else if (opt_fsname) { + /* + * llapi_search_mounts() fills @buf with fsname, but that is not + * called if explicit paths are specified on the command-line + */ + if (buf[0] == '\0') + rc = llapi_get_fsname(mntdir, buf, buflen); + } else /* if (opt_instance) */ { + rc = llapi_get_instance(mntdir, buf, buflen); + } + + if (rc < 0) { + fprintf(stderr, "cannot get instance for '%s': %s\n", + mntdir, strerror(-rc)); + return rc; + } + + if (opt_mntdir) + printf("%s %s\n", buf, mntdir); + else + printf("%s\n", buf); + + 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)]; - - 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; + 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_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. */ + char mntdir[PATH_MAX] = "", path[PATH_MAX] = ""; + int index = 0; + + 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; + + /* 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) @@ -5488,7 +6588,7 @@ static int lfs_check(int argc, char **argv) return CMD_HELP; } - rc = llapi_search_mounts(NULL, 0, mntdir, NULL); + 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", @@ -5502,22 +6602,12 @@ static int lfs_check(int argc, char **argv) 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) +#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 @@ -5526,54 +6616,58 @@ do { \ * 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); - return *tail ? ULONG_MAX : val; - } - - /* format string is XXwXXdXXhXXmXXs */ - while (*timestr) { - unsigned long v; - int ind; - char* ptr; - - v = strtoul(timestr, &tail, 10); - if (v == ULONG_MAX || *tail == '\0') - /* value too large (ULONG_MAX or more) - or missing specifier */ - goto error; +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); + return *tail ? ULONG_MAX : val; + } + + /* format string is XXwXXdXXhXXmXXs */ + while (*timestr) { + unsigned long v; + int ind; + char *ptr; + + v = strtoul(timestr, &tail, 10); + if (v == ULONG_MAX || *tail == '\0') + /* + * value too large (ULONG_MAX or more) + * or missing specifier + */ + goto error; - ptr = strchr(spec, *tail); - if (ptr == NULL) - /* unknown specifier */ - goto error; + ptr = strchr(spec, *tail); + if (!ptr) + /* unknown specifier */ + goto error; - ind = ptr - spec; + ind = ptr - spec; - /* check if product will overflow the type */ - if (!(v < ULONG_MAX / mult[ind])) - goto error; + /* check if product will overflow the type */ + if (!(v < ULONG_MAX / mult[ind])) + goto error; - ADD_OVERFLOW(val, mult[ind] * v); - if (val == ULONG_MAX) - goto error; + ADD_OVERFLOW(val, mult[ind] * v); + if (val == ULONG_MAX) + goto error; - timestr = tail + 1; - } + timestr = tail + 1; + } - return val; + return val; error: - return ULONG_MAX; + return ULONG_MAX; } #define ARG2ULL(nr, str, def_units) \ @@ -5592,37 +6686,47 @@ do { \ static inline int has_times_option(int argc, char **argv) { - int i; + int i; - for (i = 1; i < argc; i++) - if (!strcmp(argv[i], "-t")) - return 1; + for (i = 1; i < argc; i++) + if (!strcmp(argv[i], "-t")) + return 1; + + return 0; +} - return 0; +static inline int lfs_verify_poolarg(char *pool) +{ + if (strnlen(optarg, LOV_MAXPOOLNAME + 1) > LOV_MAXPOOLNAME) { + fprintf(stderr, + "Pool name '%.*s' is longer than %d\n", + LOV_MAXPOOLNAME, pool, LOV_MAXPOOLNAME); + return 1; + } + return 0; } -int lfs_setquota_times(int argc, char **argv) +int lfs_setquota_times(int argc, char **argv, struct if_quotactl *qctl) { - int c, rc; - struct if_quotactl qctl; - char *mnt, *obd_type = (char *)qctl.obd_type; - struct obd_dqblk *dqb = &qctl.qc_dqblk; - struct obd_dqinfo *dqi = &qctl.qc_dqinfo; - struct option long_opts[] = { + int c, rc; + char *mnt, *obd_type = (char *)qctl->obd_type; + struct obd_dqblk *dqb = &qctl->qc_dqblk; + struct obd_dqinfo *dqi = &qctl->qc_dqinfo; + struct option long_opts[] = { { .val = 'b', .name = "block-grace", .has_arg = required_argument }, { .val = 'g', .name = "group", .has_arg = no_argument }, { .val = 'i', .name = "inode-grace", .has_arg = required_argument }, { .val = 'p', .name = "projid", .has_arg = no_argument }, { .val = 't', .name = "times", .has_arg = no_argument }, { .val = 'u', .name = "user", .has_arg = no_argument }, + { .val = 'o', .name = "pool", .has_arg = required_argument }, { .name = NULL } }; int qtype; - memset(&qctl, 0, sizeof(qctl)); - qctl.qc_cmd = LUSTRE_Q_SETINFO; - qctl.qc_type = ALLQUOTA; + qctl->qc_cmd = LUSTRE_Q_SETINFO; + qctl->qc_type = ALLQUOTA; - while ((c = getopt_long(argc, argv, "b:gi:ptu", + while ((c = getopt_long(argc, argv, "b:gi:ptuo:", long_opts, NULL)) != -1) { switch (c) { case 'u': @@ -5634,63 +6738,80 @@ int lfs_setquota_times(int argc, char **argv) case 'p': qtype = PRJQUOTA; quota_type: - if (qctl.qc_type != ALLQUOTA) { - fprintf(stderr, "error: -u/g/p can't be used " - "more than once\n"); + if (qctl->qc_type != ALLQUOTA) { + fprintf(stderr, + "error: -u/g/p can't be used more than once\n"); return CMD_HELP; } - qctl.qc_type = qtype; - break; - case 'b': - if ((dqi->dqi_bgrace = str2sec(optarg)) == ULONG_MAX) { - fprintf(stderr, "error: bad block-grace: %s\n", - optarg); - return CMD_HELP; - } - dqb->dqb_valid |= QIF_BTIME; - break; - case 'i': - if ((dqi->dqi_igrace = str2sec(optarg)) == ULONG_MAX) { - fprintf(stderr, "error: bad inode-grace: %s\n", - optarg); - return CMD_HELP; - } - dqb->dqb_valid |= QIF_ITIME; - break; - case 't': /* Yes, of course! */ - break; - default: /* getopt prints error message for us when opterr != 0 */ - return CMD_HELP; - } - } - - if (qctl.qc_type == ALLQUOTA) { - fprintf(stderr, "error: neither -u, -g nor -p specified\n"); - return CMD_HELP; - } + qctl->qc_type = qtype; + break; + case 'b': + if (strncmp(optarg, NOTIFY_GRACE, + strlen(NOTIFY_GRACE)) == 0) { + dqi->dqi_bgrace = NOTIFY_GRACE_TIME; + } else { + dqi->dqi_bgrace = str2sec(optarg); + if (dqi->dqi_bgrace >= NOTIFY_GRACE_TIME) { + fprintf(stderr, + "error: bad block-grace: %s\n", + optarg); + return CMD_HELP; + } + } + dqb->dqb_valid |= QIF_BTIME; + break; + case 'i': + if (strncmp(optarg, NOTIFY_GRACE, + strlen(NOTIFY_GRACE)) == 0) { + dqi->dqi_igrace = NOTIFY_GRACE_TIME; + } else { + dqi->dqi_igrace = str2sec(optarg); + if (dqi->dqi_igrace >= NOTIFY_GRACE_TIME) { + fprintf(stderr, + "error: bad inode-grace: %s\n", + optarg); + return CMD_HELP; + } + } + dqb->dqb_valid |= QIF_ITIME; + break; + case 't': /* Yes, of course! */ + break; + case 'o': + if (lfs_verify_poolarg(optarg)) + return -1; + fprintf(stdout, + "Trying to set grace for pool %s\n", optarg); + strncpy(qctl->qc_poolname, optarg, LOV_MAXPOOLNAME); + qctl->qc_cmd = LUSTRE_Q_SETINFOPOOL; + break; + /* getopt prints error message for us when opterr != 0 */ + default: + return CMD_HELP; + } + } - if (optind != argc - 1) { - fprintf(stderr, "error: unexpected parameters encountered\n"); - return CMD_HELP; - } + if (qctl->qc_type == ALLQUOTA) { + fprintf(stderr, "error: neither -u, -g nor -p specified\n"); + 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"); + if (optind != argc - 1) { + fprintf(stderr, "error: unexpected parameters encountered\n"); return CMD_HELP; } - mnt = argv[optind]; - 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; - } + mnt = argv[optind]; + 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; + } - return 0; + return 0; } #define BSLIMIT (1 << 0) @@ -5701,9 +6822,9 @@ quota_type: int lfs_setquota(int argc, char **argv) { int c, rc = 0; - struct if_quotactl qctl; - char *mnt, *obd_type = (char *)qctl.obd_type; - struct obd_dqblk *dqb = &qctl.qc_dqblk; + struct if_quotactl *qctl; + char *mnt, *obd_type; + struct obd_dqblk *dqb; struct option long_opts[] = { { .val = 'b', .name = "block-softlimit", .has_arg = required_argument }, @@ -5720,79 +6841,94 @@ int lfs_setquota(int argc, char **argv) { .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 }, + { .val = 'o', .name = "pool", .has_arg = required_argument }, { .name = NULL } }; - unsigned limit_mask = 0; + unsigned int limit_mask = 0; char *endptr; bool use_default = false; - int qtype; + int qtype, qctl_len; - if (has_times_option(argc, argv)) - return lfs_setquota_times(argc, argv); + qctl_len = sizeof(*qctl) + LOV_MAXPOOLNAME + 1; + qctl = malloc(qctl_len); + if (!qctl) + return -ENOMEM; + + memset(qctl, 0, qctl_len); + obd_type = (char *)qctl->obd_type; + dqb = &qctl->qc_dqblk; + + if (has_times_option(argc, argv)) { + rc = lfs_setquota_times(argc, argv, qctl); + goto out; + } - memset(&qctl, 0, sizeof(qctl)); - qctl.qc_cmd = LUSTRE_Q_SETQUOTA; - qctl.qc_type = ALLQUOTA; /* ALLQUOTA makes no sense for setquota, - * so it can be used as a marker that qc_type - * isn't reinitialized from command line */ + qctl->qc_cmd = LUSTRE_Q_SETQUOTA; + qctl->qc_type = ALLQUOTA; /* ALLQUOTA makes no sense for setquota, + * 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:dg:Gi:I:p:Pu:U", + while ((c = getopt_long(argc, argv, "b:B:dg:Gi:I:p:Pu:Uo:", long_opts, NULL)) != -1) { switch (c) { case 'U': - qctl.qc_cmd = LUSTRE_Q_SETDEFAULT; + qctl->qc_cmd = LUSTRE_Q_SETDEFAULT; qtype = USRQUOTA; - qctl.qc_id = 0; + qctl->qc_id = 0; goto quota_type_def; case 'u': qtype = USRQUOTA; - rc = name2uid(&qctl.qc_id, optarg); + rc = name2uid(&qctl->qc_id, optarg); goto quota_type; case 'G': - qctl.qc_cmd = LUSTRE_Q_SETDEFAULT; + qctl->qc_cmd = LUSTRE_Q_SETDEFAULT; qtype = GRPQUOTA; - qctl.qc_id = 0; + qctl->qc_id = 0; goto quota_type_def; - case 'g': + case 'g': qtype = GRPQUOTA; - rc = name2gid(&qctl.qc_id, optarg); + rc = name2gid(&qctl->qc_id, optarg); goto quota_type; case 'P': - qctl.qc_cmd = LUSTRE_Q_SETDEFAULT; + qctl->qc_cmd = LUSTRE_Q_SETDEFAULT; qtype = PRJQUOTA; - qctl.qc_id = 0; + qctl->qc_id = 0; goto quota_type_def; case 'p': qtype = PRJQUOTA; - rc = name2projid(&qctl.qc_id, optarg); + rc = name2projid(&qctl->qc_id, optarg); quota_type: if (rc) { - qctl.qc_id = strtoul(optarg, &endptr, 10); + qctl->qc_id = strtoul(optarg, &endptr, 10); if (*endptr != '\0') { - fprintf(stderr, "%s setquota: invalid" - " id '%s'\n", progname, optarg); - return -1; + fprintf(stderr, + "%s setquota: invalid id '%s'\n", + progname, optarg); + rc = -1; + goto out; } } - if (qctl.qc_id == 0) { - fprintf(stderr, "%s setquota: can't set quota" - " for root usr/group/project.\n", + if (qctl->qc_id == 0) { + fprintf(stderr, + "%s setquota: can't set quota for root usr/group/project.\n", progname); - return -1; + rc = -1; + goto out; } quota_type_def: - if (qctl.qc_type != ALLQUOTA) { + if (qctl->qc_type != ALLQUOTA) { fprintf(stderr, - "%s setquota: only one of -u, -U, -g," - " -G, -p or -P may be specified\n", + "%s setquota: only one of -u, -U, -g, -G, -p or -P may be specified\n", progname); - return CMD_HELP; + rc = CMD_HELP; + goto out; } - qctl.qc_type = qtype; + qctl->qc_type = qtype; break; case 'd': - qctl.qc_cmd = LUSTRE_Q_SETDEFAULT; + qctl->qc_cmd = LUSTRE_Q_SETDEFAULT; use_default = true; break; case 'b': @@ -5802,9 +6938,9 @@ quota_type_def: if (dqb->dqb_bsoftlimit && dqb->dqb_bsoftlimit <= 1024) /* <= 1M? */ 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, + "%s setquota: warning: block softlimit '%llu' smaller than minimum qunit size\nSee '%s help setquota' or Lustre manual for details\n", + progname, + (unsigned long long)dqb->dqb_bsoftlimit, progname); break; case 'B': @@ -5816,7 +6952,8 @@ quota_type_def: 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, + (unsigned long long)dqb->dqb_bhardlimit, progname); break; case 'i': @@ -5825,9 +6962,9 @@ quota_type_def: if (dqb->dqb_isoftlimit && dqb->dqb_isoftlimit <= 1024) /* <= 1K inodes? */ 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, + "%s setquota: warning: inode softlimit '%llu' smaller than minimum qunit size\nSee '%s help setquota' or Lustre manual for details\n", + progname, + (unsigned long long)dqb->dqb_isoftlimit, progname); break; case 'I': @@ -5836,57 +6973,71 @@ quota_type_def: if (dqb->dqb_ihardlimit && dqb->dqb_ihardlimit <= 1024) /* <= 1K inodes? */ 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, + "%s setquota: warning: inode hardlimit '%llu' smaller than minimum qunit size\nSee '%s help setquota' or Lustre manual for details\n", + progname, + (unsigned long long)dqb->dqb_ihardlimit, progname); break; + case 'o': + if (lfs_verify_poolarg(optarg)) { + rc = -1; + goto out; + } + fprintf(stdout, + "Trying to set quota for pool %s\n", optarg); + strncpy(qctl->qc_poolname, optarg, LOV_MAXPOOLNAME); + qctl->qc_cmd = LUSTRE_Q_SETQUOTAPOOL; + break; default: fprintf(stderr, "%s setquota: unrecognized option '%s'\n", progname, argv[optind - 1]); - return CMD_HELP; + rc = CMD_HELP; + goto out; } } - if (qctl.qc_type == ALLQUOTA) { + if (qctl->qc_type == ALLQUOTA) { fprintf(stderr, "%s setquota: either -u or -g must be specified\n", progname); - return CMD_HELP; + rc = CMD_HELP; + goto out; } if (!use_default && limit_mask == 0) { fprintf(stderr, "%s setquota: at least one limit must be specified\n", progname); - return CMD_HELP; + rc = CMD_HELP; + goto out; } if (use_default && limit_mask != 0) { fprintf(stderr, - "%s setquota: limits should not be specified when" - " using default quota\n", + "%s setquota: limits should not be specified when using default quota\n", progname); - return CMD_HELP; + rc = CMD_HELP; + goto out; } - if (use_default && qctl.qc_id == 0) { + if (use_default && qctl->qc_id == 0) { fprintf(stderr, - "%s setquota: can not set default quota for root" - " user/group/project\n", + "%s setquota: can not set default quota for root user/group/project\n", progname); - return CMD_HELP; + rc = CMD_HELP; + goto out; } if (optind != argc - 1) { fprintf(stderr, "%s setquota: filesystem not specified or unexpected argument '%s'\n", progname, argv[optind]); - return CMD_HELP; + rc = CMD_HELP; + goto out; } - mnt = argv[optind]; + mnt = argv[optind]; if (use_default) { dqb->dqb_bhardlimit = 0; @@ -5900,12 +7051,12 @@ quota_type_def: (!(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}; + .qc_type = qctl->qc_type, + .qc_id = qctl->qc_id}; rc = llapi_quotactl(mnt, &tmp_qctl); if (rc < 0) - return rc; + goto out; if (!(limit_mask & BHLIMIT)) dqb->dqb_bhardlimit = tmp_qctl.qc_dqblk.dqb_bhardlimit; @@ -5931,17 +7082,17 @@ quota_type_def: 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); + 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; + obd_uuid2str(&qctl->obd_uuid), strerror(-rc)); } - - return 0; +out: + free(qctl); + return rc; } /* Converts seconds value into format string @@ -5951,52 +7102,52 @@ quota_type_def: * 2. zero fields are not filled (except for p. 3): 5d1s * 3. zero seconds value is presented as "0s" */ -static char * __sec2str(time_t seconds, char *buf) +static char *__sec2str(time_t seconds, char *buf) { - const char spec[] = "smhdw"; - const unsigned long mult[] = {1, 60, 60*60, 24*60*60, 7*24*60*60}; - unsigned long c; - char *tail = buf; - int i; + const char spec[] = "smhdw"; + const unsigned long mult[] = {1, 60, 60*60, 24*60*60, 7*24*60*60}; + unsigned long c; + char *tail = buf; + int i; - for (i = sizeof(mult) / sizeof(mult[0]) - 1 ; i >= 0; i--) { - c = seconds / mult[i]; + for (i = ARRAY_SIZE(mult) - 1 ; i >= 0; i--) { + c = seconds / mult[i]; - if (c > 0 || (i == 0 && buf == tail)) - tail += snprintf(tail, 40-(tail-buf), "%lu%c", c, spec[i]); + if (c > 0 || (i == 0 && buf == tail)) + tail += scnprintf(tail, 40-(tail-buf), "%lu%c", c, + spec[i]); - seconds %= mult[i]; - } + seconds %= mult[i]; + } - return tail; + return tail; } static void sec2str(time_t seconds, char *buf, int rc) { - char *tail = buf; + char *tail = buf; - if (rc) - *tail++ = '['; + if (rc) + *tail++ = '['; - tail = __sec2str(seconds, tail); + tail = __sec2str(seconds, tail); - if (rc && tail - buf < 39) { - *tail++ = ']'; - *tail++ = 0; - } + if (rc && tail - buf < 39) { + *tail++ = ']'; + *tail++ = 0; + } } static void diff2str(time_t seconds, char *buf, time_t now) { - - buf[0] = 0; - if (!seconds) - return; - if (seconds <= now) { - strcpy(buf, "none"); - return; - } - __sec2str(seconds - now, buf); + buf[0] = 0; + if (!seconds) + return; + if (seconds <= now) { + strcpy(buf, "none"); + return; + } + __sec2str(seconds - now, buf); } static void print_quota_title(char *name, struct if_quotactl *qctl, @@ -6049,6 +7200,7 @@ static void print_quota(char *mnt, struct if_quotactl *qctl, int type, time(&now); if (qctl->qc_cmd == LUSTRE_Q_GETQUOTA || qctl->qc_cmd == Q_GETOQUOTA || + qctl->qc_cmd == LUSTRE_Q_GETQUOTAPOOL || qctl->qc_cmd == LUSTRE_Q_GETDEFAULT) { int bover = 0, iover = 0; struct obd_dqblk *dqb = &qctl->qc_dqblk; @@ -6058,26 +7210,23 @@ static void print_quota(char *mnt, struct if_quotactl *qctl, int type, if (dqb->dqb_bhardlimit && lustre_stoqb(dqb->dqb_curspace) >= dqb->dqb_bhardlimit) { - bover = 1; - } else if (dqb->dqb_bsoftlimit && dqb->dqb_btime) { - if (dqb->dqb_btime > now) { - bover = 2; - } else { - bover = 3; - } - } - - if (dqb->dqb_ihardlimit && - dqb->dqb_curinodes >= dqb->dqb_ihardlimit) { - iover = 1; - } else if (dqb->dqb_isoftlimit && dqb->dqb_itime) { - if (dqb->dqb_itime > now) { + bover = 1; + } else if (dqb->dqb_bsoftlimit && dqb->dqb_btime) { + if (dqb->dqb_btime > now) + bover = 2; + else + bover = 3; + } + + if (dqb->dqb_ihardlimit && + dqb->dqb_curinodes >= dqb->dqb_ihardlimit) { + iover = 1; + } else if (dqb->dqb_isoftlimit && dqb->dqb_itime) { + if (dqb->dqb_itime > now) iover = 2; - } else { + else iover = 3; - } - } - + } if (strlen(mnt) > 15) printf("%s\n%15s", mnt, ""); @@ -6088,7 +7237,7 @@ static void print_quota(char *mnt, struct if_quotactl *qctl, int type, diff2str(dqb->dqb_btime, timebuf, now); else if (show_default) snprintf(timebuf, sizeof(timebuf), "%llu", - dqb->dqb_btime); + (unsigned long long)dqb->dqb_btime); kbytes2str(lustre_stoqb(dqb->dqb_curspace), strbuf, sizeof(strbuf), h); @@ -6116,12 +7265,11 @@ static void print_quota(char *mnt, struct if_quotactl *qctl, int type, 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); + (unsigned long long)dqb->dqb_itime); snprintf(numbuf[0], sizeof(numbuf), (dqb->dqb_valid & QIF_INODES) ? "%ju" : "[%ju]", @@ -6146,48 +7294,58 @@ static void print_quota(char *mnt, struct if_quotactl *qctl, int type, else printf(" %7s %7s %7s %7s", "-", "-", "-", "-"); printf("\n"); + } else if (qctl->qc_cmd == LUSTRE_Q_GETINFO || LUSTRE_Q_GETINFOPOOL || + qctl->qc_cmd == Q_GETOINFO) { + char bgtimebuf[40]; + char igtimebuf[40]; - } else if (qctl->qc_cmd == LUSTRE_Q_GETINFO || - qctl->qc_cmd == Q_GETOINFO) { - char bgtimebuf[40]; - char igtimebuf[40]; + if (qctl->qc_dqinfo.dqi_bgrace == NOTIFY_GRACE_TIME) + strncpy(bgtimebuf, NOTIFY_GRACE, 40); + else + sec2str(qctl->qc_dqinfo.dqi_bgrace, bgtimebuf, rc); + if (qctl->qc_dqinfo.dqi_igrace == NOTIFY_GRACE_TIME) + strncpy(igtimebuf, NOTIFY_GRACE, 40); + else + sec2str(qctl->qc_dqinfo.dqi_igrace, igtimebuf, rc); - sec2str(qctl->qc_dqinfo.dqi_bgrace, bgtimebuf, rc); - sec2str(qctl->qc_dqinfo.dqi_igrace, igtimebuf, rc); - printf("Block grace time: %s; Inode grace time: %s\n", - bgtimebuf, igtimebuf); - } + printf("Block grace time: %s; Inode grace time: %s\n", + bgtimebuf, igtimebuf); + } } static int print_obd_quota(char *mnt, struct if_quotactl *qctl, int is_mdt, bool h, __u64 *total) { - int rc = 0, rc1 = 0, count = 0; - __u32 valid = qctl->qc_valid; + int rc = 0, rc1 = 0, count = 0; + __u32 valid = qctl->qc_valid; - rc = llapi_get_obd_count(mnt, &count, is_mdt); - if (rc) { - fprintf(stderr, "can not get %s count: %s\n", - is_mdt ? "mdt": "ost", strerror(-rc)); - return rc; - } + /* + * TODO: for commands LUSTRE_Q_"S\|G"ETQUOTAPOOL we need + * to go only through OSTs that belong to requested pool. + */ + rc = llapi_get_obd_count(mnt, &count, is_mdt); + if (rc) { + fprintf(stderr, "can not get %s count: %s\n", + is_mdt ? "mdt" : "ost", strerror(-rc)); + return rc; + } - for (qctl->qc_idx = 0; qctl->qc_idx < count; qctl->qc_idx++) { - qctl->qc_valid = is_mdt ? QC_MDTIDX : QC_OSTIDX; - rc = llapi_quotactl(mnt, qctl); - if (rc) { + for (qctl->qc_idx = 0; qctl->qc_idx < count; qctl->qc_idx++) { + qctl->qc_valid = is_mdt ? QC_MDTIDX : QC_OSTIDX; + rc = llapi_quotactl(mnt, qctl); + if (rc) { /* It is remote client case. */ if (rc == -EOPNOTSUPP) { - rc = 0; - goto out; - } + rc = 0; + goto out; + } - if (!rc1) - rc1 = rc; - fprintf(stderr, "quotactl %s%d failed.\n", - is_mdt ? "mdt": "ost", qctl->qc_idx); - continue; - } + if (!rc1) + rc1 = rc; + fprintf(stderr, "quotactl %s%d failed.\n", + is_mdt ? "mdt" : "ost", qctl->qc_idx); + continue; + } print_quota(obd_uuid2str(&qctl->obd_uuid), qctl, qctl->qc_valid, 0, h, false); @@ -6253,6 +7411,7 @@ static int get_print_quota(char *mnt, char *name, struct if_quotactl *qctl, } if ((qctl->qc_cmd == LUSTRE_Q_GETQUOTA || + qctl->qc_cmd == LUSTRE_Q_GETQUOTAPOOL || qctl->qc_cmd == LUSTRE_Q_GETDEFAULT) && !quiet) print_quota_title(name, qctl, human_readable, show_default); @@ -6262,14 +7421,16 @@ static int get_print_quota(char *mnt, char *name, struct if_quotactl *qctl, if (qctl->qc_valid != QC_GENERAL) mnt = ""; - inacc = (qctl->qc_cmd == LUSTRE_Q_GETQUOTA) && + inacc = (qctl->qc_cmd == LUSTRE_Q_GETQUOTA || + qctl->qc_cmd == LUSTRE_Q_GETQUOTAPOOL) && ((qctl->qc_dqblk.dqb_valid & (QIF_LIMITS|QIF_USAGE)) != (QIF_LIMITS|QIF_USAGE)); print_quota(mnt, qctl, QC_GENERAL, rc1, human_readable, show_default); if (!show_default && verbose && - qctl->qc_valid == QC_GENERAL && qctl->qc_cmd != LUSTRE_Q_GETINFO) { + qctl->qc_valid == QC_GENERAL && qctl->qc_cmd != LUSTRE_Q_GETINFO && + qctl->qc_cmd != LUSTRE_Q_GETINFOPOOL) { char strbuf[STRBUF_LEN]; rc2 = print_obd_quota(mnt, qctl, 1, human_readable, @@ -6278,9 +7439,8 @@ static int get_print_quota(char *mnt, char *name, struct if_quotactl *qctl, &total_balloc); kbytes2str(total_balloc, strbuf, sizeof(strbuf), human_readable); - printf("Total allocated inode limit: %ju, total " - "allocated block limit: %s\n", (uintmax_t)total_ialloc, - strbuf); + printf("Total allocated inode limit: %ju, total allocated block limit: %s\n", + (uintmax_t)total_ialloc, strbuf); } if (use_default_for_blk) @@ -6292,12 +7452,18 @@ static int get_print_quota(char *mnt, char *name, struct if_quotactl *qctl, *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. " - "The data in \"[]\" is inaccurate.\n"); + printf("Some errors happened when getting quota info. Some devices may be not working or deactivated. The data in \"[]\" is inaccurate.\n"); out: - return rc1; + if (rc1) + return rc1; + if (rc2) + return rc2; + if (rc3) + return rc3; + if (inacc) + return -EIO; + return 0; } static int lfs_project(int argc, char **argv) @@ -6458,17 +7624,28 @@ static int lfs_quota(int argc, char **argv) { int c; char *mnt, *name = NULL; - struct if_quotactl qctl = { .qc_cmd = LUSTRE_Q_GETQUOTA, - .qc_type = ALLQUOTA }; - char *obd_uuid = (char *)qctl.obd_uuid.uuid; + struct if_quotactl *qctl; + char *obd_uuid; int rc = 0, rc1 = 0, verbose = 0, quiet = 0; char *endptr; __u32 valid = QC_GENERAL, idx = 0; bool human_readable = false; bool show_default = false; int qtype; + struct option long_opts[] = { + { .val = 1, .name = "pool", .has_arg = required_argument }, + { .name = NULL } }; - while ((c = getopt(argc, argv, "gGi:I:o:pPqtuUvh")) != -1) { + qctl = calloc(1, sizeof(*qctl) + LOV_MAXPOOLNAME + 1); + if (!qctl) + return -ENOMEM; + + qctl->qc_cmd = LUSTRE_Q_GETQUOTA; + qctl->qc_type = ALLQUOTA; + obd_uuid = (char *)qctl->obd_uuid.uuid; + + while ((c = getopt_long(argc, argv, "gGi:I:o:pPqtuUvh", + long_opts, NULL)) != -1) { switch (c) { case 'U': show_default = true; @@ -6485,156 +7662,178 @@ static int lfs_quota(int argc, char **argv) case 'p': qtype = PRJQUOTA; quota_type: - if (qctl.qc_type != ALLQUOTA) { + if (qctl->qc_type != ALLQUOTA) { fprintf(stderr, "%s quota: only one of -u, -g, or -p may be specified\n", progname); - return CMD_HELP; + rc = CMD_HELP; + goto out; } - qctl.qc_type = qtype; + qctl->qc_type = qtype; + break; + case 't': + qctl->qc_cmd = LUSTRE_Q_GETINFO; + break; + case 'o': + valid = qctl->qc_valid = QC_UUID; + snprintf(obd_uuid, sizeof(*obd_uuid), "%s", optarg); break; - case 't': - qctl.qc_cmd = LUSTRE_Q_GETINFO; - break; - case 'o': - valid = qctl.qc_valid = QC_UUID; - snprintf(obd_uuid, sizeof(qctl.obd_uuid), "%s", optarg); - break; case 'i': - valid = qctl.qc_valid = QC_MDTIDX; - idx = qctl.qc_idx = atoi(optarg); + 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; + rc = CMD_HELP; + goto out; } break; case 'I': - valid = qctl.qc_valid = QC_OSTIDX; - idx = qctl.qc_idx = atoi(optarg); + 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; + rc = CMD_HELP; + goto out; } break; - case 'v': - verbose = 1; - break; - case 'q': - quiet = 1; - break; + case 'v': + verbose = 1; + break; + case 'q': + quiet = 1; + break; case 'h': human_readable = true; break; + case 1: + if (lfs_verify_poolarg(optarg)) { + rc = -1; + goto out; + } + strncpy(qctl->qc_poolname, optarg, LOV_MAXPOOLNAME); + qctl->qc_cmd = qctl->qc_cmd == LUSTRE_Q_GETINFO ? + LUSTRE_Q_GETINFOPOOL : + LUSTRE_Q_GETQUOTAPOOL; + break; default: fprintf(stderr, "%s quota: unrecognized option '%s'\n", progname, argv[optind - 1]); - return CMD_HELP; + rc = CMD_HELP; + goto out; } } - /* 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 && !show_default) { - - qctl.qc_cmd = LUSTRE_Q_GETQUOTA; - qctl.qc_valid = valid; - qctl.qc_idx = idx; + /* current uid/gid info for "lfs quota /path/to/lustre/mount" */ + if ((qctl->qc_cmd == LUSTRE_Q_GETQUOTA || + qctl->qc_cmd == LUSTRE_Q_GETQUOTAPOOL) && + qctl->qc_type == ALLQUOTA && + optind == argc - 1 && !show_default) { + qctl->qc_idx = idx; for (qtype = USRQUOTA; qtype <= GRPQUOTA; qtype++) { - qctl.qc_type = qtype; + qctl->qc_type = qtype; + qctl->qc_valid = valid; if (qtype == USRQUOTA) { - qctl.qc_id = geteuid(); - rc = uid2name(&name, qctl.qc_id); + qctl->qc_id = geteuid(); + rc = uid2name(&name, qctl->qc_id); } else { - qctl.qc_id = getegid(); - rc = gid2name(&name, qctl.qc_id); + qctl->qc_id = getegid(); + rc = gid2name(&name, qctl->qc_id); + memset(&qctl->qc_dqblk, 0, + sizeof(qctl->qc_dqblk)); } if (rc) name = ""; mnt = argv[optind]; - rc1 = get_print_quota(mnt, name, &qctl, verbose, quiet, + rc1 = get_print_quota(mnt, name, qctl, verbose, quiet, human_readable, show_default); if (rc1 && !rc) rc = rc1; } - return rc; + goto out; /* lfs quota -u username /path/to/lustre/mount */ - } else if (qctl.qc_cmd == LUSTRE_Q_GETQUOTA) { + } else if (qctl->qc_cmd == LUSTRE_Q_GETQUOTA || + qctl->qc_cmd == LUSTRE_Q_GETQUOTAPOOL) { /* options should be followed by u/g-name and mntpoint */ if ((!show_default && optind + 2 != argc) || (show_default && optind + 1 != argc) || - qctl.qc_type == ALLQUOTA) { + qctl->qc_type == ALLQUOTA) { fprintf(stderr, "%s quota: name and mount point must be specified\n", progname); - return CMD_HELP; + rc = CMD_HELP; + goto out; } if (!show_default) { name = argv[optind++]; - switch (qctl.qc_type) { + switch (qctl->qc_type) { case USRQUOTA: - rc = name2uid(&qctl.qc_id, name); + rc = name2uid(&qctl->qc_id, name); break; case GRPQUOTA: - rc = name2gid(&qctl.qc_id, name); + rc = name2gid(&qctl->qc_id, name); break; case PRJQUOTA: - rc = name2projid(&qctl.qc_id, name); + 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; + qctl->qc_valid = QC_GENERAL; + qctl->qc_cmd = LUSTRE_Q_GETDEFAULT; + qctl->qc_id = 0; } if (rc) { - qctl.qc_id = strtoul(name, &endptr, 10); + qctl->qc_id = strtoul(name, &endptr, 10); if (*endptr != '\0') { fprintf(stderr, "%s quota: invalid id '%s'\n", progname, name); - return CMD_HELP; + rc = CMD_HELP; + goto out; } } - } else if (optind + 1 != argc || qctl.qc_type == ALLQUOTA) { + } else if (optind + 1 != argc || qctl->qc_type == ALLQUOTA) { fprintf(stderr, "%s quota: missing quota info argument(s)\n", progname); - return CMD_HELP; + rc = CMD_HELP; + goto out; } mnt = argv[optind]; - rc = get_print_quota(mnt, name, &qctl, verbose, quiet, + rc = get_print_quota(mnt, name, qctl, verbose, quiet, human_readable, show_default); +out: + free(qctl); return rc; } #endif /* HAVE_SYS_QUOTA_H! */ static int flushctx_ioctl(char *mp) { - int fd, rc; + int fd, rc; - fd = open(mp, O_RDONLY); - if (fd == -1) { - fprintf(stderr, "flushctx: error open %s: %s\n", - mp, strerror(errno)); - return -1; - } + fd = open(mp, O_RDONLY); + if (fd == -1) { + fprintf(stderr, "flushctx: error open %s: %s\n", + mp, strerror(errno)); + return -1; + } - rc = ioctl(fd, LL_IOC_FLUSHCTX); - if (rc == -1) - fprintf(stderr, "flushctx: error ioctl %s: %s\n", - mp, strerror(errno)); + rc = ioctl(fd, LL_IOC_FLUSHCTX); + if (rc == -1) + fprintf(stderr, "flushctx: error ioctl %s: %s\n", + mp, strerror(errno)); - close(fd); - return rc; + close(fd); + return rc; } static int lfs_flushctx(int argc, char **argv) @@ -6644,24 +7843,28 @@ static int lfs_flushctx(int argc, char **argv) int index = 0; int rc = 0; - while ((c = getopt(argc, argv, "k")) != -1) { - switch (c) { - case 'k': - kdestroy = 1; - break; - default: - fprintf(stderr, "error: %s: option '-%c' " - "unrecognized\n", argv[0], c); - return CMD_HELP; - } - } - - if (kdestroy) { - if ((rc = system("kdestroy > /dev/null")) != 0) { - rc = WEXITSTATUS(rc); - fprintf(stderr, "error destroying tickets: %d, continuing\n", rc); - } - } + while ((c = getopt(argc, argv, "k")) != -1) { + switch (c) { + case 'k': + kdestroy = 1; + break; + default: + fprintf(stderr, + "error: %s: option '-%c' unrecognized\n", + argv[0], c); + return CMD_HELP; + } + } + + if (kdestroy) { + rc = system("kdestroy > /dev/null"); + if (rc) { + rc = WEXITSTATUS(rc); + fprintf(stderr, + "error destroying tickets: %d, continuing\n", + rc); + } + } if (optind >= argc) { /* flush for all mounted lustre fs. */ @@ -6675,28 +7878,14 @@ static int lfs_flushctx(int argc, char **argv) mntdir[0] = '\0'; /* avoid matching in next loop */ } - } else { - /* flush fs as specified */ - while (optind < argc) { - if (flushctx_ioctl(argv[optind++])) - rc = -1; - } - } - 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; + } else { + /* flush fs as specified */ + while (optind < argc) { + if (flushctx_ioctl(argv[optind++])) + rc = -1; + } + } + return rc; } static int lfs_changelog(int argc, char **argv) @@ -6713,28 +7902,28 @@ static int lfs_changelog(int argc, char **argv) while ((rc = getopt_long(argc, argv, short_opts, long_opts, NULL)) != -1) { - switch (rc) { - case 'f': - follow++; - break; - default: + switch (rc) { + case 'f': + follow++; + break; + default: fprintf(stderr, "%s changelog: unrecognized option '%s'\n", progname, argv[optind - 1]); - return CMD_HELP; - } - } + 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) - startrec = strtoll(argv[optind++], NULL, 10); - if (argc > optind) - endrec = strtoll(argv[optind++], NULL, 10); + mdd = argv[optind++]; + if (argc > optind) + startrec = strtoll(argv[optind++], NULL, 10); + if (argc > optind) + endrec = strtoll(argv[optind++], NULL, 10); rc = llapi_changelog_start(&changelog_priv, CHANGELOG_FLAG_BLOCK | @@ -6795,14 +7984,16 @@ static int lfs_changelog(int argc, char **argv) struct changelog_ext_extra_flags *ef = changelog_rec_extra_flags(rec); - printf(" ef=0x%llx", ef->cr_extra_flags); + printf(" ef=0x%llx", + (unsigned long long)ef->cr_extra_flags); 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); + (unsigned long long)uidgid->cr_uid, + (unsigned long long)uidgid->cr_gid); } if (ef->cr_extra_flags & CLFE_NID) { struct changelog_ext_nid *nid = @@ -6832,7 +8023,6 @@ static int lfs_changelog(int argc, char **argv) if (strcmp(mode, "---") != 0) printf(" m=%s", mode); - } if (ef->cr_extra_flags & CLFE_XATTR) { @@ -6958,7 +8148,7 @@ static int lfs_fid2path(int argc, char **argv) device = argv[optind++]; path = calloc(1, PATH_MAX); - if (path == NULL) { + if (!path) { rc = -errno; fprintf(stderr, "%s fid2path: cannot allocate memory for path: %s\n", @@ -6975,6 +8165,7 @@ static int lfs_fid2path(int argc, char **argv) int oldtmp = lnktmp; long long rectmp = recno; int rc2; + rc2 = llapi_fid2path(device, fid, path, PATH_MAX, &rectmp, &lnktmp); if (rc2 < 0) { @@ -7040,13 +8231,14 @@ static int lfs_path2fid(int argc, char **argv) fprintf(stderr, "%s path2fid: FILE... must be specified\n", progname); return CMD_HELP; - } - else if (optind < argc - 1) + } else if (optind < argc - 1) { sep = ": "; + } rc = 0; for (path = argv + optind; *path != NULL; path++) { int err = 0; + if (!show_parents) { err = llapi_path2fid(*path, &fid); if (!err) @@ -7089,6 +8281,85 @@ static int lfs_path2fid(int argc, char **argv) return rc; } +#define MAX_ERRNO 4095 +#define IS_ERR_VALUE(x) ((unsigned long)(x) >= (unsigned long)-MAX_ERRNO) + +static int lfs_rmfid_and_show_errors(const char *device, struct fid_array *fa) +{ + int rc, rc2 = 0, k; + + rc = llapi_rmfid(device, fa); + if (rc) { + fprintf(stderr, "rmfid(): rc = %d\n", rc); + return rc; + } + + for (k = 0; k < fa->fa_nr; k++) { + rc = (__s32)fa->fa_fids[k].f_ver; + if (!IS_ERR_VALUE(rc)) + continue; + if (!rc2 && rc) + rc2 = rc; + if (!rc) + continue; + fa->fa_fids[k].f_ver = 0; + fprintf(stderr, "rmfid("DFID"): rc = %d\n", + PFID(&fa->fa_fids[k]), rc); + } + + return rc2; +} + +static int lfs_rmfid(int argc, char **argv) +{ + char *fidstr, *device; + int rc = 0, rc2, nr; + struct fid_array *fa; + + if (optind > argc - 1) { + fprintf(stderr, "%s rmfid: missing dirname\n", progname); + return CMD_HELP; + } + + device = argv[optind++]; + + nr = argc - optind; + fa = malloc(offsetof(struct fid_array, fa_fids[nr + 1])); + if (!fa) + return -ENOMEM; + + fa->fa_nr = 0; + rc = 0; + while (optind < argc) { + int found; + + fidstr = argv[optind++]; + while (*fidstr == '[') + fidstr++; + found = sscanf(fidstr, SFID, RFID(&fa->fa_fids[fa->fa_nr])); + if (found != 3) { + fprintf(stderr, "unrecognized FID: %s\n", + argv[optind - 1]); + exit(1); + } + fa->fa_nr++; + if (fa->fa_nr == OBD_MAX_FIDS_IN_ARRAY) { + /* start another batch */ + rc2 = lfs_rmfid_and_show_errors(device, fa); + if (rc2 && !rc) + rc = rc2; + fa->fa_nr = 0; + } + } + if (fa->fa_nr) { + rc2 = lfs_rmfid_and_show_errors(device, fa); + if (rc2 && !rc) + rc = rc2; + } + + return rc; +} + static int lfs_data_version(int argc, char **argv) { char *path; @@ -7270,7 +8541,6 @@ static int lfs_hsm_change_flags(int argc, char **argv, int mode) return CMD_HELP; while (optind < argc) { - path = argv[optind]; /* If mode == 0, this means we apply the mask. */ @@ -7373,7 +8643,8 @@ static int lfs_hsm_prepare_file(const char *file, struct lu_fid *fid, fprintf(stderr, "Cannot stat %s: %s\n", file, strerror(errno)); return -errno; } - /* Checking for regular file as archiving as posix copytool + /* + * Checking for regular file as archiving as posix copytool * rejects archiving files other than regular files */ if (!S_ISREG(st.st_mode)) { @@ -7382,8 +8653,9 @@ static int lfs_hsm_prepare_file(const char *file, struct lu_fid *fid, } /* A request should be ... */ if (*last_dev != st.st_dev && *last_dev != 0) { - fprintf(stderr, "All files should be " - "on the same filesystem: %s\n", file); + fprintf(stderr, + "All files should be on the same filesystem: %s\n", + file); return -EINVAL; } *last_dev = st.st_dev; @@ -7421,17 +8693,11 @@ static int fill_hur_item(struct hsm_user_request *hur, unsigned int idx, hui->hui_extent.length = -1; - if (mntpath != NULL) { - if (*fname == '[') - fname++; - rc = sscanf(fname, SFID, RFID(&hui->hui_fid)); - if (rc == 3) { - rc = 0; - } else { + if (mntpath) { + rc = llapi_fid_parse(fname, &hui->hui_fid, NULL); + if (rc) fprintf(stderr, "hsm: '%s' is not a valid FID\n", fname); - rc = -EINVAL; - } } else { rc = lfs_hsm_prepare_file(fname, &hui->hui_fid, last_dev); } @@ -7450,23 +8716,23 @@ static int lfs_hsm_request(int argc, char **argv, int action) { .val = 'l', .name = "filelist", .has_arg = required_argument }, { .val = 'm', .name = "mntpath", .has_arg = required_argument }, { .name = NULL } }; - dev_t last_dev = 0; - char short_opts[] = "l:D:a:m:"; - struct hsm_user_request *hur, *oldhur; - int c, i; - size_t len; - int nbfile; - char *line = NULL; - char *filelist = NULL; - char fullpath[PATH_MAX]; - char *opaque = NULL; - int opaque_len = 0; - int archive_id = 0; - FILE *fp; - int nbfile_alloc = 0; - char *some_file = NULL; - char *mntpath = NULL; - int rc; + dev_t last_dev = 0; + char short_opts[] = "l:D:a:m:"; + struct hsm_user_request *hur, *oldhur; + int c, i; + size_t len; + int nbfile; + char *line = NULL; + char *filelist = NULL; + char fullpath[PATH_MAX]; + char *opaque = NULL; + int opaque_len = 0; + int archive_id = 0; + FILE *fp; + int nbfile_alloc = 0; + char *some_file = NULL; + char *mntpath = NULL; + int rc; if (argc < 2) return CMD_HELP; @@ -7484,14 +8750,13 @@ static int lfs_hsm_request(int argc, char **argv, int action) if (action != HUA_ARCHIVE && action != HUA_REMOVE) { fprintf(stderr, - "error: -a is supported only " - "when archiving or removing\n"); + "error: -a is supported only when archiving or removing\n"); return CMD_HELP; } archive_id = atoi(optarg); break; case 'm': - if (some_file == NULL) { + if (!some_file) { mntpath = optarg; some_file = strdup(optarg); } @@ -7508,16 +8773,18 @@ static int lfs_hsm_request(int argc, char **argv, int action) /* All remaining args are files, so we have at least nbfile */ nbfile = argc - optind; - if ((nbfile == 0) && (filelist == NULL)) + if ((nbfile == 0) && (!filelist)) return CMD_HELP; - if (opaque != NULL) + if (opaque) opaque_len = strlen(opaque); - /* Alloc the request structure with enough place to store all files - * from command line. */ + /* + * Alloc the request structure with enough place to store all files + * from command line. + */ hur = llapi_hsm_user_request_alloc(nbfile, opaque_len); - if (hur == NULL) { + if (!hur) { fprintf(stderr, "Cannot create the request: %s\n", strerror(errno)); return errno; @@ -7542,9 +8809,9 @@ static int lfs_hsm_request(int argc, char **argv, int action) /* from here stop using nb_file, use hur->hur_request.hr_itemcount */ /* If a filelist was specified, read the filelist from it. */ - if (filelist != NULL) { + if (filelist) { fp = fopen(filelist, "r"); - if (fp == NULL) { + if (!fp) { fprintf(stderr, "Cannot read the file list %s: %s\n", filelist, strerror(errno)); rc = -errno; @@ -7552,8 +8819,10 @@ static int lfs_hsm_request(int argc, char **argv, int action) } while ((rc = getline(&line, &len, fp)) != -1) { - /* If allocated buffer was too small, get something - * larger */ + /* + * If allocated buffer was too small, get something + * larger + */ if (nbfile_alloc <= hur->hur_request.hr_itemcount) { ssize_t size; @@ -7561,9 +8830,9 @@ static int lfs_hsm_request(int argc, char **argv, int action) oldhur = hur; hur = llapi_hsm_user_request_alloc(nbfile_alloc, opaque_len); - if (hur == NULL) { - fprintf(stderr, "hsm: cannot allocate " - "the request: %s\n", + if (!hur) { + fprintf(stderr, + "hsm: cannot allocate the request: %s\n", strerror(errno)); hur = oldhur; rc = -errno; @@ -7572,10 +8841,10 @@ static int lfs_hsm_request(int argc, char **argv, int action) } size = hur_len(oldhur); if (size < 0) { - fprintf(stderr, "hsm: cannot allocate " - "%u files + %u bytes data\n", - oldhur->hur_request.hr_itemcount, - oldhur->hur_request.hr_data_len); + fprintf(stderr, + "hsm: cannot allocate %u files + %u bytes data\n", + oldhur->hur_request.hr_itemcount, + oldhur->hur_request.hr_data_len); free(hur); hur = oldhur; rc = -E2BIG; @@ -7597,7 +8866,7 @@ static int lfs_hsm_request(int argc, char **argv, int action) goto out_free; } - if (some_file == NULL) { + if (!some_file) { some_file = line; line = NULL; } @@ -7609,7 +8878,7 @@ static int lfs_hsm_request(int argc, char **argv, int action) /* If a --data was used, add it to the request */ hur->hur_request.hr_data_len = opaque_len; - if (opaque != NULL) + if (opaque) memcpy(hur_data(hur), opaque, opaque_len); /* Send the HSM request */ @@ -7730,8 +8999,9 @@ static int lfs_ladvise(int argc, char **argv) case 'a': advice_type = lfs_get_ladvice(optarg); if (advice_type == LU_LADVISE_INVALID) { - fprintf(stderr, "%s: invalid advice type " - "'%s'\n", argv[0], optarg); + fprintf(stderr, + "%s: invalid advice type '%s'\n", + argv[0], optarg); fprintf(stderr, "Valid types:"); for (advice_type = 0; @@ -7768,8 +9038,9 @@ static int lfs_ladvise(int argc, char **argv) rc = llapi_parse_size(optarg, &start, &size_units, 0); if (rc) { - fprintf(stderr, "%s: bad start offset " - "'%s'\n", argv[0], optarg); + fprintf(stderr, + "%s: bad start offset '%s'\n", + argv[0], optarg); return CMD_HELP; } break; @@ -7786,8 +9057,8 @@ static int lfs_ladvise(int argc, char **argv) case 'm': mode = lfs_get_mode(optarg); if (mode < 0) { - fprintf(stderr, "%s: bad mode '%s', valid " - "modes are READ or WRITE\n", + fprintf(stderr, + "%s: bad mode '%s', valid modes are READ or WRITE\n", argv[0], optarg); return CMD_HELP; } @@ -7815,9 +9086,9 @@ static int lfs_ladvise(int argc, char **argv) } if (advice_type == LU_LADVISE_LOCKNOEXPAND) { - fprintf(stderr, "%s: Lock no expand advice is a per file " - "descriptor advice, so when called from lfs, " - "it does nothing.\n", argv[0]); + fprintf(stderr, + "%s: Lock no expand advice is a per file descriptor advice, so when called from lfs, it does nothing.\n", + argv[0]); return CMD_HELP; } @@ -7882,9 +9153,9 @@ static int lfs_ladvise(int argc, char **argv) rc2 = llapi_ladvise(fd, flags, 1, &advice); close(fd); if (rc2 < 0) { - fprintf(stderr, "%s: cannot give advice '%s' to file " - "'%s': %s\n", argv[0], - ladvise_names[advice_type], + fprintf(stderr, + "%s: cannot give advice '%s' to file '%s': %s\n", + argv[0], ladvise_names[advice_type], path, strerror(errno)); goto next; @@ -7897,7 +9168,132 @@ next: return rc; } -/** The input string contains a comma delimited list of component ids and +static const char *const heat_names[] = LU_HEAT_NAMES; + +static int lfs_heat_get(int argc, char **argv) +{ + struct lu_heat *heat; + int rc = 0, rc2; + char *path; + int fd; + int i; + + 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], + (unsigned long long)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) @@ -7907,7 +9303,7 @@ static int parse_mirror_ids(__u16 *ids, int size, char *arg) int nr = 0; int rc; - if (arg == NULL) + if (!arg) return -EINVAL; while (!end_of_loop) { @@ -7959,7 +9355,7 @@ static int parse_mirror_ids(__u16 *ids, int size, char *arg) arg = ++ptr; rc = 0; } - if (!end_of_loop && ptr != NULL) + if (!end_of_loop && ptr) *ptr = ','; return rc < 0 ? rc : nr; @@ -8070,7 +9466,7 @@ int verify_mirror_ids(const char *fname, __u16 *mirror_ids, int ids_nr) } layout = llapi_layout_get_by_fd(fd, 0); - if (layout == NULL) { + if (!layout) { fprintf(stderr, "%s: '%s' llapi_layout_get_by_fd failed: %s.\n", progname, fname, strerror(errno)); rc = -errno; @@ -8144,6 +9540,7 @@ int lfs_mirror_resync_file(const char *fname, struct ll_ioc_lease *ioc, int idx; int fd; int rc; + int rc2; if (stat(fname, &stbuf) < 0) { fprintf(stderr, "%s: cannot stat file '%s': %s.\n", @@ -8167,7 +9564,7 @@ int lfs_mirror_resync_file(const char *fname, struct ll_ioc_lease *ioc, } layout = llapi_layout_get_by_fd(fd, 0); - if (layout == NULL) { + if (!layout) { fprintf(stderr, "%s: '%s' llapi_layout_get_by_fd failed: %s.\n", progname, fname, strerror(errno)); rc = -errno; @@ -8208,7 +9605,7 @@ int lfs_mirror_resync_file(const char *fname, struct ll_ioc_lease *ioc, else fprintf(stderr, "%s: '%s' llapi_lease_get_ext resync failed: %s.\n", - progname, fname, strerror(errno)); + progname, fname, strerror(-rc)); goto free_layout; } @@ -8232,10 +9629,10 @@ int lfs_mirror_resync_file(const char *fname, struct ll_ioc_lease *ioc, 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); + fprintf(stderr, "%s: '%s' llapi_mirror_resync_many: %s.\n", + progname, fname, strerror(-rc)); - /* prepare ioc for lease put */ + /* need to do the lease unlock even resync fails */ ioc->lil_mode = LL_LEASE_UNLCK; ioc->lil_flags = LL_LEASE_RESYNC_DONE; ioc->lil_count = 0; @@ -8246,19 +9643,19 @@ int lfs_mirror_resync_file(const char *fname, struct ll_ioc_lease *ioc, } } - 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; - } + rc2 = llapi_lease_set(fd, ioc); /** * llapi_lease_set returns lease mode when it request to unlock - * the lease lock + * the lease lock. */ - rc = 0; + if (rc2 <= 0) { + /* rc2 == 0 means lost lease lock */ + if (rc2 == 0 && rc == 0) + rc = -EBUSY; + fprintf(stderr, "%s: resync file '%s' failed: %s.\n", + progname, fname, + rc2 == 0 ? "lost lease lock" : strerror(-rc2)); + } free_layout: llapi_layout_free(layout); @@ -8314,7 +9711,6 @@ static inline int lfs_mirror_resync(int argc, char **argv) argv[0]); rc = CMD_HELP; goto error; - } if (ids_nr > 0) { @@ -8325,7 +9721,7 @@ static inline int lfs_mirror_resync(int argc, char **argv) /* set the lease on the file */ ioc = calloc(sizeof(*ioc) + sizeof(__u32) * 4096, 1); - if (ioc == NULL) { + if (!ioc) { fprintf(stderr, "%s: cannot alloc id array for ioc: %s.\n", argv[0], strerror(errno)); rc = -errno; @@ -8352,7 +9748,7 @@ static inline int verify_mirror_id_by_fd(int fd, __u16 mirror_id) int rc; layout = llapi_layout_get_by_fd(fd, 0); - if (layout == NULL) { + if (!layout) { fprintf(stderr, "could not get layout.\n"); return -EINVAL; } @@ -8380,22 +9776,16 @@ static inline int verify_mirror_id_by_fd(int fd, __u16 mirror_id) * \retval 1 not the same file * \retval <0 error code */ -static inline int check_same_file(const char *f1, const char *f2) +static inline int check_same_file(int fd, const char *f2) { struct stat stbuf1; struct stat stbuf2; - if (stat(f1, &stbuf1) < 0) { - fprintf(stderr, "%s: cannot stat file '%s': %s\n", - progname, f1, strerror(errno)); + if (fstat(fd, &stbuf1) < 0) return -errno; - } - if (stat(f2, &stbuf2) < 0) { - fprintf(stderr, "%s: cannot stat file '%s': %s\n", - progname, f2, strerror(errno)); - return -errno; - } + if (stat(f2, &stbuf2) < 0) + return 1; if (stbuf1.st_rdev == stbuf2.st_rdev && stbuf1.st_ino == stbuf2.st_ino) @@ -8461,19 +9851,6 @@ static inline int lfs_mirror_read(int argc, char **argv) /* open mirror file */ fname = argv[optind]; - - if (outfile) { - rc = check_same_file(fname, outfile); - if (rc == 0) { - fprintf(stderr, - "%s %s: output file cannot be the mirrored file\n", - progname, argv[0]); - return -EINVAL; - } - if (rc < 0) - return rc; - } - fd = open(fname, O_DIRECT | O_RDONLY); if (fd < 0) { fprintf(stderr, "%s %s: cannot open '%s': %s\n", @@ -8490,7 +9867,7 @@ static inline int lfs_mirror_read(int argc, char **argv) goto close_fd; } - /* open output file */ + /* open output file - O_EXCL ensures output is not the same as input */ if (outfile) { outfd = open(outfile, O_EXCL | O_WRONLY | O_CREAT, 0644); if (outfd < 0) { @@ -8630,19 +10007,6 @@ static inline int lfs_mirror_write(int argc, char **argv) /* open mirror file */ fname = argv[optind]; - - if (inputfile) { - rc = check_same_file(fname, inputfile); - if (rc == 0) { - fprintf(stderr, - "%s %s: input file cannot be the mirrored file\n", - progname, argv[0]); - return -EINVAL; - } - if (rc < 0) - return rc; - } - fd = open(fname, O_DIRECT | O_WRONLY); if (fd < 0) { fprintf(stderr, "%s %s: cannot open '%s': %s\n", @@ -8661,6 +10025,16 @@ static inline int lfs_mirror_write(int argc, char **argv) /* open input file */ if (inputfile) { + rc = check_same_file(fd, inputfile); + if (rc == 0) { + fprintf(stderr, + "%s %s: input file cannot be the mirrored file\n", + progname, argv[0]); + goto close_fd; + } + if (rc < 0) + goto close_fd; + inputfd = open(inputfile, O_RDONLY, 0644); if (inputfd < 0) { fprintf(stderr, "%s %s: cannot open file '%s': %s\n", @@ -8769,37 +10143,6 @@ 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; @@ -8809,7 +10152,7 @@ static inline int get_other_mirror_ids(int fd, __u16 *ids, __u16 exclude_id) int rc; layout = llapi_layout_get_by_fd(fd, 0); - if (layout == NULL) { + if (!layout) { fprintf(stderr, "could not get layout\n"); return -EINVAL; } @@ -8955,7 +10298,7 @@ static inline int lfs_mirror_copy(int argc, char **argv) } ioc = calloc(sizeof(*ioc) + sizeof(__u32) * 4096, 1); - if (ioc == NULL) { + if (!ioc) { fprintf(stderr, "%s %s: cannot alloc comp id array for ioc: %s\n", progname, argv[0], strerror(errno)); @@ -8965,7 +10308,7 @@ static inline int lfs_mirror_copy(int argc, char **argv) /* get stale component info */ layout = llapi_layout_get_by_fd(fd, 0); - if (layout == NULL) { + if (!layout) { fprintf(stderr, "%s %s: failed to get layout of '%s': %s\n", progname, argv[0], fname, strerror(errno)); rc = -errno; @@ -9042,6 +10385,7 @@ close_fd: return rc; } + /** * struct verify_chunk - Mirror chunk to be verified. * @chunk: [start, end) of the chunk. @@ -9268,7 +10612,7 @@ int lfs_mirror_prepare_chunk(struct llapi_layout *layout, goto error; } - next: +next: rc = llapi_layout_comp_use(layout, LLAPI_LAYOUT_COMP_USE_NEXT); if (rc < 0) { @@ -9476,7 +10820,7 @@ int lfs_mirror_verify_file(const char *fname, __u16 *mirror_ids, int ids_nr, } layout = llapi_layout_get_by_fd(fd, 0); - if (layout == NULL) { + if (!layout) { fprintf(stderr, "%s: '%s' llapi_layout_get_by_fd failed: %s.\n", progname, fname, strerror(errno)); rc = -errno; @@ -9655,7 +10999,6 @@ static inline int lfs_mirror_verify(int argc, char **argv) progname); rc = CMD_HELP; goto error; - } if (ids_nr > 0) { @@ -9773,14 +11116,15 @@ static int lfs_getsom(int argc, char **argv) switch (type) { case LFS_SOM_ATTR_ALL: printf("file: %s size: %llu blocks: %llu flags: %x\n", - path, attrs->lsa_size, attrs->lsa_blocks, + path, (unsigned long long)attrs->lsa_size, + (unsigned long long)attrs->lsa_blocks, attrs->lsa_valid); break; case LFS_SOM_SIZE: - printf("%llu\n", attrs->lsa_size); + printf("%llu\n", (unsigned long long)attrs->lsa_size); break; case LFS_SOM_BLOCKS: - printf("%llu\n", attrs->lsa_blocks); + printf("%llu\n", (unsigned long long)attrs->lsa_blocks); break; case LFS_SOM_FLAGS: printf("%x\n", attrs->lsa_valid); @@ -9812,6 +11156,353 @@ static int lfs_mirror_list_commands(int argc, char **argv) return 0; } +static int lfs_pcc_attach(int argc, char **argv) +{ + struct option long_opts[] = { + { .val = 'i', .name = "id", .has_arg = required_argument }, + { .name = NULL } }; + int c; + int rc = 0; + __u32 archive_id = 0; + const char *path; + char *end; + char fullpath[PATH_MAX]; + enum lu_pcc_type type = LU_PCC_READWRITE; + + optind = 0; + while ((c = getopt_long(argc, argv, "i:", + long_opts, NULL)) != -1) { + switch (c) { + case 'i': + archive_id = strtoul(optarg, &end, 0); + if (*end != '\0' || archive_id == 0) { + fprintf(stderr, + "error: %s: bad archive ID '%s'\n", + argv[0], optarg); + return CMD_HELP; + } + break; + case '?': + return CMD_HELP; + default: + fprintf(stderr, "%s: option '%s' unrecognized\n", + argv[0], argv[optind - 1]); + return CMD_HELP; + } + } + + if (archive_id == 0) { + fprintf(stderr, "%s: must specify attach ID\n", argv[0]); + return CMD_HELP; + } + + if (argc <= optind) { + fprintf(stderr, "%s: must specify one or more file names\n", + argv[0]); + return CMD_HELP; + } + + while (optind < argc) { + int rc2; + + path = argv[optind++]; + if (!realpath(path, fullpath)) { + fprintf(stderr, "%s: could not find path '%s': %s\n", + argv[0], path, strerror(errno)); + if (rc == 0) + rc = -EINVAL; + continue; + } + + rc2 = llapi_pcc_attach(fullpath, archive_id, type); + if (rc2 < 0) { + fprintf(stderr, + "%s: cannot attach '%s' to PCC with archive ID '%u': %s\n", + argv[0], path, archive_id, strerror(-rc2)); + if (rc == 0) + rc = rc2; + } + } + return rc; +} + +static int lfs_pcc_attach_fid(int argc, char **argv) +{ + struct option long_opts[] = { + { .val = 'i', .name = "id", .has_arg = required_argument }, + { .val = 'm', .name = "mnt", .has_arg = required_argument }, + { .name = NULL } }; + char short_opts[] = "i:m:"; + int c; + int rc = 0; + __u32 archive_id = 0; + char *end; + const char *mntpath = NULL; + const char *fidstr; + enum lu_pcc_type type = LU_PCC_READWRITE; + + optind = 0; + while ((c = getopt_long(argc, argv, short_opts, + long_opts, NULL)) != -1) { + switch (c) { + case 'i': + archive_id = strtoul(optarg, &end, 0); + if (*end != '\0') { + fprintf(stderr, + "error: %s: bad archive ID '%s'\n", + argv[0], optarg); + return CMD_HELP; + } + break; + case 'm': + mntpath = optarg; + break; + case '?': + return CMD_HELP; + default: + fprintf(stderr, "%s: option '%s' unrecognized\n", + argv[0], argv[optind - 1]); + return CMD_HELP; + } + } + + if (archive_id == 0) { + fprintf(stderr, "%s: must specify an archive ID\n", argv[0]); + return CMD_HELP; + } + + if (!mntpath) { + fprintf(stderr, "%s: must specify Lustre mount point\n", + argv[0]); + return CMD_HELP; + } + + if (argc <= optind) { + fprintf(stderr, "%s: must specify one or more fids\n", argv[0]); + return CMD_HELP; + } + + while (optind < argc) { + int rc2; + + fidstr = argv[optind++]; + + rc2 = llapi_pcc_attach_fid_str(mntpath, fidstr, + archive_id, type); + if (rc2 < 0) { + fprintf(stderr, + "%s: cannot attach '%s' on '%s' to PCC with archive ID '%u': %s\n", + argv[0], fidstr, mntpath, archive_id, + strerror(rc2)); + } + if (rc == 0 && rc2 < 0) + rc = rc2; + } + return rc; +} + +static int lfs_pcc_detach(int argc, char **argv) +{ + struct option long_opts[] = { + { .val = 'k', .name = "keep", .has_arg = no_argument }, + { .name = NULL } }; + char short_opts[] = "k"; + int c; + int rc = 0; + const char *path; + char fullpath[PATH_MAX]; + __u32 detach_opt = PCC_DETACH_OPT_UNCACHE; + + optind = 0; + while ((c = getopt_long(argc, argv, short_opts, + long_opts, NULL)) != -1) { + switch (c) { + case 'k': + detach_opt = PCC_DETACH_OPT_NONE; + break; + case '?': + return CMD_HELP; + default: + fprintf(stderr, "%s: option '%s' unrecognized\n", + argv[0], argv[optind - 1]); + return CMD_HELP; + } + } + + while (optind < argc) { + int rc2; + + path = argv[optind++]; + if (!realpath(path, fullpath)) { + fprintf(stderr, "%s: could not find path '%s': %s\n", + argv[0], path, strerror(errno)); + if (rc == 0) + rc = -EINVAL; + continue; + } + + rc2 = llapi_pcc_detach_file(fullpath, detach_opt); + if (rc2 < 0) { + rc2 = -errno; + fprintf(stderr, + "%s: cannot detach '%s' from PCC: %s\n", + argv[0], path, strerror(errno)); + if (rc == 0) + rc = rc2; + } + } + return rc; +} + +static int lfs_pcc_detach_fid(int argc, char **argv) +{ + struct option long_opts[] = { + { .val = 'k', .name = "keep", .has_arg = no_argument }, + { .name = NULL } }; + char short_opts[] = "k"; + int c; + int rc = 0; + const char *fid; + const char *mntpath; + __u32 detach_opt = PCC_DETACH_OPT_UNCACHE; + + optind = 0; + while ((c = getopt_long(argc, argv, short_opts, + long_opts, NULL)) != -1) { + switch (c) { + case 'k': + detach_opt = PCC_DETACH_OPT_NONE; + break; + case '?': + return CMD_HELP; + default: + fprintf(stderr, "%s: option '%s' unrecognized\n", + argv[0], argv[optind - 1]); + return CMD_HELP; + } + } + + mntpath = argv[optind++]; + + while (optind < argc) { + int rc2; + + fid = argv[optind++]; + + rc2 = llapi_pcc_detach_fid_str(mntpath, fid, detach_opt); + if (rc2 < 0) { + fprintf(stderr, + "%s: cannot detach '%s' on '%s' from PCC: %s\n", + argv[0], fid, mntpath, strerror(-rc2)); + if (rc == 0) + rc = rc2; + } + } + return rc; +} + +static int lfs_pcc_state(int argc, char **argv) +{ + int rc = 0; + const char *path; + char fullpath[PATH_MAX]; + struct lu_pcc_state state; + + optind = 1; + + if (argc <= 1) { + fprintf(stderr, "%s: must specify one or more file names\n", + argv[0]); + return CMD_HELP; + } + + while (optind < argc) { + int rc2; + + path = argv[optind++]; + if (!realpath(path, fullpath)) { + fprintf(stderr, "%s: could not find path '%s': %s\n", + argv[0], path, strerror(errno)); + if (rc == 0) + rc = -EINVAL; + continue; + } + + rc2 = llapi_pcc_state_get(fullpath, &state); + if (rc2 < 0) { + if (rc == 0) + rc = rc2; + fprintf(stderr, + "%s: cannot get PCC state of '%s': %s\n", + argv[0], path, strerror(-rc2)); + continue; + } + + printf("file: %s", path); + printf(", type: %s", pcc_type2string(state.pccs_type)); + if (state.pccs_type == LU_PCC_NONE && + state.pccs_open_count == 0) { + printf("\n"); + continue; + } + + printf(", PCC file: %s", state.pccs_path); + printf(", user number: %u", state.pccs_open_count); + printf(", flags: %x", state.pccs_flags); + printf("\n"); + } + return rc; +} + +/** + * lfs_pcc_list_commands() - List lfs pcc commands. + * @argc: The count of command line arguments. + * @argv: Array of strings for command line arguments. + * + * This function lists lfs pcc commands defined in pcc_cmdlist[]. + * + * Return: 0 on success. + */ +static int lfs_pcc_list_commands(int argc, char **argv) +{ + char buffer[81] = ""; + + Parser_list_commands(pcc_cmdlist, buffer, sizeof(buffer), + NULL, 0, 4); + + return 0; +} + +/** + * lfs_pcc() - Parse and execute lfs pcc commands. + * @argc: The count of lfs pcc command line arguments. + * @argv: Array of strings for lfs pcc command line arguments. + * + * This function parses lfs pcc commands and performs the + * corresponding functions specified in pcc_cmdlist[]. + * + * Return: 0 on success or an error code on failure. + */ +static int lfs_pcc(int argc, char **argv) +{ + char cmd[PATH_MAX]; + int rc = 0; + + setlinebuf(stdout); + + Parser_init("lfs-pcc > ", pcc_cmdlist); + + snprintf(cmd, sizeof(cmd), "%s %s", progname, argv[0]); + progname = cmd; + program_invocation_short_name = cmd; + if (argc > 1) + rc = Parser_execarg(argc - 1, argv + 1, pcc_cmdlist); + else + rc = Parser_commands(); + + return rc < 0 ? -rc : rc; +} + static int lfs_list_commands(int argc, char **argv) { char buffer[81] = ""; /* 80 printable chars + terminating NUL */