X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre%2Futils%2Flfs.c;h=1753019ef82e00fbcca61db1d826fd39ab8fd441;hp=67595de98d53817f201a9285c591758096f1dc04;hb=f530ecc221ac345ba1aac5ff1cdf6420ac7651d3;hpb=4eca26ddab3186a68888862218fa8904f812e5a1 diff --git a/lustre/utils/lfs.c b/lustre/utils/lfs.c index 67595de..1753019 100644 --- a/lustre/utils/lfs.c +++ b/lustre/utils/lfs.c @@ -71,11 +71,12 @@ #include #include #include +#include #include #include #include #include -#include +#include #ifndef ARRAY_SIZE # define ARRAY_SIZE(a) ((sizeof(a)) / (sizeof((a)[0]))) @@ -103,6 +104,7 @@ 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); @@ -134,6 +136,10 @@ 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, @@ -142,6 +148,7 @@ 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); @@ -166,6 +173,10 @@ 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) \ @@ -174,21 +185,27 @@ static inline int lfs_mirror_split(int argc, char **argv) " [--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" \ + "\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"\ @@ -196,7 +213,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" \ @@ -216,7 +233,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" \ @@ -233,8 +250,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 \ @@ -264,14 +281,14 @@ 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" \ - " space create subdirectories with balanced space usage\n" \ "\tdefault_stripe: set default dirstripe of the directory\n" \ "\tmode: the file access permission of the directory (octal)\n" \ "To create dir with a foreign (free format) layout :\n" \ "setdirstripe|mkdir --foreign[=] -x|-xattr " \ - "[--mode|-m mode] [--flags ] \n" \ + "[--mode|-o mode] [--flags ] \n" \ "\tmode: the mode of the directory\n" \ "\tforeign_type: none or daos\n" @@ -283,22 +300,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" @@ -376,10 +400,10 @@ command_t cmdlist[] = { 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" @@ -405,14 +429,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, @@ -423,8 +448,7 @@ command_t cmdlist[] = { " [--recursive|-r] [--yaml|-y]\n" " [--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, @@ -440,13 +464,16 @@ command_t cmdlist[] = { "find files matching given attributes recursively in directory tree.\n" "usage: find ...\n" " [[!] --atime|-A [+-]N[smhdwy]] [[!] --ctime|-C [+-]N[smhdwy]]\n" - " [[!] --mtime|-M [+-]N[smhdwy]] [[!] --blocks|-b N]\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" @@ -456,7 +483,7 @@ command_t cmdlist[] = { " [[!] --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" @@ -479,7 +506,8 @@ command_t cmdlist[] = { {"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]"}, + "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 ...]"}, @@ -494,8 +522,8 @@ command_t cmdlist[] = { " [--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" @@ -518,8 +546,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" @@ -550,13 +581,13 @@ command_t cmdlist[] = { {"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" @@ -605,8 +636,9 @@ 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" @@ -688,15 +720,18 @@ command_t cmdlist[] = { 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; - if (!strcmp(hashtype, LMV_HASH_NAME_SPACE)) - return LMV_HASH_TYPE_DEFAULT | LMV_HASH_FLAG_SPACE; - return 0; } @@ -801,12 +836,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) { @@ -1096,10 +1131,18 @@ static int lfs_component_set(char *fname, int comp_id, } 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; } @@ -1180,6 +1223,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; @@ -1189,6 +1234,36 @@ 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). * It is also the default mode, since we cannot distinguish @@ -1225,7 +1300,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)); @@ -1320,6 +1395,7 @@ struct mirror_args { struct llapi_layout *m_layout; const char *m_file; struct mirror_args *m_next; + bool m_inherit; }; /** @@ -1336,6 +1412,7 @@ enum mirror_flags { MF_NO_VERIFY = 0x1, MF_DESTROY = 0x2, MF_COMP_ID = 0x4, + MF_COMP_POOL = 0x8, }; /** @@ -1670,14 +1747,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 == NULL) { + 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; @@ -1745,7 +1844,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; @@ -1790,7 +1890,99 @@ 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; @@ -1800,6 +1992,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; @@ -1833,21 +2026,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); @@ -1890,11 +2102,19 @@ static int mirror_split(const char *fname, __u32 id, if (victim_file == NULL) { /* 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 { @@ -1929,7 +2149,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 */ @@ -1951,6 +2171,72 @@ free_layout: return rc; } +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; + + rc = llapi_lease_acquire(fd, LL_LEASE_RDLCK); + if (rc < 0) { + error_loc = "cannot get lease"; + goto out_close; + } + + /* 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. * @@ -2112,7 +2398,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); } @@ -2158,13 +2443,12 @@ new_comp: 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)); @@ -2182,14 +2466,9 @@ new_comp: if (set_extent) { uint64_t comp_end = lsa->lsa_comp_end; - /* Extension space handling: - * If this is the first component, length is extension_size. - * If not, it is zero length, so it can be removed if there is - * insufficient space to extend it. - */ - if (lsa->lsa_extension_comp && lsa->lsa_first_comp) - comp_end = prev_end + lsa->lsa_extension_size; - else if (lsa->lsa_extension_comp) + /* 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, @@ -2246,7 +2525,8 @@ new_comp: 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 */ @@ -2255,7 +2535,8 @@ new_comp: 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; } } @@ -2303,7 +2584,8 @@ new_comp: 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); + lsa->lsa_stripe_count, + lsa->lsa_nr_tgts); errno = EINVAL; return -1; } @@ -2357,26 +2639,75 @@ 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 == NULL) + 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) return -EINVAL; - string = node->cy_string; /* skip leading lmm_ if present, to simplify parsing */ if (strncmp(string, "lmm_", 4) == 0) string += 4; @@ -2410,18 +2741,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; @@ -2431,6 +2752,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")) { @@ -2442,6 +2766,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; } @@ -2469,13 +2802,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); @@ -2486,51 +2817,134 @@ 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) { - fprintf(stderr, - "%s setstripe: layout must be specified\n", - progname); - return -EINVAL; + rc = llapi_layout_comp_use(layout, LLAPI_LAYOUT_COMP_USE_NEXT); + if (rc < 0) { + fprintf(stderr, "%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) { - 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; + /* 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 get component ext size: " + "%s\n", progname, strerror(errno)); + return rc; + } + + rc = llapi_layout_comp_extent_get(layout, &next_start, &next_end); + if (rc) { + fprintf(stderr, "%s setstripe: cannot get extent: %s\n", + progname, strerror(errno)); + return rc; } - 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)); + 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; + } + + rc = llapi_layout_comp_use(layout, LLAPI_LAYOUT_COMP_USE_PREV); + if (rc < 0) { + fprintf(stderr, "%s setstripe: cannot move component cursor: " + "%s\n", progname, strerror(errno)); + return rc; + } + + *end += offset ?: size; + rc = llapi_layout_comp_extent_set(layout, start, *end); + if (rc) { + fprintf(stderr, "%s setstripe: cannot set extent: %s\n", + progname, strerror(errno)); + return rc; + } + + 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 == NULL || !(comp_add || llapi_layout_is_composite(layout))) + return 0; + + errno = 0; + while (comp_add) { + head = llapi_layout_get_by_path(fname, 0); + if (head == NULL) { + 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); - return rc; + break; } - llapi_layout_free(head); - /* 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) { @@ -2547,37 +2961,46 @@ static int adjust_first_extent(char *fname, struct llapi_layout *layout) return rc; } - if (start > prev_end || end <= prev_end) { - fprintf(stderr, - "%s setstripe: first extent [%lu, %lu) not adjacent with extent end %lu\n", - progname, start, end, prev_end); - return -EINVAL; - } - - rc = llapi_layout_stripe_size_get(layout, &stripe_size); - if (rc) { - fprintf(stderr, "%s setstripe: cannot get stripe size: %s\n", - progname, strerror(errno)); - return rc; + if (start == 0 && end == 0) { + rc = layout_extend_comp(layout, start, &end, + comp_add ? prev_end : 0); + if (rc) + return rc; } - if (stripe_size != LLAPI_LAYOUT_DEFAULT && - (prev_end & (stripe_size - 1))) { - fprintf(stderr, - "%s setstripe: stripe size %lu not aligned with %lu\n", - progname, stripe_size, prev_end); + if (start > prev_end || end < prev_end) { + fprintf(stderr, "%s setstripe: first extent [%lu, %lu) not " + "adjacent with extent end %lu\n", + progname, start, end, prev_end); return -EINVAL; } rc = llapi_layout_comp_extent_set(layout, prev_end, end); if (rc) { - fprintf(stderr, - "%s setstripe: cannot set component extent [%lu, %lu): %s\n", + fprintf(stderr, "%s setstripe: cannot set component extent " + "[%lu, %lu): %s\n", progname, prev_end, end, strerror(errno)); return rc; } - return 0; + return ret; +} + +static int mirror_adjust_first_extents(struct mirror_args *list) +{ + int rc = 0; + + if (list == NULL) + return 0; + + while (list != NULL) { + 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) @@ -2599,8 +3022,10 @@ static struct mirror_args *lfs_mirror_alloc(void) while (1) { mirror = calloc(1, sizeof(*mirror)); - if (mirror != NULL) + if (mirror != NULL) { + mirror->m_inherit = false; break; + } sleep(1); } @@ -2661,6 +3086,7 @@ enum { LFS_MIRROR_INDEX_OPT, LFS_LAYOUT_FOREIGN_OPT, LFS_MODE_OPT, + LFS_NEWERXY_OPT, }; /* functions */ @@ -2715,6 +3141,7 @@ static int lfs_setstripe_internal(int argc, char **argv, /* 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, @@ -2767,6 +3194,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}, @@ -2803,12 +3231,17 @@ static int lfs_setstripe_internal(int argc, char **argv, migrate_mode = (opc == SO_MIGRATE); mirror_mode = (opc == SO_MIRROR_CREATE || opc == SO_MIRROR_EXTEND); setstripe_mode = (opc == SO_SETSTRIPE); + 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: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. */ @@ -2931,6 +3364,12 @@ 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': @@ -3133,6 +3572,8 @@ static int lfs_setstripe_internal(int argc, char **argv, if (last_mirror != NULL) { /* 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; @@ -3156,6 +3597,12 @@ static int lfs_setstripe_internal(int argc, char **argv, 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 @@ -3241,6 +3688,11 @@ 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 */ @@ -3273,6 +3725,8 @@ 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; } @@ -3365,15 +3819,6 @@ static int lfs_setstripe_internal(int argc, char **argv, progname, argv[0]); goto usage_error; } - - result = adjust_first_extent(fname, layout); - if (result == -ENODATA) - comp_add = 0; - else if (result != 0) { - fprintf(stderr, "error: %s: invalid layout\n", - progname); - goto error; - } } if (from_yaml && from_copy) { @@ -3385,8 +3830,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; } @@ -3398,11 +3843,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; } @@ -3432,10 +3877,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_DEFAULT; - 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) - 1); + lmu->lum_pool_name[sizeof(lmu->lum_pool_name) - 1] = 0; + } if (lsa.lsa_nr_tgts > 1) { int i; @@ -3445,7 +3892,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; } @@ -3499,9 +3946,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; @@ -3524,17 +3971,34 @@ static int lfs_setstripe_internal(int argc, char **argv, 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 == NULL) { + 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) { @@ -3555,18 +4019,21 @@ 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) { @@ -3774,6 +4241,8 @@ static int lfs_find(int argc, char **argv) struct option long_opts[] = { { .val = 'A', .name = "atime", .has_arg = required_argument }, { .val = 'b', .name = "blocks", .has_arg = required_argument }, + { .val = '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, @@ -3793,6 +4262,58 @@ static int lfs_find(int argc, char **argv) .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 }, @@ -3810,6 +4331,7 @@ static int lfs_find(int argc, char **argv) { .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 }, @@ -3837,23 +4359,28 @@ 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) { + "-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) @@ -3892,6 +4419,13 @@ static int lfs_find(int argc, char **argv) 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') { @@ -4075,6 +4609,152 @@ static int lfs_find(int argc, char **argv) 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); @@ -4101,6 +4781,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) @@ -4356,31 +5039,55 @@ err_free: param.fp_check_mdt_count = 1; param.fp_exclude_mdt_count = !!neg_opt; break; - default: - ret = CMD_HELP; - goto err; - }; - } + case 'z': + if (optarg[0] == '+') { + param.fp_ext_size_sign = -1; + optarg++; + } else if (optarg[0] == '-') { + param.fp_ext_size_sign = 1; + optarg++; + } - 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; - } + 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); @@ -4397,6 +5104,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, @@ -4428,6 +5137,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 }, @@ -4450,6 +5160,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; @@ -4458,7 +5170,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; @@ -4718,6 +5430,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; } @@ -4930,27 +5648,27 @@ static inline int obd_statfs_ratio(const struct obd_statfs *st, bool inodes) return (ratio - (int)ratio) > 0 ? (int)(ratio + 1) : (int)ratio; } -/* This is only used to reflect various problem states for lfs df, so we only - * translate the flags reflecting those states. +/* 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 char obd_statfs_state_names[] = { - [OS_STATE_DEGRADED] = 'D', - [OS_STATE_READONLY] = 'R', - [OS_STATE_NOPRECREATE] = 'N', - [OS_STATE_ENOSPC] = 'S', - [OS_STATE_ENOINO] = 'I', +static 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 char obd_statfs_state2char(int s) -{ - /* Unknown name */ - if (s > ARRAY_SIZE(obd_statfs_state_names)/sizeof(char) || - obd_statfs_state_names[s] == 0) - return '?'; - - return obd_statfs_state_names[s]; -} - static int showdf(char *mntdir, struct obd_statfs *stat, char *uuid, enum mntdf_flags flags, char *type, int index, int rc) @@ -5024,16 +5742,14 @@ static int showdf(char *mntdir, struct obd_statfs *stat, printf("[%s:%d]", type, index); if (stat->os_state) { - uint32_t state; uint32_t i; printf(" "); - for (i = 0, state = stat->os_state; state != 0; i++) { - uint32_t mask = 1 << i; - if (!(state & mask) || mask == OS_STATE_NONROT) - continue; - printf("%c", obd_statfs_state2char(mask)); - state &= ~mask; + 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); } } @@ -5218,28 +5934,6 @@ 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) { @@ -5252,12 +5946,9 @@ static int lfs_setdirstripe(int argc, char **argv) char *mode_opt = NULL; bool default_stripe = false; bool delete = false; - bool auto_distributed = false; bool foreign_mode = false; mode_t mode = S_IRWXU | S_IRWXG | S_IRWXO; mode_t previous_mode = 0; - struct ll_statfs_buf *lsb = NULL; - char mntdir[PATH_MAX] = ""; char *xattr = NULL; __u32 type = LU_FOREIGN_TYPE_DAOS, flags = 0; struct option long_opts[] = { @@ -5275,6 +5966,7 @@ static int lfs_setdirstripe(int argc, char **argv) { .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 @@ -5488,6 +6180,11 @@ static int lfs_setdirstripe(int argc, char **argv) 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) @@ -5497,16 +6194,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_DEFAULT; + 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; } @@ -5516,21 +6214,6 @@ static int lfs_setdirstripe(int argc, char **argv) memcpy(param->lsp_tgts, mdts, sizeof(*mdts) * lsa.lsa_nr_tgts); } - if (!default_stripe && (lsa.lsa_pattern & LMV_HASH_FLAG_SPACE)) { - fprintf(stderr, "%s %s: can only specify -H space with -D\n", - progname, argv[0]); - free(param); - return CMD_HELP; - } - - if (param->lsp_stripe_offset != -1 && - lsa.lsa_pattern & LMV_HASH_FLAG_SPACE) { - fprintf(stderr, "%s %s: can only specify -H space with -i -1\n", - progname, argv[0]); - free(param); - return CMD_HELP; - } - dname = argv[optind]; do { if (default_stripe) { @@ -5542,100 +6225,6 @@ static int lfs_setdirstripe(int argc, char **argv) continue; } - /* - * 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; - } - - /* - * TODO: when MDT can allocate object with QoS (LU-9435), below - * code should be removed, instead we should let LMV to allocate - * the starting MDT object, and then let LOD allocate other MDT - * objects. - */ - if (!param->lsp_is_specific && param->lsp_stripe_offset == -1) { - char path[PATH_MAX] = ""; - - 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) - 1); - 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); if (result) fprintf(stderr, @@ -5646,7 +6235,6 @@ static int lfs_setdirstripe(int argc, char **argv) if (mode_opt != NULL) umask(previous_mode); - free(lsb); free(param); return result; } @@ -5719,7 +6307,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; @@ -5730,6 +6318,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; @@ -5737,7 +6326,7 @@ 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; } @@ -5811,43 +6400,33 @@ static int lfs_df(int argc, char **argv) return rc; } -static int print_instance(const char *mntdir, char *fsname, size_t fsnamelen, +static int print_instance(const char *mntdir, char *buf, size_t buflen, bool opt_instance, bool opt_fsname, bool opt_mntdir) { - char *buf = fsname; - - /* llapi_search_mounts() fills "fsname", but that is not called if - * explicit paths are specified on the command-line - */ - if (opt_instance || (opt_fsname && fsname[0] == '\0')) { - int rc = llapi_getname(mntdir, fsname, fsnamelen); + int rc = 0; - if (rc < 0) { - fprintf(stderr, "cannot get instance for '%s': %s\n", - mntdir, strerror(-rc)); - return rc; - } - buf = fsname; - if (!opt_instance) { - /* print only the fsname name */ - buf = strchr(fsname, '-'); - if (buf) - *buf = '\0'; - buf = fsname; - } else if (!opt_fsname) { - /* print only the instance name */ - buf = strchr(fsname, '-'); - if (buf) - buf++; - else - buf = fsname; - } + if (opt_fsname == opt_instance) { /* both true or both false */ + rc = llapi_getname(mntdir, buf, buflen); } else if (opt_fsname) { - /* print only the fsname */ - buf = 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; } - printf("%s %s\n", buf, opt_mntdir ? mntdir : ""); + if (opt_mntdir) + printf("%s %s\n", buf, mntdir); + else + printf("%s\n", buf); return 0; } @@ -5877,10 +6456,6 @@ static int lfs_getname(int argc, char **argv) } } - /* If neither option is given, print both instance and fsname */ - if (!opt_instance && !opt_fsname) - opt_instance = opt_fsname = true; - if (optind == argc) { /* no paths specified, get all paths. */ char mntdir[PATH_MAX] = "", path[PATH_MAX] = ""; int index = 0; @@ -6063,28 +6638,38 @@ static inline int has_times_option(int argc, char **argv) return 0; } -int lfs_setquota_times(int argc, char **argv) +static inline int lfs_verify_poolarg(char *pool) { - 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[] = { + 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, struct if_quotactl *qctl) +{ + 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': @@ -6096,63 +6681,78 @@ int lfs_setquota_times(int argc, char **argv) case 'p': qtype = PRJQUOTA; quota_type: - if (qctl.qc_type != ALLQUOTA) { + 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; + 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 '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; - } - } + 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 (qctl.qc_type == ALLQUOTA) { + if (qctl->qc_type == ALLQUOTA) { fprintf(stderr, "error: neither -u, -g nor -p specified\n"); - return CMD_HELP; - } - - if (optind != argc - 1) { - fprintf(stderr, "error: unexpected parameters encountered\n"); - return CMD_HELP; - } + 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) @@ -6163,9 +6763,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 }, @@ -6182,79 +6782,93 @@ 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; char *endptr; bool use_default = false; - int qtype; + int qtype, qctl_len; + + 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)) - return lfs_setquota_times(argc, argv); + 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, + 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': 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; + rc = -1; + goto out; } } - if (qctl.qc_id == 0) { + 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", 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': @@ -6266,7 +6880,8 @@ quota_type_def: fprintf(stderr, "%s setquota: warning: block softlimit '%llu' smaller than minimum qunit size\n" "See '%s help setquota' or Lustre manual for details\n", - progname, dqb->dqb_bsoftlimit, + progname, + (unsigned long long)dqb->dqb_bsoftlimit, progname); break; case 'B': @@ -6278,7 +6893,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': @@ -6289,7 +6905,8 @@ quota_type_def: fprintf(stderr, "%s setquota: warning: inode softlimit '%llu' smaller than minimum qunit size\n" "See '%s help setquota' or Lustre manual for details\n", - progname, dqb->dqb_isoftlimit, + progname, + (unsigned long long)dqb->dqb_isoftlimit, progname); break; case 'I': @@ -6300,29 +6917,43 @@ quota_type_def: fprintf(stderr, "%s setquota: warning: inode hardlimit '%llu' smaller than minimum qunit size\n" "See '%s help setquota' or Lustre manual for details\n", - progname, dqb->dqb_ihardlimit, + progname, + (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) { @@ -6330,22 +6961,25 @@ quota_type_def: "%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", 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]; @@ -6362,12 +6996,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; @@ -6393,17 +7027,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 @@ -6415,22 +7049,23 @@ quota_type_def: */ 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) @@ -6511,6 +7146,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; @@ -6550,7 +7186,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); @@ -6583,7 +7219,7 @@ static void print_quota(char *mnt, struct if_quotactl *qctl, int type, 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]", @@ -6608,17 +7244,23 @@ 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, @@ -6627,6 +7269,8 @@ static int print_obd_quota(char *mnt, struct if_quotactl *qctl, int is_mdt, int rc = 0, rc1 = 0, count = 0; __u32 valid = qctl->qc_valid; + /* 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", @@ -6715,6 +7359,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); @@ -6724,14 +7369,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, @@ -6758,8 +7405,16 @@ static int get_print_quota(char *mnt, char *name, struct if_quotactl *qctl, "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) @@ -6920,17 +7575,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 } }; + + qctl = calloc(1, sizeof(*qctl) + LOV_MAXPOOLNAME + 1); + if (!qctl) + return -ENOMEM; - while ((c = getopt(argc, argv, "gGi:I:o:pPqtuUvh")) != -1) { + 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; @@ -6947,39 +7613,42 @@ 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; + qctl->qc_cmd = LUSTRE_Q_GETINFO; break; case 'o': - valid = qctl.qc_valid = QC_UUID; - snprintf(obd_uuid, sizeof(qctl.obd_uuid), "%s", optarg); + valid = qctl->qc_valid = QC_UUID; + snprintf(obd_uuid, sizeof(*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': @@ -6991,90 +7660,110 @@ quota_type: 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) { + if ((qctl->qc_cmd == LUSTRE_Q_GETQUOTA || + qctl->qc_cmd == LUSTRE_Q_GETQUOTAPOOL) && + qctl->qc_type == ALLQUOTA && + optind == argc - 1 && !show_default) { - qctl.qc_cmd = LUSTRE_Q_GETQUOTA; - qctl.qc_valid = valid; - qctl.qc_idx = idx; + 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! */ @@ -7243,14 +7932,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 = @@ -7537,6 +8228,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 == NULL) + 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; @@ -7870,16 +8640,10 @@ 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 { + 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); } @@ -8387,7 +9151,8 @@ static int lfs_heat_get(int argc, char **argv) printf("flags: %x\n", heat->lh_flags); for (i = 0; i < heat->lh_count; i++) - printf("%s: %llu\n", heat_names[i], heat->lh_heat[i]); + printf("%s: %llu\n", heat_names[i], + (unsigned long long)heat->lh_heat[i]); next: if (rc == 0 && rc2 < 0) rc = rc2; @@ -8713,6 +9478,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", @@ -8777,7 +9543,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; } @@ -8801,10 +9567,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; @@ -8815,19 +9581,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); @@ -8949,22 +9715,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) @@ -9030,19 +9790,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", @@ -9059,7 +9806,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) { @@ -9199,19 +9946,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", @@ -9230,6 +9964,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", @@ -9338,37 +10082,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; @@ -10342,14 +11055,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); @@ -10415,6 +11129,11 @@ static int lfs_pcc_attach(int argc, char **argv) } } + 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]);