X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre%2Futils%2Flfs.c;h=f0e8543d480ea864c43a0cb747a2338efcfeb7b0;hp=daba1eb8d522bc41fd8f776d01bf6016a0a91749;hb=73c2c103f4f43f9bb37119a2e90d6c0fc1870711;hpb=785e7dc56613e79bdfd89fab762eeb82deb7564c diff --git a/lustre/utils/lfs.c b/lustre/utils/lfs.c index daba1eb..f0e8543 100644 --- a/lustre/utils/lfs.c +++ b/lustre/utils/lfs.c @@ -15,11 +15,7 @@ * * You should have received a copy of the GNU General Public License * version 2 along with this program; If not, see - * http://www.sun.com/software/products/lustre/docs/GPLv2.pdf - * - * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, - * CA 95054 USA or visit www.sun.com if you need additional information or - * have any questions. + * http://www.gnu.org/licenses/gpl-2.0.html * * GPL HEADER END */ @@ -27,7 +23,7 @@ * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved. * Use is subject to license terms. * - * Copyright (c) 2011, 2013, Intel Corporation. + * Copyright (c) 2011, 2016, Intel Corporation. */ /* * This file is part of Lustre, http://www.lustre.org/ @@ -50,27 +46,31 @@ #include #include #include +#include #include #include #include #include +#include #include +#include #include #include #include #include #include #include -#ifdef HAVE_SYS_QUOTA_H -# include -#endif -#include -#include -#include +#include +#include +#include #include #include -#include "obdctl.h" +#include + +#ifndef ARRAY_SIZE +# define ARRAY_SIZE(a) ((sizeof(a)) / (sizeof((a)[0]))) +#endif /* !ARRAY_SIZE */ /* all functions */ static int lfs_setstripe(int argc, char **argv); @@ -85,18 +85,10 @@ static int lfs_df(int argc, char **argv); static int lfs_getname(int argc, char **argv); static int lfs_check(int argc, char **argv); #ifdef HAVE_SYS_QUOTA_H -static int lfs_quotacheck(int argc, char **argv); -static int lfs_quotaon(int argc, char **argv); -static int lfs_quotaoff(int argc, char **argv); static int lfs_setquota(int argc, char **argv); static int lfs_quota(int argc, char **argv); #endif static int lfs_flushctx(int argc, char **argv); -static int lfs_join(int argc, char **argv); -static int lfs_lsetfacl(int argc, char **argv); -static int lfs_lgetfacl(int argc, char **argv); -static int lfs_rsetfacl(int argc, char **argv); -static int lfs_rgetfacl(int argc, char **argv); static int lfs_cp(int argc, char **argv); static int lfs_ls(int argc, char **argv); static int lfs_poollist(int argc, char **argv); @@ -116,61 +108,124 @@ static int lfs_hsm_remove(int argc, char **argv); static int lfs_hsm_cancel(int argc, char **argv); static int lfs_swap_layouts(int argc, char **argv); static int lfs_mv(int argc, char **argv); - -#define SETSTRIPE_USAGE(_cmd, _tgt) \ - "usage: "_cmd" [--stripe-count|-c ]\n"\ - " [--stripe-index|-i ]\n"\ - " [--stripe-size|-S ]\n"\ - " [--pool|-p ]\n"\ - " [--block|-b] "_tgt"\n"\ - "\tstripe_size: Number of bytes on each OST (0 filesystem default)\n"\ - "\t Can be specified with k, m or g (in KB, MB and GB\n"\ - "\t respectively)\n"\ - "\tstart_ost_idx: OST index of first stripe (-1 default)\n"\ - "\tstripe_count: Number of OSTs to stripe over (0 default, -1 all)\n"\ - "\tpool_name: Name of OST pool to use (default none)\n"\ - "\tblock: Block file access during data migration" - -/* all avaialable commands */ +static int lfs_ladvise(int argc, char **argv); +static int lfs_list_commands(int argc, char **argv); + +/* Setstripe and migrate share mostly the same parameters */ +#define SSM_CMD_COMMON(cmd) \ + "usage: "cmd" [--stripe-count|-c ]\n" \ + " [--stripe-index|-i ]\n" \ + " [--stripe-size|-S ]\n" \ + " [--pool|-p ]\n" \ + " [--ost|-o ]\n" \ + " [--component-end|-E ]\n" + +#define SSM_HELP_COMMON \ + "\tstripe_size: Number of bytes on each OST (0 filesystem default)\n" \ + "\t Can be specified with k, m or g (in KB, MB and GB\n" \ + "\t respectively)\n" \ + "\tstart_ost_idx: OST index of first stripe (-1 default)\n" \ + "\tstripe_count: Number of OSTs to stripe over (0 default, -1 all)\n" \ + "\tpool_name: Name of OST pool to use (default none)\n" \ + "\tost_indices: List of OST indices, can be repeated multiple times\n"\ + "\t Indices be specified in a format of:\n" \ + "\t -o ,-,\n" \ + "\t Or:\n" \ + "\t -o -o - -o \n" \ + "\t If --pool is set with --ost, then the OSTs\n" \ + "\t must be the members of the pool." \ + "\tcomp_end: Extent end of the component\n" \ + "\t Can be specified with k, m or g (in KB, MB and GB\n" \ + "\t respectively, -1 for EOF), it must be aligned with\n"\ + "\t the stripe_size\n" + +#define SETSTRIPE_USAGE \ + SSM_CMD_COMMON("setstripe") \ + " \n" \ + SSM_HELP_COMMON \ + +#define MIGRATE_USAGE \ + SSM_CMD_COMMON("migrate ") \ + " [--block|-b]\n" \ + " [--non-block|-n]\n" \ + " \n" \ + SSM_HELP_COMMON \ + "\n" \ + "\tblock: Block file access during data migration (default)\n" \ + "\tnon-block: Abort migrations if concurrent access is detected\n" \ + +#define SETDIRSTRIPE_USAGE \ + " [--mdt-count|-c stripe_count>\n" \ + " [--mdt-index|-i mdt_index]\n" \ + " [--mdt-hash|-H mdt_hash]\n" \ + " [--default|-D] [--mode|-m mode] \n" \ + "\tstripe_count: stripe count of the striped directory\n" \ + "\tmdt_index: MDT index of first stripe\n" \ + "\tmdt_hash: hash type of the striped directory. mdt types:\n" \ + " fnv_1a_64 FNV-1a hash algorithm (default)\n" \ + " all_char sum of characters % MDT_COUNT (not recommended)\n" \ + "\tdefault_stripe: set default dirstripe of the directory\n" \ + "\tmode: the mode of the directory\n" + +static const char *progname; +static bool file_lease_supported = true; + +/* all available commands */ command_t cmdlist[] = { {"setstripe", lfs_setstripe, 0, "Create a new file with a specific striping pattern or\n" "set the default striping pattern on an existing directory or\n" - "delete the default striping pattern from an existing directory\n" - "usage: setstripe -d (to delete default striping)\n"\ + "delete the default striping pattern from an existing directory or\n" + "add layout component(s) to an existing composite file or\n" + "delete specified component(s) from an existing composite file\n\n" + "To delete default striping from an existing directory:\n" + "usage: setstripe -d \n" + " or\n" + "To delete component(s) from an existing composite file:\n" + "usage: setstripe --component-del [--component-id|-I ]\n" + " [--component-flags|-F ]\n" + " \n" + "\tcomp_id: Unique component ID\n" + "\tcomp_flags: 'init' indicating all instantiated components\n" + "\t '^init' indicating all uninstantiated components\n" + "\t-I and -F can't be specified at the same time\n" " or\n" - SETSTRIPE_USAGE("setstripe", "")}, + "To add component(s) to an existing composite file:\n" + SSM_CMD_COMMON("setstripe --component-add") + " or\n" + "To create a file with specified striping/composite layout:\n" + SETSTRIPE_USAGE}, {"getstripe", lfs_getstripe, 0, "To list the striping info for a given file or files in a\n" "directory or recursively for all files in a directory tree.\n" - "usage: getstripe [--ost|-O ] [--quiet | -q] [--verbose | -v]\n" + "usage: getstripe [--ost|-O ] [--quiet|-q] [--verbose|-v]\n" " [--stripe-count|-c] [--stripe-index|-i]\n" " [--pool|-p] [--stripe-size|-S] [--directory|-d]\n" - " [--mdt-index|-M] [--recursive|-r] [--raw|-R]\n" - " [--layout|-L]\n" + " [--mdt|-m] [--recursive|-r] [--raw|-R] [--yaml|-y]\n" + " [--layout|-L] [--fid|-F] [--generation|-g]\n" + " [--component-id[=comp_id]|-I[comp_id]]\n" + " [--component-flags[=comp_flags]]\n" + " [--component-count]\n" + " [--component-start[=[+-]comp_start]]\n" + " [--component-end[=[+-]comp_end]|-E[[+-]comp_end]]\n" " ..."}, {"setdirstripe", lfs_setdirstripe, 0, - "To create a remote directory on a specified MDT.\n" - "usage: setdirstripe <--count|-c stripe_count>\n" - "[--index|-i mdt_index] [--hash-type|-t hash_type]\n" - "[--default_stripe|-D ] \n" - "\tstripe_count: stripe count of the striped directory\n" - "\tmdt_index: MDT index of first stripe\n" - "\thash_type: hash type of the striped directory. Hash types:\n" - " -t fnv_1a_64 FNV-1a hash algorithm(default)\n" - " -t all_char sum of characters % MDT_COUNT. (not recommended)\n" - "\tdefault_stripe: set default dirstripe of the directory\n"}, + "To create a striped directory on a specified MDT. This can only\n" + "be done on MDT0 with the right of administrator.\n" + "usage: setdirstripe [OPTION] \n" + SETDIRSTRIPE_USAGE}, {"getdirstripe", lfs_getdirstripe, 0, "To list the striping info for a given directory\n" "or recursively for all directories in a directory tree.\n" - "usage: getdirstripe [--obd|-O ] [--quiet|-q] [--verbose|-v]\n" - " [--count|-c ] [--index|-i ] [--raw|-R]\n" - " [--recursive | -r] [ --default_stripe | -D ] "}, + "usage: getdirstripe [--obd|-O ] [--mdt-count|-c]\n" + " [--mdt-index|-i] [--mdt-hash|-t]\n" + " [--recursive|-r] [--yaml|-y]\n" + " [--default|-D] ..."}, {"mkdir", lfs_setdirstripe, 0, - "To create a remote directory on a specified MDT. And this can only\n" - "be done on MDT0 by administrator.\n" - "usage: mkdir <--index|-i mdt_index> \n" - "\tmdt_index: MDT index of the remote directory.\n"}, + "To create a striped directory on a specified MDT. This can only\n" + "be done on MDT0 with the right of administrator.\n" + "usage: mkdir [OPTION] \n" + SETDIRSTRIPE_USAGE}, {"rm_entry", lfs_rmentry, 0, "To remove the name entry of the remote directory. Note: This\n" "command will only delete the name entry, i.e. the remote directory\n" @@ -193,17 +248,24 @@ command_t cmdlist[] = { " [[!] --stripe-size|-S [+-]N[kMGT]] [[!] --type|-t ]\n" " [[!] --gid|-g|--group|-G |]\n" " [[!] --uid|-u|--user|-U |] [[!] --pool ]\n" + " [[!] --projid ]\n" " [[!] --layout|-L released,raid0]\n" + " [[!] --component-count [+-]]\n" + " [[!] --component-start [+-]N[kMGTPE]]\n" + " [[!] --component-end|-E [+-]N[kMGTPE]]\n" + " [[!] --component-flags ]\n" + " [[!] --mdt-count|-T [+-]]\n" + " [[!] --mdt-hash|-H \n" "\t !: used before an option indicates 'NOT' requested attribute\n" - "\t -: used before a value indicates 'AT MOST' requested value\n" - "\t +: used before a value indicates 'AT LEAST' requested value\n"}, + "\t -: used before a value indicates less than requested value\n" + "\t +: used before a value indicates more than requested value\n" + "\tmdt-hash: hash type of the striped directory.\n" + "\t fnv_1a_64 FNV-1a hash algorithm\n" + "\t all_char sum of characters % MDT_COUNT\n"}, {"check", lfs_check, 0, "Display the status of MDS or OSTs (as specified in the command)\n" "or all the servers (MDS and OSTs).\n" "usage: check "}, - {"join", lfs_join, 0, - "join two lustre files into one.\n" - "obsolete, HEAD does not support it anymore.\n"}, {"osts", lfs_osts, 0, "list OSTs connected to client " "[for specified path only]\n" "usage: osts [path]"}, {"mdts", lfs_mdts, 0, "list MDTs connected to client " @@ -216,26 +278,16 @@ command_t cmdlist[] = { "[for specified path only]\n" "Usage: getname [-h]|[path ...] "}, #ifdef HAVE_SYS_QUOTA_H - {"quotacheck", lfs_quotacheck, 0, - "Scan the specified filesystem for disk usage, and create,\n" - "or update quota files. Deprecated as of 2.4.0.\n" - "usage: quotacheck [ -ug ] "}, - {"quotaon", lfs_quotaon, 0, "Turn filesystem" - " quotas on. Deprecated as of 2.4.0.\n" - "usage: quotaon [ -ugf ] "}, - {"quotaoff", lfs_quotaoff, 0, "Turn filesystem" - " quotas off. Deprecated as of 2.4.0.\n" - "usage: quotaoff [ -ug ] "}, {"setquota", lfs_setquota, 0, "Set filesystem quotas.\n" - "usage: setquota <-u|-g> |||\n" + "usage: setquota <-u|-g|-p> ||||\n" " -b -B \n" " -i -I \n" - " setquota <-u|--user|-g|--group> |||\n" + " setquota <-u|--user|-g|--group|-p|--projid> ||||\n" " [--block-softlimit ]\n" " [--block-hardlimit ]\n" " [--inode-softlimit ]\n" " [--inode-hardlimit ] \n" - " setquota [-t] <-u|--user|-g|--group>\n" + " setquota [-t] <-u|--user|-g|--group|-p|--projid>\n" " [--block-grace ]\n" " [--inode-grace ] \n" " -b can be used instead of --block-softlimit/--block-grace\n" @@ -252,23 +304,11 @@ command_t cmdlist[] = { {"quota", lfs_quota, 0, "Display disk usage and limits.\n" "usage: quota [-q] [-v] [-h] [-o |-i |-I " "]\n" - " [<-u|-g> |||] \n" - " quota [-o |-i |-I ] -t <-u|-g> "}, + " [<-u|-g|-p> ||||] \n" + " quota [-o |-i |-I ] -t <-u|-g|-p> "}, #endif {"flushctx", lfs_flushctx, 0, "Flush security context for current user.\n" "usage: flushctx [-k] [mountpoint...]"}, - {"lsetfacl", lfs_lsetfacl, 0, - "Remote user setfacl for user/group on the same remote client.\n" - "usage: lsetfacl [-bkndRLPvh] [{-m|-x} acl_spec] [{-M|-X} acl_file] file ..."}, - {"lgetfacl", lfs_lgetfacl, 0, - "Remote user getfacl for user/group on the same remote client.\n" - "usage: lgetfacl [-dRLPvh] file ..."}, - {"rsetfacl", lfs_rsetfacl, 0, - "Remote user setfacl for user/group on other clients.\n" - "usage: rsetfacl [-bkndRLPvh] [{-m|-x} acl_spec] [{-M|-X} acl_file] file ..."}, - {"rgetfacl", lfs_rgetfacl, 0, - "Remote user getfacl for user/group on other clients.\n" - "usage: rgetfacl [-dRLPvh] file ..."}, {"cp", lfs_cp, 0, "Remote user copy files and directories.\n" "usage: cp [OPTION]... [-T] SOURCE DEST\n\tcp [OPTION]... SOURCE... DIRECTORY\n\tcp [OPTION]... -t DIRECTORY SOURCE..."}, @@ -290,7 +330,7 @@ command_t cmdlist[] = { "usage: fid2path [--link ] ..." /* [ --rec ] */ }, {"path2fid", lfs_path2fid, 0, "Display the fid(s) for a given path(s).\n" - "usage: path2fid ..."}, + "usage: path2fid [--parents] ..."}, {"data_version", lfs_data_version, 0, "Display file data version for " "a given path.\n" "usage: data_version -[n|r|w] "}, {"hsm_state", lfs_hsm_state, 0, "Display the HSM information (states, " @@ -316,102 +356,464 @@ command_t cmdlist[] = { "usage: hsm_release [--filelist FILELIST] [--data DATA] ..."}, {"hsm_remove", lfs_hsm_remove, 0, "Remove file copy from external storage.\n" - "usage: hsm_remove [--filelist FILELIST] [--data DATA] ..."}, + "usage: hsm_remove [--filelist FILELIST] [--data DATA]\n" + " [--mntpath MOUNTPATH] [--archive NUM] ...\n" + "\n" + "Note: To remove files from the archive that have been deleted on\n" + "Lustre, set mntpath and optionally archive. In that case, all the\n" + "positional arguments and entries in the file list must be FIDs." + }, {"hsm_cancel", lfs_hsm_cancel, 0, "Cancel requests related to specified files.\n" "usage: hsm_cancel [--filelist FILELIST] [--data DATA] ..."}, {"swap_layouts", lfs_swap_layouts, 0, "Swap layouts between 2 files.\n" "usage: swap_layouts "}, - {"migrate", lfs_setstripe, 0, "migrate file from one OST layout to " - "another (may be not safe with concurent writes).\n" - SETSTRIPE_USAGE("migrate ", "")}, + {"migrate", lfs_setstripe, 0, + "migrate a directory between MDTs.\n" + "usage: migrate --mdt-index [--verbose|-v] " + "\n" + "\tmdt_idx: index of the destination MDT\n" + "\n" + "migrate file objects from one OST " + "layout\nto another (may be not safe with concurent writes).\n" + "usage: migrate " + "[--stripe-count|-c] \n" + " [--stripe-index|-i] \n" + " [--stripe-size|-S] \n" + " [--pool|-p] \n" + " [--ost-list|-o] \n" + " [--block|-b]\n" + " [--non-block|-n]\n" + " \n" + "\tstripe_count: number of OSTs to stripe a file over\n" + "\tstripe_ost_index: index of the first OST to stripe a file over\n" + "\tstripe_size: number of bytes to store before moving to the next OST\n" + "\tpool_name: name of the predefined pool of OSTs\n" + "\tost_indices: OSTs to stripe over, in order\n" + "\tblock: wait for the operation to return before continuing\n" + "\tnon-block: do not wait for the operation to return.\n"}, {"mv", lfs_mv, 0, - "To move directories between MDTs.\n" + "To move directories between MDTs. This command is deprecated, " + "use \"migrate\" instead.\n" "usage: mv [--mdt-index|-M] " "[--verbose|-v]\n"}, + {"ladvise", lfs_ladvise, 0, + "Provide servers with advice about access patterns for a file.\n" + "usage: ladvise [--advice|-a ADVICE] [--start|-s START[kMGT]]\n" + " [--background|-b]\n" + " {[--end|-e END[kMGT]] | [--length|-l LENGTH[kMGT]]}\n" + " ...\n"}, {"help", Parser_help, 0, "help"}, {"exit", Parser_quit, 0, "quit"}, {"quit", Parser_quit, 0, "quit"}, + {"--version", Parser_version, 0, + "output build version of the utility and exit"}, + {"--list-commands", lfs_list_commands, 0, + "list commands supported by the utility and exit"}, { 0, 0, 0, NULL } }; -#define MIGRATION_BLOCKS 1 -static int lfs_migrate(char *name, unsigned long long stripe_size, - int stripe_offset, int stripe_count, - int stripe_pattern, char *pool_name, - __u64 migration_flags) +#define MIGRATION_NONBLOCK 1 + +static int check_hashtype(const char *hashtype) +{ + int i; + + for (i = LMV_HASH_TYPE_ALL_CHARS; i < LMV_HASH_TYPE_MAX; i++) + if (strcmp(hashtype, mdt_hash_name[i]) == 0) + return i; + + return 0; +} + +/** + * Internal helper for migrate_copy_data(). Check lease and report error if + * need be. + * + * \param[in] fd File descriptor on which to check the lease. + * \param[out] lease_broken Set to true if the lease was broken. + * \param[in] group_locked Whether a group lock was taken or not. + * \param[in] path Name of the file being processed, for error + * reporting + * + * \retval 0 Migration can keep on going. + * \retval -errno Error occurred, abort migration. + */ +static int check_lease(int fd, bool *lease_broken, bool group_locked, + const char *path) +{ + int rc; + + if (!file_lease_supported) + return 0; + + rc = llapi_lease_check(fd); + if (rc > 0) + return 0; /* llapi_check_lease returns > 0 on success. */ + + if (!group_locked) { + fprintf(stderr, "%s: cannot migrate '%s': file busy\n", + progname, path); + rc = rc ? rc : -EAGAIN; + } else { + fprintf(stderr, "%s: external attempt to access file '%s' " + "blocked until migration ends.\n", progname, path); + rc = 0; + } + *lease_broken = true; + return rc; +} + +static int migrate_copy_data(int fd_src, int fd_dst, size_t buf_size, + bool group_locked, const char *fname) +{ + void *buf = NULL; + ssize_t rsize = -1; + ssize_t wsize = 0; + size_t rpos = 0; + size_t wpos = 0; + off_t bufoff = 0; + int rc; + bool lease_broken = false; + + /* Use a page-aligned buffer for direct I/O */ + rc = posix_memalign(&buf, getpagesize(), buf_size); + if (rc != 0) + return -rc; + + while (1) { + /* read new data only if we have written all + * previously read data */ + if (wpos == rpos) { + if (!lease_broken) { + rc = check_lease(fd_src, &lease_broken, + group_locked, fname); + if (rc < 0) + goto out; + } + rsize = read(fd_src, buf, buf_size); + if (rsize < 0) { + rc = -errno; + fprintf(stderr, "%s: %s: read failed: %s\n", + progname, fname, strerror(-rc)); + goto out; + } + rpos += rsize; + bufoff = 0; + } + /* eof ? */ + if (rsize == 0) + break; + + wsize = write(fd_dst, buf + bufoff, rpos - wpos); + if (wsize < 0) { + rc = -errno; + fprintf(stderr, + "%s: %s: write failed on volatile: %s\n", + progname, fname, strerror(-rc)); + goto out; + } + wpos += wsize; + bufoff += wsize; + } + + rc = fsync(fd_dst); + if (rc < 0) { + rc = -errno; + fprintf(stderr, "%s: %s: fsync failed: %s\n", + progname, fname, strerror(-rc)); + } + +out: + free(buf); + return rc; +} + +static int migrate_copy_timestamps(int fdv, const struct stat *st) +{ + struct timeval tv[2] = { + {.tv_sec = st->st_atime}, + {.tv_sec = st->st_mtime} + }; + + return futimes(fdv, tv); +} + +static int migrate_block(int fd, int fdv, const struct stat *st, + size_t buf_size, const char *name) +{ + __u64 dv1; + int gid; + int rc; + int rc2; + + rc = llapi_get_data_version(fd, &dv1, LL_DV_RD_FLUSH); + if (rc < 0) { + fprintf(stderr, "%s: %s: cannot get dataversion: %s\n", + progname, name, strerror(-rc)); + return rc; + } + + do + gid = random(); + while (gid == 0); + + /* The grouplock blocks all concurrent accesses to the file. + * It has to be taken after llapi_get_data_version as it would + * block it too. */ + rc = llapi_group_lock(fd, gid); + if (rc < 0) { + fprintf(stderr, "%s: %s: cannot get group lock: %s\n", + progname, name, strerror(-rc)); + return rc; + } + + rc = migrate_copy_data(fd, fdv, buf_size, true, name); + if (rc < 0) { + fprintf(stderr, "%s: %s: data copy failed\n", progname, name); + goto out_unlock; + } + + /* Make sure we keep original atime/mtime values */ + rc = migrate_copy_timestamps(fdv, st); + if (rc < 0) { + fprintf(stderr, "%s: %s: timestamp copy failed\n", + progname, name); + goto out_unlock; + } + + /* swap layouts + * for a migration we need to check data version on file did + * not change. + * + * Pass in gid=0 since we already own grouplock. */ + rc = llapi_fswap_layouts_grouplock(fd, fdv, dv1, 0, 0, + SWAP_LAYOUTS_CHECK_DV1); + if (rc == -EAGAIN) { + fprintf(stderr, "%s: %s: dataversion changed during copy, " + "migration aborted\n", progname, name); + goto out_unlock; + } else if (rc < 0) { + fprintf(stderr, "%s: %s: cannot swap layouts: %s\n", progname, + name, strerror(-rc)); + goto out_unlock; + } + +out_unlock: + rc2 = llapi_group_unlock(fd, gid); + if (rc2 < 0 && rc == 0) { + fprintf(stderr, "%s: %s: putting group lock failed: %s\n", + progname, name, strerror(-rc2)); + rc = rc2; + } + + return rc; +} + +static int migrate_nonblock(int fd, int fdv, const struct stat *st, + size_t buf_size, const char *name) +{ + __u64 dv1; + __u64 dv2; + int rc; + + rc = llapi_get_data_version(fd, &dv1, LL_DV_RD_FLUSH); + if (rc < 0) { + fprintf(stderr, "%s: %s: cannot get data version: %s\n", + progname, name, strerror(-rc)); + return rc; + } + + rc = migrate_copy_data(fd, fdv, buf_size, false, name); + if (rc < 0) { + fprintf(stderr, "%s: %s: data copy failed\n", progname, name); + return rc; + } + + rc = llapi_get_data_version(fd, &dv2, LL_DV_RD_FLUSH); + if (rc != 0) { + fprintf(stderr, "%s: %s: cannot get data version: %s\n", + progname, name, strerror(-rc)); + return rc; + } + + if (dv1 != dv2) { + rc = -EAGAIN; + fprintf(stderr, "%s: %s: data version changed during " + "migration\n", + progname, name); + return rc; + } + + /* Make sure we keep original atime/mtime values */ + rc = migrate_copy_timestamps(fdv, st); + if (rc < 0) { + fprintf(stderr, "%s: %s: timestamp copy failed\n", + progname, name); + return rc; + } + + /* Atomically put lease, swap layouts and close. + * for a migration we need to check data version on file did + * not change. */ + rc = llapi_fswap_layouts(fd, fdv, 0, 0, SWAP_LAYOUTS_CLOSE); + if (rc < 0) { + fprintf(stderr, "%s: %s: cannot swap layouts: %s\n", + progname, name, strerror(-rc)); + return rc; + } + + return 0; +} + +static int lfs_component_set(char *fname, int comp_id, __u32 flags) +{ + return -ENOTSUP; +} + +static int lfs_component_del(char *fname, __u32 comp_id, __u32 flags) +{ + int rc = 0; + + if (flags != 0 && comp_id != 0) + return -EINVAL; + + /* LCME_FL_INIT is the only supported flag in PFL */ + if (flags != 0) { + if (flags & ~LCME_KNOWN_FLAGS) { + fprintf(stderr, "Invalid component flags %#x\n", flags); + return -EINVAL; + } + } else if (comp_id > LCME_ID_MAX) { + fprintf(stderr, "Invalid component id %u\n", comp_id); + return -EINVAL; + } + + rc = llapi_layout_file_comp_del(fname, comp_id, flags); + if (rc) + fprintf(stderr, "Delete component %#x from %s failed. %s\n", + comp_id, fname, strerror(errno)); + return rc; +} + +static int lfs_component_add(char *fname, struct llapi_layout *layout) +{ + int rc; + + if (layout == NULL) + return -EINVAL; + + rc = llapi_layout_file_comp_add(fname, layout); + if (rc) + fprintf(stderr, "Add layout component(s) to %s failed. %s\n", + fname, strerror(errno)); + return rc; +} + +static int lfs_component_create(char *fname, int open_flags, mode_t open_mode, + struct llapi_layout *layout) +{ + struct stat st; + int fd; + + if (layout == NULL) + return -EINVAL; + + fd = lstat(fname, &st); + if (fd == 0 && S_ISDIR(st.st_mode)) + open_flags = O_DIRECTORY | O_RDONLY; + + fd = llapi_layout_file_open(fname, open_flags, open_mode, layout); + if (fd < 0) + fprintf(stderr, "%s %s failed. %s\n", + S_ISDIR(st.st_mode) ? + "Set default composite layout to " : + "Create composite file", + fname, strerror(errno)); + return fd; +} + +static int lfs_migrate(char *name, __u64 migration_flags, + struct llapi_stripe_param *param, + struct llapi_layout *layout) { - int fd, fdv; - char volatile_file[PATH_MAX]; + int fd = -1; + int fdv = -1; char parent[PATH_MAX]; + int mdt_index; + int random_value; + char volatile_file[sizeof(parent) + + LUSTRE_VOLATILE_HDR_LEN + + 2 * sizeof(mdt_index) + + 2 * sizeof(random_value) + 4]; char *ptr; int rc; - __u64 dv1; struct lov_user_md *lum = NULL; - int lumsz; - int bufsz; - void *buf = NULL; - int rsize, wsize; - __u64 rpos, wpos, bufoff; - int gid = 0, sz; - int have_gl = 0; - struct stat st, stv; + int lum_size; + int buf_size = 1024 * 1024 * 4; + bool have_lease_rdlck = false; + struct stat st; + struct stat stv; /* find the right size for the IO and allocate the buffer */ - lumsz = lov_user_md_size(LOV_MAX_STRIPE_COUNT, LOV_USER_MAGIC_V3); - lum = malloc(lumsz); + lum_size = lov_user_md_size(LOV_MAX_STRIPE_COUNT, LOV_USER_MAGIC_V3); + lum = malloc(lum_size); if (lum == NULL) { rc = -ENOMEM; goto free; } rc = llapi_file_get_stripe(name, lum); - /* failure can come from may case and some may be not real error + /* failure can happen for many reasons and some may be not real errors * (eg: no stripe) - * in case of a real error, a later call will failed with a better + * in case of a real error, a later call will fail with better * error management */ - if (rc < 0) - bufsz = 1024*1024; - else - bufsz = lum->lmm_stripe_size; - rc = posix_memalign(&buf, getpagesize(), bufsz); - if (rc != 0) { - rc = -rc; + if (rc == 0) { + if ((lum->lmm_magic == LOV_USER_MAGIC_V1 || + lum->lmm_magic == LOV_USER_MAGIC_V3) && + lum->lmm_stripe_size != 0) + buf_size = lum->lmm_stripe_size; + } + + /* open file, direct io */ + /* even if the file is only read, WR mode is nedeed to allow + * layout swap on fd */ + fd = open(name, O_RDWR | O_DIRECT); + if (fd == -1) { + rc = -errno; + fprintf(stderr, "%s: %s: cannot open: %s\n", progname, name, + strerror(-rc)); goto free; } - if (migration_flags & MIGRATION_BLOCKS) { - /* generate a random id for the grouplock */ - fd = open("/dev/urandom", O_RDONLY); - if (fd == -1) { - rc = -errno; - fprintf(stderr, "cannot open /dev/urandom (%s)\n", - strerror(-rc)); - goto free; - } - sz = sizeof(gid); - rc = read(fd, &gid, sz); - close(fd); - if (rc < sz) { - rc = -errno; - fprintf(stderr, "cannot read %d bytes from" - " /dev/urandom (%s)\n", sz, strerror(-rc)); - goto free; + if (file_lease_supported) { + rc = llapi_lease_get(fd, LL_LEASE_RDLCK); + if (rc == -EOPNOTSUPP) { + /* Older servers do not support file lease. + * Disable related checks. This opens race conditions + * as explained in LU-4840 */ + file_lease_supported = false; + } else if (rc < 0) { + fprintf(stderr, "%s: %s: cannot get open lease: %s\n", + progname, name, strerror(-rc)); + goto error; + } else { + have_lease_rdlck = true; } } /* search for file directory pathname */ if (strlen(name) > sizeof(parent)-1) { rc = -E2BIG; - goto free; + goto error; } strncpy(parent, name, sizeof(parent)); ptr = strrchr(parent, '/'); if (ptr == NULL) { if (getcwd(parent, sizeof(parent)) == NULL) { rc = -errno; - goto free; + goto error; } } else { if (ptr == parent) @@ -419,31 +821,49 @@ static int lfs_migrate(char *name, unsigned long long stripe_size, else *ptr = '\0'; } - sprintf(volatile_file, "%s/%s::", parent, LUSTRE_VOLATILE_HDR); - /* create, open a volatile file, use caching (ie no directio) */ - /* exclusive create is not needed because volatile files cannot - * conflict on name by construction */ - fdv = llapi_file_open_pool(volatile_file, O_CREAT | O_WRONLY, - 0644, stripe_size, stripe_offset, - stripe_count, stripe_pattern, pool_name); + rc = llapi_file_fget_mdtidx(fd, &mdt_index); + if (rc < 0) { + fprintf(stderr, "%s: %s: cannot get MDT index: %s\n", + progname, name, strerror(-rc)); + goto error; + } + + do { + int open_flags = O_WRONLY | O_CREAT | O_EXCL | O_NOFOLLOW; + mode_t open_mode = S_IRUSR | S_IWUSR; + + random_value = random(); + rc = snprintf(volatile_file, sizeof(volatile_file), + "%s/%s:%.4X:%.4X", parent, LUSTRE_VOLATILE_HDR, + mdt_index, random_value); + if (rc >= sizeof(volatile_file)) { + rc = -E2BIG; + goto error; + } + + /* 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 != NULL) + fdv = lfs_component_create(volatile_file, open_flags, + open_mode, layout); + else + fdv = -EINVAL; + } while (fdv == -EEXIST); + if (fdv < 0) { rc = fdv; - fprintf(stderr, "cannot create volatile file in %s (%s)\n", - parent, strerror(-rc)); - goto free; + fprintf(stderr, "%s: %s: cannot create volatile file in" + " directory: %s\n", + progname, parent, strerror(-rc)); + goto error; } - /* open file, direct io */ - /* even if the file is only read, WR mode is nedeed to allow - * layout swap on fd */ - fd = open(name, O_RDWR | O_DIRECT); - if (fd == -1) { - rc = -errno; - fprintf(stderr, "cannot open %s (%s)\n", name, strerror(-rc)); - close(fdv); - goto free; - } + /* In case the MDT does not support creation of volatile files + * we should try to unlink it. */ + (void)unlink(volatile_file); /* Not-owner (root?) special case. * Need to set owner/group of volatile file like original. @@ -452,212 +872,590 @@ static int lfs_migrate(char *name, unsigned long long stripe_size, rc = fstat(fd, &st); if (rc != 0) { rc = -errno; - fprintf(stderr, "cannot stat %s (%s)\n", name, + fprintf(stderr, "%s: %s: cannot stat: %s\n", progname, name, strerror(errno)); goto error; } rc = fstat(fdv, &stv); if (rc != 0) { rc = -errno; - fprintf(stderr, "cannot stat %s (%s)\n", volatile_file, - strerror(errno)); + fprintf(stderr, "%s: %s: cannot stat: %s\n", progname, + volatile_file, strerror(errno)); goto error; } if (st.st_uid != stv.st_uid || st.st_gid != stv.st_gid) { rc = fchown(fdv, st.st_uid, st.st_gid); if (rc != 0) { rc = -errno; - fprintf(stderr, "cannot chown %s (%s)\n", name, - strerror(errno)); + fprintf(stderr, "%s: %s: cannot chown: %s\n", progname, + name, strerror(errno)); goto error; } } - /* get file data version */ - rc = llapi_get_data_version(fd, &dv1, LL_DV_RD_FLUSH); - if (rc != 0) { - fprintf(stderr, "cannot get dataversion on %s (%s)\n", - name, strerror(-rc)); - goto error; - } - - if (migration_flags & MIGRATION_BLOCKS) { - /* take group lock to limit concurent access - * this will be no more needed when exclusive access will - * be implemented (see LU-2919) */ - /* group lock is taken after data version read because it - * blocks data version call */ - if (ioctl(fd, LL_IOC_GROUP_LOCK, gid) == -1) { - rc = -errno; - fprintf(stderr, "cannot get group lock on %s (%s)\n", - name, strerror(-rc)); - goto error; + if (migration_flags & MIGRATION_NONBLOCK && file_lease_supported) { + rc = migrate_nonblock(fd, fdv, &st, buf_size, name); + if (rc == 0) { + have_lease_rdlck = false; + fdv = -1; /* The volatile file is closed as we put the + * lease in non-blocking mode. */ } - have_gl = 1; + } else { + /* Blocking mode (forced if servers do not support file lease). + * It is also the default mode, since we cannot distinguish + * between a broken lease and a server that does not support + * atomic swap/close (LU-6785) */ + rc = migrate_block(fd, fdv, &st, buf_size, name); } - /* copy data */ - rpos = 0; - wpos = 0; - bufoff = 0; - rsize = -1; - do { - /* read new data only if we have written all - * previously read data */ - if (wpos == rpos) { - rsize = read(fd, buf, bufsz); - if (rsize < 0) { - rc = -errno; - fprintf(stderr, "read failed on %s" - " (%s)\n", name, - strerror(-rc)); - goto error; - } - rpos += rsize; - bufoff = 0; - } - /* eof ? */ - if (rsize == 0) - break; - wsize = write(fdv, buf + bufoff, rpos - wpos); - if (wsize < 0) { - rc = -errno; - fprintf(stderr, "write failed on volatile" - " for %s (%s)\n", name, strerror(-rc)); - goto error; - } - wpos += wsize; - bufoff += wsize; - } while (1); - - /* flush data */ - fsync(fdv); - - if (migration_flags & MIGRATION_BLOCKS) { - /* give back group lock */ - if (ioctl(fd, LL_IOC_GROUP_UNLOCK, gid) == -1) { - rc = -errno; - fprintf(stderr, "cannot put group lock on %s (%s)\n", - name, strerror(-rc)); - } - have_gl = 0; - } +error: + if (have_lease_rdlck) + llapi_lease_put(fd); - /* swap layouts - * for a migration we need to: - * - check data version on file did not change - * - keep file mtime - * - keep file atime - */ - rc = llapi_fswap_layouts(fd, fdv, dv1, 0, - SWAP_LAYOUTS_CHECK_DV1 | - SWAP_LAYOUTS_KEEP_MTIME | - SWAP_LAYOUTS_KEEP_ATIME); - if (rc == -EAGAIN) { - fprintf(stderr, "%s: dataversion changed during copy, " - "migration aborted\n", name); - goto error; - } - if (rc != 0) - fprintf(stderr, "%s: swap layout to new file failed: %s\n", - name, strerror(-rc)); + if (fd >= 0) + close(fd); -error: - /* give back group lock */ - if ((migration_flags & MIGRATION_BLOCKS) && have_gl && - (ioctl(fd, LL_IOC_GROUP_UNLOCK, gid) == -1)) { - /* we keep in rc the original error */ - fprintf(stderr, "cannot put group lock on %s (%s)\n", - name, strerror(-errno)); - } + if (fdv >= 0) + close(fdv); - close(fdv); - close(fd); free: if (lum) free(lum); - if (buf) - free(buf); + return rc; } -/* functions */ -static int lfs_setstripe(int argc, char **argv) +/** + * Parse a string containing an OST index list into an array of integers. + * + * The input string contains a comma delimited list of individual + * indices and ranges, for example "1,2-4,7". Add the indices into the + * \a osts array and remove duplicates. + * + * \param[out] osts array to store indices in + * \param[in] size size of \a osts array + * \param[in] offset starting index in \a osts + * \param[in] arg string containing OST index list + * + * \retval positive number of indices in \a osts + * \retval -EINVAL unable to parse \a arg + */ +static int parse_targets(__u32 *osts, int size, int offset, char *arg) { - char *fname; - int result; - unsigned long long st_size; - int st_offset, st_count; - char *end; - int c; - int delete = 0; - char *stripe_size_arg = NULL; - char *stripe_off_arg = NULL; - char *stripe_count_arg = NULL; - char *pool_name_arg = NULL; - unsigned long long size_units = 1; - int migrate_mode = 0; - __u64 migration_flags = 0; + int rc; + int nr = offset; + int slots = size - offset; + char *ptr = NULL; + bool end_of_loop; - struct option long_opts[] = { - /* valid only in migrate mode */ - {"block", no_argument, 0, 'b'}, -#if LUSTRE_VERSION_CODE < OBD_OCD_VERSION(2, 9, 53, 0) - /* This formerly implied "stripe-count", but was explicitly - * made "stripe-count" for consistency with other options, - * and to separate it from "mdt-count" when DNE arrives. */ - {"count", required_argument, 0, 'c'}, -#endif - {"stripe-count", required_argument, 0, 'c'}, - {"stripe_count", required_argument, 0, 'c'}, - {"delete", no_argument, 0, 'd'}, -#if LUSTRE_VERSION_CODE < OBD_OCD_VERSION(2, 9, 53, 0) - /* This formerly implied "stripe-index", but was explicitly - * made "stripe-index" for consistency with other options, - * and to separate it from "mdt-index" when DNE arrives. */ - {"index", required_argument, 0, 'i'}, -#endif - {"stripe-index", required_argument, 0, 'i'}, - {"stripe_index", required_argument, 0, 'i'}, -#if LUSTRE_VERSION_CODE < OBD_OCD_VERSION(2, 9, 53, 0) - /* This formerly implied "stripe-index", but was confusing - * with "file offset" (which will eventually be needed for - * with different layouts by offset), so deprecate it. */ - {"offset", required_argument, 0, 'o'}, -#endif - {"pool", required_argument, 0, 'p'}, -#if LUSTRE_VERSION_CODE < OBD_OCD_VERSION(2, 9, 53, 0) - /* This formerly implied "--stripe-size", but was confusing - * with "lfs find --size|-s", which means "file size", so use - * the consistent "--stripe-size|-S" for all commands. */ - {"size", required_argument, 0, 's'}, -#endif - {"stripe-size", required_argument, 0, 'S'}, - {"stripe_size", required_argument, 0, 'S'}, - {0, 0, 0, 0} + if (arg == NULL) + return -EINVAL; + + end_of_loop = false; + while (!end_of_loop) { + int start_index; + int end_index; + int i; + char *endptr = NULL; + + rc = -EINVAL; + + ptr = strchrnul(arg, ','); + + end_of_loop = *ptr == '\0'; + *ptr = '\0'; + + start_index = strtol(arg, &endptr, 0); + if (endptr == arg) /* no data at all */ + break; + if (*endptr != '-' && *endptr != '\0') /* has invalid data */ + break; + if (start_index < 0) + break; + + end_index = start_index; + if (*endptr == '-') { + end_index = strtol(endptr + 1, &endptr, 0); + if (*endptr != '\0') + break; + if (end_index < start_index) + break; + } + + for (i = start_index; i <= end_index && slots > 0; i++) { + int j; + + /* remove duplicate */ + for (j = 0; j < offset; j++) { + if (osts[j] == i) + break; + } + if (j == offset) { /* no duplicate */ + osts[nr++] = i; + --slots; + } + } + if (slots == 0 && i < end_index) + break; + + *ptr = ','; + arg = ++ptr; + offset = nr; + rc = 0; + } + if (!end_of_loop && ptr != NULL) + *ptr = ','; + + return rc < 0 ? rc : nr; +} + +static int verify_pool_name(char *prog_name, char *pool_name) +{ + char *ptr; + + if (pool_name == NULL) + return 0; + + ptr = strchr(pool_name, '.'); + if (ptr != NULL && ptr == pool_name) { + fprintf(stderr, "error: %s: fsname is empty in pool name '%s'\n", + prog_name, pool_name); + return -EINVAL; + } + + return 0; +} + +struct lfs_setstripe_args { + unsigned long long lsa_comp_end; + unsigned long long lsa_stripe_size; + int lsa_stripe_count; + int lsa_stripe_off; + __u32 lsa_comp_flags; + int lsa_nr_osts; + __u32 *lsa_osts; + char *lsa_pool_name; +}; + +static inline void setstripe_args_init(struct lfs_setstripe_args *lsa) +{ + memset(lsa, 0, sizeof(*lsa)); + lsa->lsa_stripe_off = -1; +} + +static inline bool setstripe_args_specified(struct lfs_setstripe_args *lsa) +{ + return (lsa->lsa_stripe_size != 0 || lsa->lsa_stripe_count != 0 || + lsa->lsa_stripe_off != -1 || lsa->lsa_pool_name != NULL || + lsa->lsa_comp_end != 0); +} + +static int comp_args_to_layout(struct llapi_layout **composite, + struct lfs_setstripe_args *lsa) +{ + struct llapi_layout *layout = *composite; + uint64_t prev_end = 0; + int i = 0, rc; + + if (layout == NULL) { + layout = llapi_layout_alloc(); + if (layout == NULL) { + fprintf(stderr, "Alloc llapi_layout failed. %s\n", + strerror(errno)); + return -ENOMEM; + } + *composite = layout; + } else { + uint64_t start; + + /* Get current component extent, current component + * must be the tail component. */ + rc = llapi_layout_comp_extent_get(layout, &start, &prev_end); + if (rc) { + fprintf(stderr, "Get comp extent failed. %s\n", + strerror(errno)); + return rc; + } + + rc = llapi_layout_comp_add(layout); + if (rc) { + fprintf(stderr, "Add component failed. %s\n", + strerror(errno)); + return rc; + } + } + + rc = llapi_layout_comp_extent_set(layout, prev_end, lsa->lsa_comp_end); + if (rc) { + fprintf(stderr, "Set extent [%lu, %llu) failed. %s\n", + prev_end, lsa->lsa_comp_end, strerror(errno)); + return rc; + } + + if (lsa->lsa_stripe_size != 0) { + rc = llapi_layout_stripe_size_set(layout, + lsa->lsa_stripe_size); + if (rc) { + fprintf(stderr, "Set stripe size %llu failed. %s\n", + lsa->lsa_stripe_size, strerror(errno)); + return rc; + } + } + + if (lsa->lsa_stripe_count != 0) { + rc = llapi_layout_stripe_count_set(layout, + lsa->lsa_stripe_count == -1 ? + LLAPI_LAYOUT_WIDE : + lsa->lsa_stripe_count); + if (rc) { + fprintf(stderr, "Set stripe count %d failed. %s\n", + lsa->lsa_stripe_count, strerror(errno)); + return rc; + } + } + + if (lsa->lsa_pool_name != NULL) { + rc = llapi_layout_pool_name_set(layout, lsa->lsa_pool_name); + if (rc) { + fprintf(stderr, "Set pool name: %s failed. %s\n", + lsa->lsa_pool_name, strerror(errno)); + return rc; + } + } + + if (lsa->lsa_nr_osts > 0) { + if (lsa->lsa_stripe_count > 0 && + lsa->lsa_nr_osts != lsa->lsa_stripe_count) { + fprintf(stderr, "stripe_count(%d) != nr_osts(%d)\n", + lsa->lsa_stripe_count, lsa->lsa_nr_osts); + return -EINVAL; + } + for (i = 0; i < lsa->lsa_nr_osts; i++) { + rc = llapi_layout_ost_index_set(layout, i, + lsa->lsa_osts[i]); + if (rc) + break; + } + } else if (lsa->lsa_stripe_off != -1) { + rc = llapi_layout_ost_index_set(layout, 0, lsa->lsa_stripe_off); + } + if (rc) { + fprintf(stderr, "Set ost index %d failed. %s\n", + i, 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. */ +static int adjust_first_extent(char *fname, struct llapi_layout *layout) +{ + struct llapi_layout *head; + uint64_t start, end, stripe_size, prev_end = 0; + int rc; + + if (layout == NULL) + return -EINVAL; + + errno = 0; + head = llapi_layout_get_by_path(fname, 0); + if (head == NULL) { + fprintf(stderr, "Read layout from %s failed. %s\n", + 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' isn't a composite file.\n", + fname); + llapi_layout_free(head); + return -EINVAL; + } + + rc = llapi_layout_comp_extent_get(head, &start, &prev_end); + if (rc) { + fprintf(stderr, "Get prev extent failed. %s\n", + strerror(errno)); + llapi_layout_free(head); + return rc; + } + + 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) { + fprintf(stderr, "Move component cursor failed. %s\n", + strerror(errno)); + return rc; + } + + rc = llapi_layout_comp_extent_get(layout, &start, &end); + if (rc) { + fprintf(stderr, "Get extent failed. %s\n", strerror(errno)); + return rc; + } + + if (start > prev_end || end <= prev_end) { + fprintf(stderr, "First extent to be set [%lu, %lu) isn't " + "adjacent with the existing file extent end: %lu\n", + start, end, prev_end); + return -EINVAL; + } + + rc = llapi_layout_stripe_size_get(layout, &stripe_size); + if (rc) { + fprintf(stderr, "Get stripe size failed. %s\n", + strerror(errno)); + return rc; + } + + if (stripe_size != LLAPI_LAYOUT_DEFAULT && + (prev_end & (stripe_size - 1))) { + fprintf(stderr, "Stripe size %lu not aligned with %lu\n", + stripe_size, prev_end); + return -EINVAL; + } + + rc = llapi_layout_comp_extent_set(layout, prev_end, end); + if (rc) { + fprintf(stderr, "Set component extent [%lu, %lu) failed. %s\n", + prev_end, end, strerror(errno)); + return rc; + } + + return 0; +} + +static inline bool comp_flags_is_neg(__u32 flags) +{ + return flags & LCME_FL_NEG; +} + +static inline void comp_flags_set_neg(__u32 *flags) +{ + *flags |= LCME_FL_NEG; +} + +static inline void comp_flags_clear_neg(__u32 *flags) +{ + *flags &= ~LCME_FL_NEG; +} + +static int comp_str2flags(__u32 *flags, char *string) +{ + char *name; + __u32 neg_flags = 0; + + if (string == NULL) + return -EINVAL; + + *flags = 0; + for (name = strtok(string, ","); name; name = strtok(NULL, ",")) { + bool found = false; + int i; + + for (i = 0; i < ARRAY_SIZE(comp_flags_table); i++) { + __u32 comp_flag = comp_flags_table[i].cfn_flag; + const char *comp_name = comp_flags_table[i].cfn_name; + + if (strcmp(name, comp_name) == 0) { + *flags |= comp_flag; + found = true; + } else if (strncmp(name, "^", 1) == 0 && + strcmp(name + 1, comp_name) == 0) { + neg_flags |= comp_flag; + found = true; + } + } + if (!found) { + llapi_printf(LLAPI_MSG_ERROR, "Component flag " + "'%s' is not supported.\n", name); + return -EINVAL; + } + } + + if (*flags == 0 && neg_flags == 0) + return -EINVAL; + /* don't support mixed flags for now */ + if (*flags && neg_flags) + return -EINVAL; + + if (neg_flags) { + *flags = neg_flags; + comp_flags_set_neg(flags); + } + + return 0; +} + +static inline bool arg_is_eof(char *arg) +{ + return !strncmp(arg, "-1", strlen("-1")) || + !strncmp(arg, "EOF", strlen("EOF")) || + !strncmp(arg, "eof", strlen("eof")); +} + +enum { + LFS_POOL_OPT = 3, + LFS_COMP_COUNT_OPT, + LFS_COMP_START_OPT, + LFS_COMP_FLAGS_OPT, + LFS_COMP_DEL_OPT, + LFS_COMP_SET_OPT, + LFS_COMP_ADD_OPT, + LFS_PROJID_OPT, +}; + +/* functions */ +static int lfs_setstripe(int argc, char **argv) +{ + struct lfs_setstripe_args lsa; + struct llapi_stripe_param *param = NULL; + struct find_param migrate_mdt_param = { + .fp_max_depth = -1, + .fp_mdt_index = -1, }; + char *fname; + int result; + int result2 = 0; + char *end; + int c; + int delete = 0; + char *mdt_idx_arg = NULL; + unsigned long long size_units = 1; + bool migrate_mode = false; + bool migration_block = false; + __u64 migration_flags = 0; + __u32 osts[LOV_MAX_STRIPE_COUNT] = { 0 }; + int comp_del = 0, comp_set = 0; + int comp_add = 0; + __u32 comp_id = 0; + struct llapi_layout *layout = NULL; - st_size = 0; - st_offset = -1; - st_count = 0; + struct option long_opts[] = { + /* --block is only valid in migrate mode */ + { .val = 'b', .name = "block", .has_arg = no_argument}, + { .val = LFS_COMP_ADD_OPT, + .name = "comp-add", .has_arg = no_argument}, + { .val = LFS_COMP_ADD_OPT, + .name = "component-add", + .has_arg = no_argument}, + { .val = LFS_COMP_DEL_OPT, + .name = "comp-del", .has_arg = no_argument}, + { .val = LFS_COMP_DEL_OPT, + .name = "component-del", + .has_arg = no_argument}, + { .val = LFS_COMP_FLAGS_OPT, + .name = "comp-flags", .has_arg = required_argument}, + { .val = LFS_COMP_FLAGS_OPT, + .name = "component-flags", + .has_arg = required_argument}, + { .val = LFS_COMP_SET_OPT, + .name = "comp-set", .has_arg = no_argument}, + { .val = LFS_COMP_SET_OPT, + .name = "component-set", + .has_arg = no_argument}, +#if LUSTRE_VERSION_CODE < OBD_OCD_VERSION(2, 9, 59, 0) + /* This formerly implied "stripe-count", but was explicitly + * made "stripe-count" for consistency with other options, + * and to separate it from "mdt-count" when DNE arrives. */ + { .val = 'c', .name = "count", .has_arg = required_argument }, +#endif + { .val = 'c', .name = "stripe-count", .has_arg = required_argument}, + { .val = 'c', .name = "stripe_count", .has_arg = required_argument}, + { .val = 'd', .name = "delete", .has_arg = no_argument}, + { .val = 'E', .name = "comp-end", .has_arg = required_argument}, + { .val = 'E', .name = "component-end", + .has_arg = required_argument}, + /* dirstripe {"mdt-hash", required_argument, 0, 'H'}, */ +#if LUSTRE_VERSION_CODE < OBD_OCD_VERSION(2, 9, 59, 0) + /* This formerly implied "stripe-index", but was explicitly + * made "stripe-index" for consistency with other options, + * and to separate it from "mdt-index" when DNE arrives. */ + { .val = 'i', .name = "index", .has_arg = required_argument }, +#endif + { .val = 'i', .name = "stripe-index", .has_arg = required_argument}, + { .val = 'i', .name = "stripe_index", .has_arg = required_argument}, + { .val = 'I', .name = "comp-id", .has_arg = required_argument}, + { .val = 'I', .name = "component-id", .has_arg = required_argument}, + { .val = 'm', .name = "mdt", .has_arg = required_argument}, + { .val = 'm', .name = "mdt-index", .has_arg = required_argument}, + { .val = 'm', .name = "mdt_index", .has_arg = required_argument}, + /* --non-block is only valid in migrate mode */ + { .val = 'n', .name = "non-block", .has_arg = no_argument}, + { .val = 'o', .name = "ost", .has_arg = required_argument}, +#if LUSTRE_VERSION_CODE < OBD_OCD_VERSION(3, 0, 53, 0) + { .val = 'o', .name = "ost-list", .has_arg = required_argument }, + { .val = 'o', .name = "ost_list", .has_arg = required_argument }, +#endif + { .val = 'p', .name = "pool", .has_arg = required_argument }, +#if LUSTRE_VERSION_CODE < OBD_OCD_VERSION(2, 9, 59, 0) + /* This formerly implied "--stripe-size", but was confusing + * with "lfs find --size|-s", which means "file size", so use + * the consistent "--stripe-size|-S" for all commands. */ + { .val = 's', .name = "size", .has_arg = required_argument }, +#endif + { .val = 'S', .name = "stripe-size", .has_arg = required_argument }, + { .val = 'S', .name = "stripe_size", .has_arg = required_argument }, + /* dirstripe {"mdt-count", required_argument, 0, 'T'}, */ + /* --verbose is only valid in migrate mode */ + { .val = 'v', .name = "verbose", .has_arg = no_argument }, + { .val = LFS_COMP_ADD_OPT, + .name = "component-add", + .has_arg = no_argument }, + { .val = LFS_COMP_DEL_OPT, + .name = "component-del", + .has_arg = no_argument }, + { .val = LFS_COMP_FLAGS_OPT, + .name = "component-flags", + .has_arg = required_argument }, + { .val = LFS_COMP_SET_OPT, + .name = "component-set", + .has_arg = no_argument }, + { .name = NULL } }; + + setstripe_args_init(&lsa); if (strcmp(argv[0], "migrate") == 0) - migrate_mode = 1; + migrate_mode = true; - optind = 0; - while ((c = getopt_long(argc, argv, "c:di:o:p:s:S:", + while ((c = getopt_long(argc, argv, "bc:dE:i:I:m:no:p:s:S:v", long_opts, NULL)) >= 0) { switch (c) { case 0: /* Long options. */ break; + case LFS_COMP_ADD_OPT: + comp_add = 1; + break; + case LFS_COMP_DEL_OPT: + comp_del = 1; + break; + case LFS_COMP_FLAGS_OPT: + result = comp_str2flags(&lsa.lsa_comp_flags, optarg); + if (result != 0) { + fprintf(stderr, "error: %s: bad comp flags " + "'%s'\n", argv[0], optarg); + goto error; + } + break; + case LFS_COMP_SET_OPT: + comp_set = 1; + break; case 'b': - if (migrate_mode == 0) { + if (!migrate_mode) { fprintf(stderr, "--block is valid only for" - " migrate mode"); - return CMD_HELP; + " migrate mode\n"); + goto error; } - migration_flags |= MIGRATION_BLOCKS; + migration_block = true; break; case 'c': #if LUSTRE_VERSION_CODE >= OBD_OCD_VERSION(2, 6, 53, 0) @@ -665,109 +1463,321 @@ static int lfs_setstripe(int argc, char **argv) fprintf(stderr, "warning: '--count' deprecated" ", use '--stripe-count' instead\n"); #endif - stripe_count_arg = optarg; + lsa.lsa_stripe_count = strtoul(optarg, &end, 0); + if (*end != '\0') { + fprintf(stderr, "error: %s: bad stripe count " + "'%s'\n", argv[0], optarg); + goto error; + } break; case 'd': /* delete the default striping pattern */ delete = 1; break; -#if LUSTRE_VERSION_CODE < OBD_OCD_VERSION(2, 9, 53, 0) - case 'o': - fprintf(stderr, "warning: '--offset|-o' deprecated, " - "use '--stripe-index|-i' instead\n"); -#endif + case 'E': + if (lsa.lsa_comp_end != 0) { + result = comp_args_to_layout(&layout, &lsa); + if (result) + goto error; + + setstripe_args_init(&lsa); + } + + if (arg_is_eof(optarg)) { + lsa.lsa_comp_end = LUSTRE_EOF; + } else { + result = llapi_parse_size(optarg, + &lsa.lsa_comp_end, + &size_units, 0); + if (result) { + fprintf(stderr, "error: %s: " + "bad component end '%s'\n", + argv[0], optarg); + goto error; + } + } + break; case 'i': -#if LUSTRE_VERSION_CODE >= OBD_OCD_VERSION(2, 6, 53, 0) if (strcmp(argv[optind - 1], "--index") == 0) fprintf(stderr, "warning: '--index' deprecated" ", use '--stripe-index' instead\n"); -#endif - stripe_off_arg = optarg; + lsa.lsa_stripe_off = strtol(optarg, &end, 0); + if (*end != '\0') { + fprintf(stderr, "error: %s: bad stripe offset " + "'%s'\n", argv[0], optarg); + goto error; + } + break; + case 'I': + comp_id = strtoul(optarg, &end, 0); + if (*end != '\0' || comp_id == 0 || + comp_id > LCME_ID_MAX) { + fprintf(stderr, "error: %s: bad comp ID " + "'%s'\n", argv[0], optarg); + goto error; + } + break; + case 'm': + if (!migrate_mode) { + fprintf(stderr, "--mdt-index is valid only for" + " migrate mode\n"); + goto error; + } + mdt_idx_arg = optarg; + break; + case 'n': + if (!migrate_mode) { + fprintf(stderr, "--non-block is valid only for" + " migrate mode\n"); + goto error; + } + migration_flags |= MIGRATION_NONBLOCK; break; -#if LUSTRE_VERSION_CODE < OBD_OCD_VERSION(2, 9, 53, 0) + case 'o': + lsa.lsa_nr_osts = parse_targets(osts, + sizeof(osts) / sizeof(__u32), + lsa.lsa_nr_osts, optarg); + if (lsa.lsa_nr_osts < 0) { + fprintf(stderr, + "error: %s: bad OST indices '%s'\n", + argv[0], optarg); + goto error; + } + + lsa.lsa_osts = osts; + if (lsa.lsa_stripe_off == -1) + lsa.lsa_stripe_off = osts[0]; + break; + case 'p': + result = verify_pool_name(argv[0], optarg); + if (result) + goto error; + lsa.lsa_pool_name = optarg; + break; +#if LUSTRE_VERSION_CODE < OBD_OCD_VERSION(2, 9, 59, 0) case 's': #if LUSTRE_VERSION_CODE >= OBD_OCD_VERSION(2, 6, 53, 0) fprintf(stderr, "warning: '--size|-s' deprecated, " "use '--stripe-size|-S' instead\n"); #endif -#endif /* LUSTRE_VERSION_CODE < OBD_OCD_VERSION(2, 9, 53, 0) */ +#endif /* LUSTRE_VERSION_CODE < OBD_OCD_VERSION(2, 9, 59, 0) */ case 'S': - stripe_size_arg = optarg; + result = llapi_parse_size(optarg, &lsa.lsa_stripe_size, + &size_units, 0); + if (result) { + fprintf(stderr, "error: %s: bad stripe size " + "'%s'\n", argv[0], optarg); + goto error; + } break; - case 'p': - pool_name_arg = optarg; + case 'v': + if (!migrate_mode) { + fprintf(stderr, "--verbose is valid only for" + " migrate mode\n"); + goto error; + } + migrate_mdt_param.fp_verbose = VERBOSE_DETAIL; break; default: - return CMD_HELP; + goto error; } } fname = argv[optind]; - if (delete && - (stripe_size_arg != NULL || stripe_off_arg != NULL || - stripe_count_arg != NULL || pool_name_arg != NULL)) { - fprintf(stderr, "error: %s: cannot specify -d with " - "-s, -c, -o, or -p options\n", - argv[0]); - return CMD_HELP; + if (lsa.lsa_comp_end != 0) { + result = comp_args_to_layout(&layout, &lsa); + if (result) + goto error; } if (optind == argc) { fprintf(stderr, "error: %s: missing filename|dirname\n", argv[0]); - return CMD_HELP; + goto error; } - /* get the stripe size */ - if (stripe_size_arg != NULL) { - result = llapi_parse_size(stripe_size_arg, &st_size, - &size_units, 0); - if (result) { - fprintf(stderr, "error: %s: bad stripe size '%s'\n", - argv[0], stripe_size_arg); - return result; + /* Only LCME_FL_INIT flags is used in PFL, and it shouldn't be + * altered by user space tool, so we don't need to support the + * --component-set for this moment. */ + if (comp_set != 0) { + fprintf(stderr, "error: %s: --component-set isn't supported.\n", + argv[0]); + goto error; + } + + if ((delete + comp_set + comp_del + comp_add) > 1) { + fprintf(stderr, "error: %s: can't specify --component-set, " + "--component-del, --component-add or -d together\n", + argv[0]); + goto error; + } + + if (delete && (setstripe_args_specified(&lsa) || comp_id != 0 || + lsa.lsa_comp_flags != 0 || layout != NULL)) { + fprintf(stderr, "error: %s: can't specify -d with " + "-s, -c, -o, -p, -I, -F or -E options\n", + argv[0]); + goto error; + } + + if ((comp_set || comp_del) && + (setstripe_args_specified(&lsa) || layout != NULL)) { + fprintf(stderr, "error: %s: can't specify --component-del or " + "--component-set with -s, -c, -o, -p or -E options.\n", + argv[0]); + goto error; + } + + if (comp_del && comp_id != 0 && lsa.lsa_comp_flags != 0) { + fprintf(stderr, "error: %s: can't specify both -I and -F for " + "--component-del option.\n", argv[0]); + goto error; + } + + if (comp_add || comp_del) { + struct stat st; + + result = lstat(fname, &st); + if (result == 0 && S_ISDIR(st.st_mode)) { + fprintf(stderr, "error: %s: can't use --component-add " + "or --component-del for directory.\n", + argv[0]); + goto error; + } + } + + if (comp_add) { + if (layout == NULL) { + fprintf(stderr, "error: %s: -E option must be present" + "in --component-add mode.\n", argv[0]); + goto error; + } + result = adjust_first_extent(fname, layout); + if (result == -ENODATA) + comp_add = 0; + else if (result != 0) + goto error; + } + + if (mdt_idx_arg != NULL && optind > 3) { + fprintf(stderr, "error: %s: cannot specify -m with other " + "options\n", argv[0]); + goto error; + } + + if ((migration_flags & MIGRATION_NONBLOCK) && migration_block) { + fprintf(stderr, + "error: %s: cannot specify --non-block and --block\n", + argv[0]); + goto error; + } + + if (!comp_del && !comp_set && comp_id != 0) { + fprintf(stderr, "error: %s: -I can only be used with " + "--component-del.\n", argv[0]); + goto error; + } + + if (mdt_idx_arg != NULL) { + /* initialize migrate mdt parameters */ + migrate_mdt_param.fp_mdt_index = strtoul(mdt_idx_arg, &end, 0); + if (*end != '\0') { + fprintf(stderr, "error: %s: bad MDT index '%s'\n", + argv[0], mdt_idx_arg); + goto error; + } + migrate_mdt_param.fp_migrate = 1; + } else if (layout == NULL) { + /* initialize stripe parameters */ + param = calloc(1, offsetof(typeof(*param), + lsp_osts[lsa.lsa_nr_osts])); + if (param == NULL) { + fprintf(stderr, "error: %s: %s\n", argv[0], + strerror(ENOMEM)); + goto error; + } + + param->lsp_stripe_size = lsa.lsa_stripe_size; + param->lsp_stripe_offset = lsa.lsa_stripe_off; + param->lsp_stripe_count = lsa.lsa_stripe_count; + param->lsp_stripe_pattern = 0; + param->lsp_pool = lsa.lsa_pool_name; + param->lsp_is_specific = false; + if (lsa.lsa_nr_osts > 0) { + if (lsa.lsa_stripe_count > 0 && + lsa.lsa_nr_osts != lsa.lsa_stripe_count) { + fprintf(stderr, "error: %s: stripe count '%d' " + "doesn't match the number of OSTs: %d\n" + , argv[0], lsa.lsa_stripe_count, + lsa.lsa_nr_osts); + free(param); + goto error; + } + + param->lsp_is_specific = true; + param->lsp_stripe_count = lsa.lsa_nr_osts; + memcpy(param->lsp_osts, osts, + sizeof(*osts) * lsa.lsa_nr_osts); } } - /* get the stripe offset */ - if (stripe_off_arg != NULL) { - st_offset = strtol(stripe_off_arg, &end, 0); - if (*end != '\0') { - fprintf(stderr, "error: %s: bad stripe offset '%s'\n", - argv[0], stripe_off_arg); - return CMD_HELP; - } - } - /* get the stripe count */ - if (stripe_count_arg != NULL) { - st_count = strtoul(stripe_count_arg, &end, 0); - if (*end != '\0') { - fprintf(stderr, "error: %s: bad stripe count '%s'\n", - argv[0], stripe_count_arg); - return CMD_HELP; - } - } - do { - if (migrate_mode) - result = lfs_migrate(fname, st_size, st_offset, - st_count, 0, pool_name_arg, - migration_flags); - else - result = llapi_file_create_pool(fname, st_size, - st_offset, st_count, - 0, pool_name_arg); + for (fname = argv[optind]; fname != NULL; fname = argv[++optind]) { + char *op; + if (mdt_idx_arg != NULL) { + result = llapi_migrate_mdt(fname, &migrate_mdt_param); + op = "migrate mdt objects of"; + } else if (migrate_mode) { + result = lfs_migrate(fname, migration_flags, param, + layout); + op = "migrate ost objects of"; + } else if (comp_set != 0) { + result = lfs_component_set(fname, comp_id, + lsa.lsa_comp_flags); + op = "modify component flags of"; + } else if (comp_del != 0) { + result = lfs_component_del(fname, comp_id, + lsa.lsa_comp_flags); + op = "delete component of"; + } else if (comp_add != 0) { + result = lfs_component_add(fname, layout); + op = "add component to"; + } else if (layout != NULL) { + result = lfs_component_create(fname, O_CREAT | O_WRONLY, + 0644, layout); + if (result >= 0) { + close(result); + result = 0; + } + op = "create composite"; + } else { + result = llapi_file_open_param(fname, + O_CREAT | O_WRONLY, + 0644, param); + if (result >= 0) { + close(result); + result = 0; + } + op = "create striped"; + } if (result) { - fprintf(stderr, - "error: %s: %s stripe file '%s' failed\n", - argv[0], migrate_mode ? "migrate" : "create", - fname); - break; + /* Save the first error encountered. */ + if (result2 == 0) + result2 = result; + fprintf(stderr, "error: %s: %s file '%s' failed: %s\n", + argv[0], op, fname, + lsa.lsa_pool_name != NULL && result == EINVAL ? + "OST not in pool?" : strerror(errno)); + continue; } - fname = argv[++optind]; - } while (fname != NULL); + } - return result; + free(param); + llapi_layout_free(layout); + return result2; +error: + llapi_layout_free(layout); + return CMD_HELP; } static int lfs_poollist(int argc, char **argv) @@ -802,62 +1812,57 @@ static int set_time(time_t *time, time_t *set, char *str) *set = *time - t * 24 * 60 * 60; return res; } - -#define USER 0 -#define GROUP 1 - -static int name2id(unsigned int *id, char *name, int type) +static int name2uid(unsigned int *id, const char *name) { - if (type == USER) { - struct passwd *entry; + struct passwd *passwd; - if (!(entry = getpwnam(name))) { - if (!errno) - errno = ENOENT; - return -1; - } + passwd = getpwnam(name); + if (passwd == NULL) + return -ENOENT; + *id = passwd->pw_uid; - *id = entry->pw_uid; - } else { - struct group *entry; + return 0; +} - if (!(entry = getgrnam(name))) { - if (!errno) - errno = ENOENT; - return -1; - } +static int name2gid(unsigned int *id, const char *name) +{ + struct group *group; - *id = entry->gr_gid; - } + group = getgrnam(name); + if (group == NULL) + return -ENOENT; + *id = group->gr_gid; - return 0; + return 0; } -static int id2name(char **name, unsigned int id, int type) +static inline int name2projid(unsigned int *id, const char *name) { - if (type == USER) { - struct passwd *entry; + return -ENOTSUP; +} - if (!(entry = getpwuid(id))) { - if (!errno) - errno = ENOENT; - return -1; - } +static int uid2name(char **name, unsigned int id) +{ + struct passwd *passwd; - *name = entry->pw_name; - } else { - struct group *entry; + passwd = getpwuid(id); + if (passwd == NULL) + return -ENOENT; + *name = passwd->pw_name; - if (!(entry = getgrgid(id))) { - if (!errno) - errno = ENOENT; - return -1; - } + return 0; +} - *name = entry->gr_name; - } +static inline int gid2name(char **name, unsigned int id) +{ + struct group *group; - return 0; + group = getgrgid(id); + if (group == NULL) + return -ENOENT; + *name = group->gr_name; + + return 0; } static int name2layout(__u32 *layout, char *name) @@ -879,45 +1884,69 @@ static int name2layout(__u32 *layout, char *name) return 0; } -#define FIND_POOL_OPT 3 static int lfs_find(int argc, char **argv) { int c, rc; int ret = 0; - time_t t; + time_t t; struct find_param param = { .fp_max_depth = -1, - .quiet = 1, + .fp_quiet = 1, }; struct option long_opts[] = { - {"atime", required_argument, 0, 'A'}, - {"stripe-count", required_argument, 0, 'c'}, - {"stripe_count", required_argument, 0, 'c'}, - {"ctime", required_argument, 0, 'C'}, - {"maxdepth", required_argument, 0, 'D'}, - {"gid", required_argument, 0, 'g'}, - {"group", required_argument, 0, 'G'}, - {"stripe-index", required_argument, 0, 'i'}, - {"stripe_index", required_argument, 0, 'i'}, - {"layout", required_argument, 0, 'L'}, - {"mdt", required_argument, 0, 'm'}, - {"mtime", required_argument, 0, 'M'}, - {"name", required_argument, 0, 'n'}, + { .val = 'A', .name = "atime", .has_arg = required_argument }, + { .val = LFS_COMP_COUNT_OPT, + .name = "comp-count", .has_arg = required_argument }, + { .val = LFS_COMP_COUNT_OPT, + .name = "component-count", + .has_arg = required_argument }, + { .val = LFS_COMP_FLAGS_OPT, + .name = "comp-flags", .has_arg = required_argument }, + { .val = LFS_COMP_FLAGS_OPT, + .name = "component-flags", + .has_arg = required_argument }, + { .val = LFS_COMP_START_OPT, + .name = "comp-start", .has_arg = required_argument }, + { .val = LFS_COMP_START_OPT, + .name = "component-start", + .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 }, + { .val = 'D', .name = "maxdepth", .has_arg = required_argument }, + { .val = 'E', .name = "comp-end", .has_arg = required_argument }, + { .val = 'E', .name = "component-end", + .has_arg = required_argument }, + { .val = 'g', .name = "gid", .has_arg = required_argument }, + { .val = 'G', .name = "group", .has_arg = required_argument }, + { .val = 'H', .name = "mdt-hash", .has_arg = required_argument }, + { .val = 'i', .name = "stripe-index", .has_arg = required_argument }, + { .val = 'i', .name = "stripe_index", .has_arg = required_argument }, + /*{"component-id", required_argument, 0, 'I'},*/ + { .val = 'L', .name = "layout", .has_arg = required_argument }, + { .val = 'm', .name = "mdt", .has_arg = required_argument }, + { .val = 'm', .name = "mdt-index", .has_arg = required_argument }, + { .val = 'm', .name = "mdt_index", .has_arg = required_argument }, + { .val = 'M', .name = "mtime", .has_arg = required_argument }, + { .val = 'n', .name = "name", .has_arg = required_argument }, /* reserve {"or", no_argument, , 0, 'o'}, to match find(1) */ - {"obd", required_argument, 0, 'O'}, - {"ost", required_argument, 0, 'O'}, - /* no short option for pool, p/P already used */ - {"pool", required_argument, 0, FIND_POOL_OPT}, - {"print0", no_argument, 0, 'p'}, - {"print", no_argument, 0, 'P'}, - {"size", required_argument, 0, 's'}, - {"stripe-size", required_argument, 0, 'S'}, - {"stripe_size", required_argument, 0, 'S'}, - {"type", required_argument, 0, 't'}, - {"uid", required_argument, 0, 'u'}, - {"user", required_argument, 0, 'U'}, - {0, 0, 0, 0} - }; + { .val = 'O', .name = "obd", .has_arg = required_argument }, + { .val = 'O', .name = "ost", .has_arg = required_argument }, + /* no short option for pool, p/P already used */ + { .val = LFS_POOL_OPT, + .name = "pool", .has_arg = required_argument }, + { .val = 'p', .name = "print0", .has_arg = no_argument }, + { .val = 'P', .name = "print", .has_arg = no_argument }, + { .val = LFS_PROJID_OPT, + .name = "projid", .has_arg = required_argument }, + { .val = 's', .name = "size", .has_arg = required_argument }, + { .val = 'S', .name = "stripe-size", .has_arg = required_argument }, + { .val = 'S', .name = "stripe_size", .has_arg = required_argument }, + { .val = 't', .name = "type", .has_arg = required_argument }, + { .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 }, + { .name = NULL } }; int pathstart = -1; int pathend = -1; int neg_opt = 0; @@ -928,11 +1957,10 @@ static int lfs_find(int argc, char **argv) time(&t); - optind = 0; /* when getopt_long_only() hits '!' it returns 1, puts "!" in optarg */ while ((c = getopt_long_only(argc, argv, - "-A:c:C:D:g:G:i:L:m:M:n:O:Ppqrs:S:t:u:U:v", - long_opts, NULL)) >= 0) { + "-A:c:C:D:E:g:G:H:i:L:m:M:n:O:Ppqrs:S:t:T:u:U:v", + long_opts, NULL)) >= 0) { xtime = NULL; xsign = NULL; if (neg_opt) @@ -993,31 +2021,104 @@ static int lfs_find(int argc, char **argv) if (rc) *xsign = rc; break; + case LFS_COMP_COUNT_OPT: + if (optarg[0] == '+') { + param.fp_comp_count_sign = -1; + optarg++; + } else if (optarg[0] == '-') { + param.fp_comp_count_sign = 1; + optarg++; + } + + param.fp_comp_count = strtoul(optarg, &endptr, 0); + if (*endptr != '\0') { + fprintf(stderr, "error: bad component count " + "'%s'\n", optarg); + goto err; + } + param.fp_check_comp_count = 1; + param.fp_exclude_comp_count = !!neg_opt; + break; + case LFS_COMP_FLAGS_OPT: + rc = comp_str2flags(¶m.fp_comp_flags, optarg); + if (rc || comp_flags_is_neg(param.fp_comp_flags)) { + fprintf(stderr, "error: bad component flags " + "'%s'\n", optarg); + goto err; + } + param.fp_check_comp_flags = 1; + param.fp_exclude_comp_flags = !!neg_opt; + break; + case LFS_COMP_START_OPT: + if (optarg[0] == '+') { + param.fp_comp_start_sign = -1; + optarg++; + } else if (optarg[0] == '-') { + param.fp_comp_start_sign = 1; + optarg++; + } + + rc = llapi_parse_size(optarg, ¶m.fp_comp_start, + ¶m.fp_comp_start_units, 0); + if (rc) { + fprintf(stderr, "error: bad component start " + "'%s'\n", optarg); + goto err; + } + param.fp_check_comp_start = 1; + param.fp_exclude_comp_start = !!neg_opt; + break; case 'c': if (optarg[0] == '+') { - param.stripecount_sign = -1; + param.fp_stripe_count_sign = -1; optarg++; } else if (optarg[0] == '-') { - param.stripecount_sign = 1; + param.fp_stripe_count_sign = 1; optarg++; } - param.stripecount = strtoul(optarg, &endptr, 0); + param.fp_stripe_count = strtoul(optarg, &endptr, 0); if (*endptr != '\0') { fprintf(stderr,"error: bad stripe_count '%s'\n", optarg); ret = -1; goto err; } - param.check_stripecount = 1; - param.exclude_stripecount = !!neg_opt; + param.fp_check_stripe_count = 1; + param.fp_exclude_stripe_count = !!neg_opt; break; case 'D': param.fp_max_depth = strtol(optarg, 0, 0); break; + case 'E': + if (optarg[0] == '+') { + param.fp_comp_end_sign = -1; + optarg++; + } else if (optarg[0] == '-') { + param.fp_comp_end_sign = 1; + optarg++; + } + + if (arg_is_eof(optarg)) { + param.fp_comp_end = LUSTRE_EOF; + param.fp_comp_end_units = 1; + rc = 0; + } else { + rc = llapi_parse_size(optarg, + ¶m.fp_comp_end, + ¶m.fp_comp_end_units, 0); + } + if (rc) { + fprintf(stderr, "error: bad component end " + "'%s'\n", optarg); + goto err; + } + param.fp_check_comp_end = 1; + param.fp_exclude_comp_end = !!neg_opt; + break; case 'g': case 'G': - rc = name2id(¶m.fp_gid, optarg, GROUP); + rc = name2gid(¶m.fp_gid, optarg); if (rc) { param.fp_gid = strtoul(optarg, &endptr, 10); if (*endptr != '\0') { @@ -1030,20 +2131,31 @@ static int lfs_find(int argc, char **argv) param.fp_exclude_gid = !!neg_opt; param.fp_check_gid = 1; break; + case 'H': + param.fp_hash_type = check_hashtype(optarg); + if (param.fp_hash_type == 0) { + fprintf(stderr, "error: bad hash_type '%s'\n", + optarg); + ret = -1; + goto err; + } + param.fp_check_hash_type = 1; + param.fp_exclude_hash_type = !!neg_opt; + break; case 'L': - ret = name2layout(¶m.layout, optarg); + ret = name2layout(¶m.fp_layout, optarg); if (ret) goto err; - param.exclude_layout = !!neg_opt; - param.check_layout = 1; + param.fp_exclude_layout = !!neg_opt; + param.fp_check_layout = 1; break; - case 'u': - case 'U': - rc = name2id(¶m.fp_uid, optarg, USER); + case 'u': + case 'U': + rc = name2uid(¶m.fp_uid, optarg); if (rc) { param.fp_uid = strtoul(optarg, &endptr, 10); - if (*endptr != '\0') { - fprintf(stderr, "User/UID: %s cannot " + if (*endptr != '\0') { + fprintf(stderr, "User/UID: %s cannot " "be found.\n", optarg); ret = -1; goto err; @@ -1052,7 +2164,7 @@ static int lfs_find(int argc, char **argv) param.fp_exclude_uid = !!neg_opt; param.fp_check_uid = 1; break; - case FIND_POOL_OPT: + case LFS_POOL_OPT: if (strlen(optarg) > LOV_MAXPOOLNAME) { fprintf(stderr, "Pool name %s is too long" @@ -1063,14 +2175,14 @@ static int lfs_find(int argc, char **argv) } /* we do check for empty pool because empty pool * is used to find V1 lov attributes */ - strncpy(param.poolname, optarg, LOV_MAXPOOLNAME); - param.poolname[LOV_MAXPOOLNAME] = '\0'; - param.exclude_pool = !!neg_opt; - param.check_pool = 1; + strncpy(param.fp_poolname, optarg, LOV_MAXPOOLNAME); + param.fp_poolname[LOV_MAXPOOLNAME] = '\0'; + param.fp_exclude_pool = !!neg_opt; + param.fp_check_pool = 1; break; case 'n': - param.pattern = (char *)optarg; - param.exclude_pattern = !!neg_opt; + param.fp_pattern = (char *)optarg; + param.fp_exclude_pattern = !!neg_opt; break; case 'm': case 'i': @@ -1085,7 +2197,7 @@ static int lfs_find(int argc, char **argv) goto err; } - param.exclude_obd = !!neg_opt; + param.fp_exclude_obd = !!neg_opt; token = buf; while (token && *token) { @@ -1096,32 +2208,38 @@ static int lfs_find(int argc, char **argv) } } if (c == 'm') { - param.exclude_mdt = !!neg_opt; - param.num_alloc_mdts += len; - tmp = realloc(param.mdtuuid, - param.num_alloc_mdts * - sizeof(*param.mdtuuid)); - if (tmp == NULL) - GOTO(err_free, ret = -ENOMEM); - param.mdtuuid = tmp; + param.fp_exclude_mdt = !!neg_opt; + param.fp_num_alloc_mdts += len; + tmp = realloc(param.fp_mdt_uuid, + param.fp_num_alloc_mdts * + sizeof(*param.fp_mdt_uuid)); + if (tmp == NULL) { + ret = -ENOMEM; + goto err_free; + } + + param.fp_mdt_uuid = tmp; } else { - param.exclude_obd = !!neg_opt; - param.num_alloc_obds += len; - tmp = realloc(param.obduuid, - param.num_alloc_obds * - sizeof(*param.obduuid)); - if (tmp == NULL) - GOTO(err_free, ret = -ENOMEM); - param.obduuid = tmp; + param.fp_exclude_obd = !!neg_opt; + param.fp_num_alloc_obds += len; + tmp = realloc(param.fp_obd_uuid, + param.fp_num_alloc_obds * + sizeof(*param.fp_obd_uuid)); + if (tmp == NULL) { + ret = -ENOMEM; + goto err_free; + } + + param.fp_obd_uuid = tmp; } for (token = buf; token && *token; token = next) { struct obd_uuid *puuid; if (c == 'm') { puuid = - ¶m.mdtuuid[param.num_mdts++]; + ¶m.fp_mdt_uuid[param.fp_num_mdts++]; } else { puuid = - ¶m.obduuid[param.num_obds++]; + ¶m.fp_obd_uuid[param.fp_num_obds++]; } p = strchr(token, ','); next = 0; @@ -1129,58 +2247,77 @@ static int lfs_find(int argc, char **argv) *p = 0; next = p+1; } - if (strlen(token) > sizeof(puuid->uuid)-1) - GOTO(err_free, ret = -E2BIG); + + if (strlen(token) > sizeof(puuid->uuid) - 1) { + ret = -E2BIG; + goto err_free; + } + strncpy(puuid->uuid, token, sizeof(puuid->uuid)); - } + } err_free: - if (buf) - free(buf); - break; - } - case 'p': - param.zeroend = 1; - break; - case 'P': - break; + if (buf) + free(buf); + break; + } + case 'p': + param.fp_zero_end = 1; + break; + case 'P': + break; + case LFS_PROJID_OPT: + rc = name2projid(¶m.fp_projid, optarg); + if (rc) { + param.fp_projid = strtoul(optarg, &endptr, 10); + if (*endptr != '\0') { + fprintf(stderr, + "Invalid project ID: %s", + optarg); + ret = -1; + goto err; + } + } + param.fp_exclude_projid = !!neg_opt; + param.fp_check_projid = 1; + break; case 's': if (optarg[0] == '+') { - param.size_sign = -1; + param.fp_size_sign = -1; optarg++; } else if (optarg[0] == '-') { - param.size_sign = 1; + param.fp_size_sign = 1; optarg++; } - ret = llapi_parse_size(optarg, ¶m.size, - ¶m.size_units, 0); + ret = llapi_parse_size(optarg, ¶m.fp_size, + ¶m.fp_size_units, 0); if (ret) { fprintf(stderr, "error: bad file size '%s'\n", optarg); goto err; } - param.check_size = 1; - param.exclude_size = !!neg_opt; + param.fp_check_size = 1; + param.fp_exclude_size = !!neg_opt; break; case 'S': if (optarg[0] == '+') { - param.stripesize_sign = -1; + param.fp_stripe_size_sign = -1; optarg++; } else if (optarg[0] == '-') { - param.stripesize_sign = 1; + param.fp_stripe_size_sign = 1; optarg++; } - ret = llapi_parse_size(optarg, ¶m.stripesize, - ¶m.stripesize_units, 0); + ret = llapi_parse_size(optarg, ¶m.fp_stripe_size, + ¶m.fp_stripe_size_units, 0); if (ret) { fprintf(stderr, "error: bad stripe_size '%s'\n", optarg); goto err; } - param.check_stripesize = 1; - param.exclude_stripesize = !!neg_opt; + param.fp_check_stripe_size = 1; + param.fp_exclude_stripe_size = !!neg_opt; break; case 't': param.fp_exclude_type = !!neg_opt; @@ -1213,6 +2350,25 @@ err_free: goto err; }; break; + case 'T': + if (optarg[0] == '+') { + param.fp_mdt_count_sign = -1; + optarg++; + } else if (optarg[0] == '-') { + param.fp_mdt_count_sign = 1; + optarg++; + } + + param.fp_mdt_count = strtoul(optarg, &endptr, 0); + if (*endptr != '\0') { + fprintf(stderr, "error: bad mdt_count '%s'\n", + optarg); + ret = -1; + goto err; + } + param.fp_check_mdt_count = 1; + param.fp_exclude_mdt_count = !!neg_opt; + break; default: ret = CMD_HELP; goto err; @@ -1239,11 +2395,11 @@ err_free: fprintf(stderr, "error: %s failed for %s.\n", argv[0], argv[optind - 1]); err: - if (param.obduuid && param.num_alloc_obds) - free(param.obduuid); + if (param.fp_obd_uuid && param.fp_num_alloc_obds) + free(param.fp_obd_uuid); - if (param.mdtuuid && param.num_alloc_mdts) - free(param.mdtuuid); + if (param.fp_mdt_uuid && param.fp_num_alloc_mdts) + free(param.fp_mdt_uuid); return ret; } @@ -1252,7 +2408,13 @@ static int lfs_getstripe_internal(int argc, char **argv, struct find_param *param) { struct option long_opts[] = { -#if LUSTRE_VERSION_CODE < OBD_OCD_VERSION(2, 9, 53, 0) + {"comp-count", no_argument, 0, LFS_COMP_COUNT_OPT}, + {"component-count", no_argument, 0, LFS_COMP_COUNT_OPT}, + {"comp-flags", optional_argument, 0, LFS_COMP_FLAGS_OPT}, + {"component-flags", optional_argument, 0, LFS_COMP_FLAGS_OPT}, + {"comp-start", optional_argument, 0, LFS_COMP_START_OPT}, + {"component-start", optional_argument, 0, LFS_COMP_START_OPT}, +#if LUSTRE_VERSION_CODE < OBD_OCD_VERSION(2, 9, 59, 0) /* This formerly implied "stripe-count", but was explicitly * made "stripe-count" for consistency with other options, * and to separate it from "mdt-count" when DNE arrives. */ @@ -1262,8 +2424,12 @@ static int lfs_getstripe_internal(int argc, char **argv, {"stripe_count", no_argument, 0, 'c'}, {"directory", no_argument, 0, 'd'}, {"default", no_argument, 0, 'D'}, + {"comp-end", optional_argument, 0, 'E'}, + {"component-end", optional_argument, 0, 'E'}, + {"fid", no_argument, 0, 'F'}, {"generation", no_argument, 0, 'g'}, -#if LUSTRE_VERSION_CODE < OBD_OCD_VERSION(2, 9, 53, 0) + /* dirstripe {"mdt-hash", required_argument, 0, 'H'}, */ +#if LUSTRE_VERSION_CODE < OBD_OCD_VERSION(2, 9, 59, 0) /* This formerly implied "stripe-index", but was explicitly * made "stripe-index" for consistency with other options, * and to separate it from "mdt-index" when DNE arrives. */ @@ -1271,10 +2437,17 @@ static int lfs_getstripe_internal(int argc, char **argv, #endif {"stripe-index", no_argument, 0, 'i'}, {"stripe_index", no_argument, 0, 'i'}, + {"comp-id", optional_argument, 0, 'I'}, + {"component-id", optional_argument, 0, 'I'}, {"layout", no_argument, 0, 'L'}, + {"mdt", no_argument, 0, 'm'}, + {"mdt-index", no_argument, 0, 'm'}, + {"mdt_index", no_argument, 0, 'm'}, +#if LUSTRE_VERSION_CODE < OBD_OCD_VERSION(3, 0, 53, 0) {"mdt-index", no_argument, 0, 'M'}, {"mdt_index", no_argument, 0, 'M'}, -#if LUSTRE_VERSION_CODE < OBD_OCD_VERSION(2, 9, 53, 0) +#endif +#if LUSTRE_VERSION_CODE < OBD_OCD_VERSION(2, 9, 59, 0) /* This formerly implied "stripe-index", but was confusing * with "file offset" (which will eventually be needed for * with different layouts by offset), so deprecate it. */ @@ -1286,7 +2459,7 @@ static int lfs_getstripe_internal(int argc, char **argv, {"quiet", no_argument, 0, 'q'}, {"recursive", no_argument, 0, 'r'}, {"raw", no_argument, 0, 'R'}, -#if LUSTRE_VERSION_CODE < OBD_OCD_VERSION(2, 9, 53, 0) +#if LUSTRE_VERSION_CODE < OBD_OCD_VERSION(2, 9, 59, 0) /* This formerly implied "--stripe-size", but was confusing * with "lfs find --size|-s", which means "file size", so use * the consistent "--stripe-size|-S" for all commands. */ @@ -1294,65 +2467,127 @@ static int lfs_getstripe_internal(int argc, char **argv, #endif {"stripe-size", no_argument, 0, 'S'}, {"stripe_size", no_argument, 0, 'S'}, + /* dirstripe {"mdt-count", required_argument, 0, 'T'}, */ {"verbose", no_argument, 0, 'v'}, + {"yaml", no_argument, 0, 'y'}, {0, 0, 0, 0} }; int c, rc; + char *end, *tmp; - param->fp_max_depth = 1; - optind = 0; - while ((c = getopt_long(argc, argv, "cdDghiLMoO:pqrRsSv", + while ((c = getopt_long(argc, argv, "cdDE::FghiI::LmMoO:pqrRsSvy", long_opts, NULL)) != -1) { switch (c) { - case 'O': - if (param->obduuid) { - fprintf(stderr, - "error: %s: only one obduuid allowed", - argv[0]); - return CMD_HELP; + case 'c': + if (strcmp(argv[optind - 1], "--count") == 0) + fprintf(stderr, "warning: '--count' deprecated," + " use '--stripe-count' instead\n"); + if (!(param->fp_verbose & VERBOSE_DETAIL)) { + param->fp_verbose |= VERBOSE_COUNT; + param->fp_max_depth = 0; } - param->obduuid = (struct obd_uuid *)optarg; break; - case 'q': - param->quiet++; + case LFS_COMP_COUNT_OPT: + param->fp_verbose |= VERBOSE_COMP_COUNT; + param->fp_max_depth = 0; + break; + case LFS_COMP_FLAGS_OPT: + if (optarg != NULL) { + __u32 *flags = ¶m->fp_comp_flags; + rc = comp_str2flags(flags, optarg); + if (rc != 0) { + fprintf(stderr, "error: %s bad " + "component flags '%s'.\n", + argv[0], optarg); + return CMD_HELP; + } else { + param->fp_check_comp_flags = 1; + param->fp_exclude_comp_flags = + comp_flags_is_neg(*flags); + comp_flags_clear_neg(flags); + } + } else { + param->fp_verbose |= VERBOSE_COMP_FLAGS; + param->fp_max_depth = 0; + } + break; + case LFS_COMP_START_OPT: + if (optarg != NULL) { + tmp = optarg; + if (tmp[0] == '+') { + param->fp_comp_start_sign = -1; + tmp++; + } else if (tmp[0] == '-') { + param->fp_comp_start_sign = 1; + tmp++; + } + rc = llapi_parse_size(tmp, + ¶m->fp_comp_start, + ¶m->fp_comp_start_units, 0); + if (rc != 0) { + fprintf(stderr, "error: %s bad " + "component start '%s'.\n", + argv[0], tmp); + return CMD_HELP; + } else { + param->fp_check_comp_start = 1; + } + } else { + param->fp_verbose |= VERBOSE_COMP_START; + param->fp_max_depth = 0; + } break; case 'd': param->fp_max_depth = 0; break; case 'D': - param->get_default_lmv = 1; - break; - case 'r': - param->recursive = 1; + param->fp_get_default_lmv = 1; break; - case 'v': - param->verbose = VERBOSE_ALL | VERBOSE_DETAIL; + case 'E': + if (optarg != NULL) { + tmp = optarg; + if (tmp[0] == '+') { + param->fp_comp_end_sign = -1; + tmp++; + } else if (tmp[0] == '-') { + param->fp_comp_end_sign = 1; + tmp++; + } + + if (arg_is_eof(tmp)) { + param->fp_comp_end = LUSTRE_EOF; + param->fp_comp_end_units = 1; + rc = 0; + } else { + rc = llapi_parse_size(tmp, + ¶m->fp_comp_end, + ¶m->fp_comp_end_units, 0); + } + if (rc != 0) { + fprintf(stderr, "error: %s bad " + "component end '%s'.\n", + argv[0], tmp); + return CMD_HELP; + } + param->fp_check_comp_end = 1; + } else { + param->fp_verbose |= VERBOSE_COMP_END; + param->fp_max_depth = 0; + } break; - case 'c': -#if LUSTRE_VERSION_CODE >= OBD_OCD_VERSION(2, 6, 53, 0) - if (strcmp(argv[optind - 1], "--count") == 0) - fprintf(stderr, "warning: '--count' deprecated," - " use '--stripe-count' instead\n"); -#endif - if (!(param->verbose & VERBOSE_DETAIL)) { - param->verbose |= VERBOSE_COUNT; + case 'F': + if (!(param->fp_verbose & VERBOSE_DETAIL)) { + param->fp_verbose |= VERBOSE_DFID; param->fp_max_depth = 0; } break; -#if LUSTRE_VERSION_CODE < OBD_OCD_VERSION(2, 9, 53, 0) - case 's': -#if LUSTRE_VERSION_CODE >= OBD_OCD_VERSION(2, 6, 53, 0) - fprintf(stderr, "warning: '--size|-s' deprecated, " - "use '--stripe-size|-S' instead\n"); -#endif -#endif /* LUSTRE_VERSION_CODE < OBD_OCD_VERSION(2, 9, 53, 0) */ - case 'S': - if (!(param->verbose & VERBOSE_DETAIL)) { - param->verbose |= VERBOSE_SIZE; + case 'g': + if (!(param->fp_verbose & VERBOSE_DETAIL)) { + param->fp_verbose |= VERBOSE_GENERATION; param->fp_max_depth = 0; } break; -#if LUSTRE_VERSION_CODE < OBD_OCD_VERSION(2, 9, 53, 0) +#if LUSTRE_VERSION_CODE < OBD_OCD_VERSION(2, 9, 59, 0) case 'o': fprintf(stderr, "warning: '--offset|-o' deprecated, " "use '--stripe-index|-i' instead\n"); @@ -1363,36 +2598,86 @@ static int lfs_getstripe_internal(int argc, char **argv, fprintf(stderr, "warning: '--index' deprecated" ", use '--stripe-index' instead\n"); #endif - if (!(param->verbose & VERBOSE_DETAIL)) { - param->verbose |= VERBOSE_OFFSET; + if (!(param->fp_verbose & VERBOSE_DETAIL)) { + param->fp_verbose |= VERBOSE_OFFSET; param->fp_max_depth = 0; } break; - case 'p': - if (!(param->verbose & VERBOSE_DETAIL)) { - param->verbose |= VERBOSE_POOL; + case 'I': + if (optarg != NULL) { + param->fp_comp_id = strtoul(optarg, &end, 0); + if (*end != '\0' || param->fp_comp_id == 0 || + param->fp_comp_id > LCME_ID_MAX) { + fprintf(stderr, "error: %s bad " + "component id '%s'\n", + argv[0], optarg); + return CMD_HELP; + } else { + param->fp_check_comp_id = 1; + } + } else { param->fp_max_depth = 0; + param->fp_verbose |= VERBOSE_COMP_ID; } break; - case 'g': - if (!(param->verbose & VERBOSE_DETAIL)) { - param->verbose |= VERBOSE_GENERATION; + case 'L': + if (!(param->fp_verbose & VERBOSE_DETAIL)) { + param->fp_verbose |= VERBOSE_LAYOUT; param->fp_max_depth = 0; } break; - case 'L': - if (!(param->verbose & VERBOSE_DETAIL)) { - param->verbose |= VERBOSE_LAYOUT; +#if LUSTRE_VERSION_CODE < OBD_OCD_VERSION(3, 0, 53, 0) + case 'M': +#if LUSTRE_VERSION_CODE >= OBD_OCD_VERSION(2, 11, 53, 0) + fprintf(stderr, "warning: '-M' deprecated" + ", use '-m' instead\n"); +#endif +#endif + case 'm': + if (!(param->fp_verbose & VERBOSE_DETAIL)) param->fp_max_depth = 0; + param->fp_verbose |= VERBOSE_MDTINDEX; + break; + case 'O': + if (param->fp_obd_uuid) { + fprintf(stderr, + "error: %s: only one obduuid allowed", + argv[0]); + return CMD_HELP; } + param->fp_obd_uuid = (struct obd_uuid *)optarg; break; - case 'M': - if (!(param->verbose & VERBOSE_DETAIL)) + case 'p': + if (!(param->fp_verbose & VERBOSE_DETAIL)) { + param->fp_verbose |= VERBOSE_POOL; param->fp_max_depth = 0; - param->verbose |= VERBOSE_MDTINDEX; + } + break; + case 'q': + param->fp_quiet++; + break; + case 'r': + param->fp_recursive = 1; break; case 'R': - param->raw = 1; + param->fp_raw = 1; + break; +#if LUSTRE_VERSION_CODE < OBD_OCD_VERSION(2, 9, 59, 0) + case 's': + fprintf(stderr, "warning: '--size|-s' deprecated, " + "use '--stripe-size|-S' instead\n"); +#endif /* LUSTRE_VERSION_CODE < OBD_OCD_VERSION(2, 9, 59, 0) */ + case 'S': + if (!(param->fp_verbose & VERBOSE_DETAIL)) { + param->fp_verbose |= VERBOSE_SIZE; + param->fp_max_depth = 0; + } + break; + case 'v': + param->fp_verbose = VERBOSE_DEFAULT | VERBOSE_DETAIL; + break; + case 'y': + param->fp_yaml = 1; break; default: return CMD_HELP; @@ -1402,13 +2687,15 @@ static int lfs_getstripe_internal(int argc, char **argv, if (optind >= argc) return CMD_HELP; - if (param->recursive) + if (param->fp_recursive) param->fp_max_depth = -1; + else if (param->fp_verbose & VERBOSE_DETAIL) + param->fp_max_depth = 1; - if (!param->verbose) - param->verbose = VERBOSE_ALL; - if (param->quiet) - param->verbose = VERBOSE_OBJID; + if (!param->fp_verbose) + param->fp_verbose = VERBOSE_DEFAULT; + if (param->fp_quiet) + param->fp_verbose = VERBOSE_OBJID; do { rc = llapi_getstripe(argv[optind], param); @@ -1443,7 +2730,7 @@ static int lfs_tgts(int argc, char **argv) memset(¶m, 0, sizeof(param)); if (!strcmp(argv[0], "mdts")) - param.get_lmv = 1; + param.fp_get_lmv = 1; rc = llapi_ostlist(mntdir, ¶m); if (rc) { @@ -1461,6 +2748,8 @@ static int lfs_tgts(int argc, char **argv) static int lfs_getstripe(int argc, char **argv) { struct find_param param = { 0 }; + + param.fp_max_depth = 1; return lfs_getstripe_internal(argc, argv, ¶m); } @@ -1468,9 +2757,89 @@ static int lfs_getstripe(int argc, char **argv) static int lfs_getdirstripe(int argc, char **argv) { struct find_param param = { 0 }; + struct option long_opts[] = { +#if LUSTRE_VERSION_CODE < OBD_OCD_VERSION(3, 0, 53, 0) + {"mdt-count", no_argument, 0, 'c'}, +#endif + {"mdt-hash", no_argument, 0, 'H'}, + {"mdt-index", no_argument, 0, 'i'}, + {"recursive", no_argument, 0, 'r'}, +#if LUSTRE_VERSION_CODE < OBD_OCD_VERSION(3, 0, 53, 0) + {"mdt-hash", no_argument, 0, 't'}, +#endif + {"default", no_argument, 0, 'D'}, + {"obd", required_argument, 0, 'O'}, + {"mdt-count", no_argument, 0, 'T'}, + {"yaml", no_argument, 0, 'y'}, + {0, 0, 0, 0} + }; + int c, rc; - param.get_lmv = 1; - return lfs_getstripe_internal(argc, argv, ¶m); + param.fp_get_lmv = 1; + + while ((c = getopt_long(argc, argv, + "cDHiO:rtTy", long_opts, NULL)) != -1) + { + switch (c) { + case 'O': + if (param.fp_obd_uuid) { + fprintf(stderr, + "error: %s: only one obduuid allowed", + argv[0]); + return CMD_HELP; + } + param.fp_obd_uuid = (struct obd_uuid *)optarg; + break; +#if LUSTRE_VERSION_CODE < OBD_OCD_VERSION(3, 0, 53, 0) + case 'c': +#if LUSTRE_VERSION_CODE >= OBD_OCD_VERSION(2, 10, 50, 0) + fprintf(stderr, "warning: '-c' deprecated" + ", use '-T' instead\n"); +#endif +#endif + case 'T': + param.fp_verbose |= VERBOSE_COUNT; + break; + case 'i': + param.fp_verbose |= VERBOSE_OFFSET; + break; +#if LUSTRE_VERSION_CODE < OBD_OCD_VERSION(3, 0, 53, 0) + case 't': +#endif + case 'H': + param.fp_verbose |= VERBOSE_HASH_TYPE; + break; + case 'D': + param.fp_get_default_lmv = 1; + break; + case 'r': + param.fp_recursive = 1; + break; + case 'y': + param.fp_yaml = 1; + break; + default: + return CMD_HELP; + } + } + + if (optind >= argc) + return CMD_HELP; + + if (param.fp_recursive) + param.fp_max_depth = -1; + + if (!param.fp_verbose) + param.fp_verbose = VERBOSE_DEFAULT; + + do { + rc = llapi_getstripe(argv[optind], ¶m); + } while (++optind < argc && !rc); + + if (rc) + fprintf(stderr, "error: %s failed for %s.\n", + argv[0], argv[optind - 1]); + return rc; } /* functions */ @@ -1487,40 +2856,76 @@ static int lfs_setdirstripe(int argc, char **argv) char *stripe_count_opt = NULL; char *stripe_hash_opt = NULL; char *mode_opt = NULL; - int default_stripe = 0; + bool default_stripe = false; mode_t mode = S_IRWXU | S_IRWXG | S_IRWXO; mode_t previous_mode = 0; + bool delete = false; - struct option long_opts[] = { - {"count", required_argument, 0, 'c'}, - {"index", required_argument, 0, 'i'}, - {"mode", required_argument, 0, 'm'}, - {"hash-type", required_argument, 0, 't'}, - {"default_stripe", no_argument, 0, 'D'}, - {0, 0, 0, 0} - }; - - optind = 0; + struct option long_opts[] = { +#if LUSTRE_VERSION_CODE < OBD_OCD_VERSION(3, 0, 53, 0) + { .val = 'c', .name = "count", .has_arg = required_argument }, +#endif + { .val = 'c', .name = "mdt-count", .has_arg = required_argument }, + { .val = 'd', .name = "delete", .has_arg = no_argument }, +#if LUSTRE_VERSION_CODE < OBD_OCD_VERSION(3, 0, 53, 0) + { .val = 'i', .name = "index", .has_arg = required_argument }, +#endif + { .val = 'i', .name = "mdt-index", .has_arg = required_argument }, + { .val = 'm', .name = "mode", .has_arg = required_argument }, +#if LUSTRE_VERSION_CODE < OBD_OCD_VERSION(3, 0, 53, 0) + { .val = 't', .name = "hash-type", .has_arg = required_argument }, + { .val = 't', .name = "mdt-hash", .has_arg = required_argument }, +#endif + {"mdt-hash", required_argument, 0, 'H'}, +#if LUSTRE_VERSION_CODE < OBD_OCD_VERSION(3, 0, 53, 0) + { .val = 'D', .name = "default_stripe", + .has_arg = no_argument }, +#endif + { .val = 'D', .name = "default", .has_arg = no_argument }, + { .name = NULL } }; - while ((c = getopt_long(argc, argv, "c:Di:m:t:", long_opts, + while ((c = getopt_long(argc, argv, "c:dDi:H:m:t:", long_opts, NULL)) >= 0) { switch (c) { case 0: /* Long options. */ break; case 'c': +#if LUSTRE_VERSION_CODE >= OBD_OCD_VERSION(2, 11, 53, 0) + if (strcmp(argv[optind - 1], "--count") == 0) + fprintf(stderr, "warning: '--count' deprecated" + ", use '--mdt-count' instead\n"); +#endif stripe_count_opt = optarg; break; + case 'd': + delete = true; + default_stripe = true; + break; case 'D': - default_stripe = 1; + default_stripe = true; break; case 'i': +#if LUSTRE_VERSION_CODE >= OBD_OCD_VERSION(2, 11, 53, 0) + if (strcmp(argv[optind - 1], "--index") == 0) + fprintf(stderr, "warning: '--index' deprecated" + ", use '--mdt-index' instead\n"); +#endif stripe_offset_opt = optarg; break; case 'm': mode_opt = optarg; break; +#if LUSTRE_VERSION_CODE < OBD_OCD_VERSION(3, 0, 53, 0) case 't': +#endif + case 'H': +#if LUSTRE_VERSION_CODE >= OBD_OCD_VERSION(2, 11, 53, 0) + if (strcmp(argv[optind - 1], "--hash-type") == 0) + fprintf(stderr, "warning: '--hash-type' " + "deprecated, use '--mdt-hash' " + "instead\n"); +#endif stripe_hash_opt = optarg; break; default: @@ -1537,7 +2942,7 @@ static int lfs_setdirstripe(int argc, char **argv) return CMD_HELP; } - if (stripe_offset_opt == NULL && stripe_count_opt == NULL) { + if (!delete && stripe_offset_opt == NULL && stripe_count_opt == NULL) { fprintf(stderr, "error: %s: missing stripe offset and count.\n", argv[0]); return CMD_HELP; @@ -1553,6 +2958,17 @@ static int lfs_setdirstripe(int argc, char **argv) } } + if (delete) { + if (stripe_offset_opt != NULL || stripe_count_opt != NULL) { + fprintf(stderr, "error: %s: cannot specify -d with -s," + " or -i options.\n", argv[0]); + return CMD_HELP; + } else { + stripe_count = 0; + } + } + + if (mode_opt != NULL) { mode = strtoul(mode_opt, &end, 8); if (*end != '\0') { @@ -1563,15 +2979,16 @@ static int lfs_setdirstripe(int argc, char **argv) previous_mode = umask(0); } - if (stripe_hash_opt == NULL || - strcmp(stripe_hash_opt, LMV_HASH_NAME_FNV_1A_64) == 0) { + if (stripe_hash_opt == NULL) { hash_type = LMV_HASH_TYPE_FNV_1A_64; - } else if (strcmp(stripe_hash_opt, LMV_HASH_NAME_ALL_CHARS) == 0) { - hash_type = LMV_HASH_TYPE_ALL_CHARS; } else { - fprintf(stderr, "error: %s: bad stripe hash type '%s'\n", - argv[0], stripe_hash_opt); - return CMD_HELP; + hash_type = check_hashtype(stripe_hash_opt); + if (hash_type == 0) { + fprintf(stderr, + "error: %s: bad stripe hash type '%s'\n", + argv[0], stripe_hash_opt); + return CMD_HELP; + } } /* get the stripe count */ @@ -1586,7 +3003,7 @@ static int lfs_setdirstripe(int argc, char **argv) dname = argv[optind]; do { - if (default_stripe == 1) { + if (default_stripe) { result = llapi_dir_set_default_lmv_stripe(dname, stripe_offset, stripe_count, hash_type, NULL); @@ -1642,21 +3059,20 @@ static int lfs_mv(int argc, char **argv) { struct find_param param = { .fp_max_depth = -1, - .mdtindex = -1, + .fp_mdt_index = -1, }; char *end; int c; int rc = 0; struct option long_opts[] = { - {"--mdt-index", required_argument, 0, 'M'}, - {"verbose", no_argument, 0, 'v'}, - {0, 0, 0, 0} - }; + { .val = 'M', .name = "mdt-index", .has_arg = required_argument }, + { .val = 'v', .name = "verbose", .has_arg = no_argument }, + { .name = NULL } }; while ((c = getopt_long(argc, argv, "M:v", long_opts, NULL)) != -1) { switch (c) { case 'M': { - param.mdtindex = strtoul(optarg, &end, 0); + param.fp_mdt_index = strtoul(optarg, &end, 0); if (*end != '\0') { fprintf(stderr, "%s: invalid MDT index'%s'\n", argv[0], optarg); @@ -1665,7 +3081,7 @@ static int lfs_mv(int argc, char **argv) break; } case 'v': { - param.verbose = VERBOSE_DETAIL; + param.fp_verbose = VERBOSE_DETAIL; break; } default: @@ -1675,21 +3091,22 @@ static int lfs_mv(int argc, char **argv) } } - if (param.mdtindex == -1) { - fprintf(stderr, "%s MDT index must be indicated\n", argv[0]); + if (param.fp_mdt_index == -1) { + fprintf(stderr, "%s: MDT index must be specified\n", argv[0]); return CMD_HELP; } if (optind >= argc) { - fprintf(stderr, "%s missing operand path\n", argv[0]); + fprintf(stderr, "%s: missing operand path\n", argv[0]); return CMD_HELP; } - param.migrate = 1; - rc = llapi_mv(argv[optind], ¶m); + param.fp_migrate = 1; + rc = llapi_migrate_mdt(argv[optind], ¶m); if (rc != 0) - fprintf(stderr, "cannot migrate '%s' to MDT%04x: %s\n", - argv[optind], param.mdtindex, strerror(-rc)); + fprintf(stderr, "%s: cannot migrate '%s' to MDT%04x: %s\n", + argv[0], argv[optind], param.fp_mdt_index, + strerror(-rc)); return rc; } @@ -1719,85 +3136,116 @@ static int lfs_mdts(int argc, char **argv) #define RSF "%4s" #define RDF "%3d%%" +enum mntdf_flags { + MNTDF_INODES = 0x0001, + MNTDF_COOKED = 0x0002, + MNTDF_LAZY = 0x0004, + MNTDF_VERBOSE = 0x0008, +}; + static int showdf(char *mntdir, struct obd_statfs *stat, - char *uuid, int ishow, int cooked, - char *type, int index, int rc) -{ - long long avail, used, total; - double ratio = 0; - char *suffix = "KMGTPEZY"; - /* Note if we have >2^64 bytes/fs these buffers will need to be grown */ - char tbuf[20], ubuf[20], abuf[20], rbuf[20]; - - if (!uuid || !stat) - return -EINVAL; - - switch (rc) { - case 0: - if (ishow) { - avail = stat->os_ffree; - used = stat->os_files - stat->os_ffree; - total = stat->os_files; - } else { - int shift = cooked ? 0 : 10; - - avail = (stat->os_bavail * stat->os_bsize) >> shift; - used = ((stat->os_blocks - stat->os_bfree) * - stat->os_bsize) >> shift; - total = (stat->os_blocks * stat->os_bsize) >> shift; - } + char *uuid, enum mntdf_flags flags, + char *type, int index, int rc) +{ + long long avail, used, total; + double ratio = 0; + char *suffix = "KMGTPEZY"; + /* Note if we have >2^64 bytes/fs these buffers will need to be grown */ + char tbuf[3 * sizeof(__u64)]; + char ubuf[3 * sizeof(__u64)]; + char abuf[3 * sizeof(__u64)]; + char rbuf[3 * sizeof(__u64)]; + + if (!uuid || !stat) + return -EINVAL; - if ((used + avail) > 0) - ratio = (double)used / (double)(used + avail); - - if (cooked) { - int i; - double cook_val; - - cook_val = (double)total; - i = COOK(cook_val); - if (i > 0) - sprintf(tbuf, HDF, cook_val, suffix[i - 1]); - else - sprintf(tbuf, CDF, total); - - cook_val = (double)used; - i = COOK(cook_val); - if (i > 0) - sprintf(ubuf, HDF, cook_val, suffix[i - 1]); - else - sprintf(ubuf, CDF, used); - - cook_val = (double)avail; - i = COOK(cook_val); - if (i > 0) - sprintf(abuf, HDF, cook_val, suffix[i - 1]); - else - sprintf(abuf, CDF, avail); - } else { - sprintf(tbuf, CDF, total); - sprintf(ubuf, CDF, used); - sprintf(abuf, CDF, avail); - } + switch (rc) { + case 0: + if (flags & MNTDF_INODES) { + avail = stat->os_ffree; + used = stat->os_files - stat->os_ffree; + total = stat->os_files; + } else { + int shift = flags & MNTDF_COOKED ? 0 : 10; - sprintf(rbuf, RDF, (int)(ratio * 100 + 0.5)); - printf(UUF" "CSF" "CSF" "CSF" "RSF" %-s", - uuid, tbuf, ubuf, abuf, rbuf, mntdir); - if (type) - printf("[%s:%d]\n", type, index); - else - printf("\n"); - - break; - case -ENODATA: - printf(UUF": inactive device\n", uuid); - break; - default: - printf(UUF": %s\n", uuid, strerror(-rc)); - break; - } + avail = (stat->os_bavail * stat->os_bsize) >> shift; + used = ((stat->os_blocks - stat->os_bfree) * + stat->os_bsize) >> shift; + total = (stat->os_blocks * stat->os_bsize) >> shift; + } - return 0; + if ((used + avail) > 0) + ratio = (double)used / (double)(used + avail); + + if (flags & MNTDF_COOKED) { + int i; + double cook_val; + + cook_val = (double)total; + i = COOK(cook_val); + if (i > 0) + snprintf(tbuf, sizeof(tbuf), HDF, cook_val, + suffix[i - 1]); + else + snprintf(tbuf, sizeof(tbuf), CDF, total); + + cook_val = (double)used; + i = COOK(cook_val); + if (i > 0) + snprintf(ubuf, sizeof(ubuf), HDF, cook_val, + suffix[i - 1]); + else + snprintf(ubuf, sizeof(ubuf), CDF, used); + + cook_val = (double)avail; + i = COOK(cook_val); + if (i > 0) + snprintf(abuf, sizeof(abuf), HDF, cook_val, + suffix[i - 1]); + else + snprintf(abuf, sizeof(abuf), CDF, avail); + } else { + snprintf(tbuf, sizeof(tbuf), CDF, total); + snprintf(ubuf, sizeof(tbuf), CDF, used); + snprintf(abuf, sizeof(tbuf), CDF, avail); + } + + sprintf(rbuf, RDF, (int)(ratio * 100 + 0.5)); + printf(UUF" "CSF" "CSF" "CSF" "RSF" %-s", + uuid, tbuf, ubuf, abuf, rbuf, mntdir); + if (type) + printf("[%s:%d]", type, index); + + if (stat->os_state) { + /* + * Each character represents the matching + * OS_STATE_* bit. + */ + const char state_names[] = "DRSI"; + __u32 state; + __u32 i; + + printf(" "); + for (i = 0, state = stat->os_state; + state && i < sizeof(state_names); i++) { + if (!(state & (1 << i))) + continue; + printf("%c", state_names[i]); + state ^= 1 << i; + } + } + + printf("\n"); + break; + case -ENODATA: + printf(UUF": inactive device\n", uuid); + break; + default: + printf(UUF": %s\n", uuid, strerror(-rc)); + break; + } + + return 0; } struct ll_stat_type { @@ -1805,73 +3253,92 @@ struct ll_stat_type { char *st_name; }; -static int mntdf(char *mntdir, char *fsname, char *pool, int ishow, - int cooked, int lazy) +static int mntdf(char *mntdir, char *fsname, char *pool, enum mntdf_flags flags) { struct obd_statfs stat_buf, sum = { .os_bsize = 1 }; struct obd_uuid uuid_buf; char *poolname = NULL; - struct ll_stat_type types[] = { { LL_STATFS_LMV, "MDT" }, - { LL_STATFS_LOV, "OST" }, - { 0, NULL } }; + struct ll_stat_type types[] = { + { .st_op = LL_STATFS_LMV, .st_name = "MDT" }, + { .st_op = LL_STATFS_LOV, .st_name = "OST" }, + { .st_name = NULL } }; struct ll_stat_type *tp; __u64 ost_ffree = 0; __u32 index; __u32 type; - int rc; + int fd; + int rc = 0; + int rc2; + + if (pool) { + poolname = strchr(pool, '.'); + if (poolname != NULL) { + if (strncmp(fsname, pool, strlen(fsname))) { + fprintf(stderr, "filesystem name incorrect\n"); + return -ENODEV; + } + poolname++; + } else + poolname = pool; + } - if (pool) { - poolname = strchr(pool, '.'); - if (poolname != NULL) { - if (strncmp(fsname, pool, strlen(fsname))) { - fprintf(stderr, "filesystem name incorrect\n"); - return -ENODEV; - } - poolname++; - } else - poolname = pool; - } + fd = open(mntdir, O_RDONLY); + if (fd < 0) { + rc = -errno; + fprintf(stderr, "%s: cannot open '%s': %s\n", progname, mntdir, + strerror(errno)); + return rc; + } - if (ishow) - printf(UUF" "CSF" "CSF" "CSF" "RSF" %-s\n", - "UUID", "Inodes", "IUsed", "IFree", - "IUse%", "Mounted on"); - else - printf(UUF" "CSF" "CSF" "CSF" "RSF" %-s\n", - "UUID", cooked ? "bytes" : "1K-blocks", - "Used", "Available", "Use%", "Mounted on"); - - for (tp = types; tp->st_name != NULL; tp++) { - for (index = 0; ; index++) { - memset(&stat_buf, 0, sizeof(struct obd_statfs)); - memset(&uuid_buf, 0, sizeof(struct obd_uuid)); - type = lazy ? tp->st_op | LL_STATFS_NODELAY : tp->st_op; - rc = llapi_obd_statfs(mntdir, type, index, - &stat_buf, &uuid_buf); - if (rc == -ENODEV) - break; + if (flags & MNTDF_INODES) + printf(UUF" "CSF" "CSF" "CSF" "RSF" %-s\n", + "UUID", "Inodes", "IUsed", "IFree", + "IUse%", "Mounted on"); + else + printf(UUF" "CSF" "CSF" "CSF" "RSF" %-s\n", + "UUID", flags & MNTDF_COOKED ? "bytes" : "1K-blocks", + "Used", "Available", "Use%", "Mounted on"); + + for (tp = types; tp->st_name != NULL; tp++) { + for (index = 0; ; index++) { + memset(&stat_buf, 0, sizeof(struct obd_statfs)); + memset(&uuid_buf, 0, sizeof(struct obd_uuid)); + type = flags & MNTDF_LAZY ? + tp->st_op | LL_STATFS_NODELAY : tp->st_op; + rc2 = llapi_obd_fstatfs(fd, type, index, + &stat_buf, &uuid_buf); + if (rc2 == -ENODEV) + break; + if (rc2 == -EAGAIN) + continue; + if (rc2 == -ENODATA) { /* Inactive device, OK. */ + if (!(flags & MNTDF_VERBOSE)) + continue; + } else if (rc2 < 0 && rc == 0) { + rc = rc2; + } - if (poolname && tp->st_op == LL_STATFS_LOV && - llapi_search_ost(fsname, poolname, - obd_uuid2str(&uuid_buf)) != 1) - continue; - - /* the llapi_obd_statfs() call may have returned with - * an error, but if it filled in uuid_buf we will at - * lease use that to print out a message for that OBD. - * If we didn't get anything in the uuid_buf, then fill - * it in so that we can print an error message. */ - if (uuid_buf.uuid[0] == '\0') - sprintf(uuid_buf.uuid, "%s%04x", - tp->st_name, index); - showdf(mntdir, &stat_buf, obd_uuid2str(&uuid_buf), - ishow, cooked, tp->st_name, index, rc); - - if (rc == 0) { - if (tp->st_op == LL_STATFS_LMV) { - sum.os_ffree += stat_buf.os_ffree; - sum.os_files += stat_buf.os_files; - } else /* if (tp->st_op == LL_STATFS_LOV) */ { + if (poolname && tp->st_op == LL_STATFS_LOV && + llapi_search_ost(fsname, poolname, + obd_uuid2str(&uuid_buf)) != 1) + continue; + + /* the llapi_obd_statfs() call may have returned with + * an error, but if it filled in uuid_buf we will at + * lease use that to print out a message for that OBD. + * If we didn't get anything in the uuid_buf, then fill + * it in so that we can print an error message. */ + if (uuid_buf.uuid[0] == '\0') + snprintf(uuid_buf.uuid, sizeof(uuid_buf.uuid), + "%s%04x", tp->st_name, index); + showdf(mntdir, &stat_buf, obd_uuid2str(&uuid_buf), + flags, tp->st_name, index, rc2); + + if (rc2 == 0) { + if (tp->st_op == LL_STATFS_LMV) { + sum.os_ffree += stat_buf.os_ffree; + sum.os_files += stat_buf.os_files; + } else /* if (tp->st_op == LL_STATFS_LOV) */ { sum.os_blocks += stat_buf.os_blocks * stat_buf.os_bsize; sum.os_bfree += stat_buf.os_bfree * @@ -1880,12 +3347,12 @@ static int mntdf(char *mntdir, char *fsname, char *pool, int ishow, stat_buf.os_bsize; ost_ffree += stat_buf.os_ffree; } - } else if (rc == -EINVAL || rc == -EFAULT) { - break; } } } + close(fd); + /* If we don't have as many objects free on the OST as inodes * on the MDS, we reduce the total number of inodes to * compensate, so that the "inodes in use" number is correct. @@ -1895,63 +3362,68 @@ static int mntdf(char *mntdir, char *fsname, char *pool, int ishow, sum.os_ffree = ost_ffree; } printf("\n"); - showdf(mntdir, &sum, "filesystem summary:", ishow, cooked, NULL, 0, 0); + showdf(mntdir, &sum, "filesystem_summary:", flags, NULL, 0, 0); printf("\n"); - return 0; + + return rc; } static int lfs_df(int argc, char **argv) { - char mntdir[PATH_MAX] = {'\0'}, path[PATH_MAX] = {'\0'}; - int ishow = 0, cooked = 0; - int lazy = 0; - int c, rc = 0, index = 0; - char fsname[PATH_MAX] = "", *pool_name = NULL; - struct option long_opts[] = { - {"pool", required_argument, 0, 'p'}, - {"lazy", 0, 0, 'l'}, - {0, 0, 0, 0} - }; - - optind = 0; - while ((c = getopt_long(argc, argv, "hilp:", long_opts, NULL)) != -1) { + char mntdir[PATH_MAX] = {'\0'}, path[PATH_MAX] = {'\0'}; + enum mntdf_flags flags = 0; + int c, rc = 0, index = 0; + char fsname[PATH_MAX] = "", *pool_name = NULL; + struct option long_opts[] = { + { .val = 'h', .name = "human-readable", + .has_arg = no_argument }, + { .val = 'i', .name = "inodes", .has_arg = no_argument }, + { .val = 'l', .name = "lazy", .has_arg = no_argument }, + { .val = 'p', .name = "pool", .has_arg = required_argument }, + { .val = 'v', .name = "verbose", .has_arg = no_argument }, + { .name = NULL} }; + + while ((c = getopt_long(argc, argv, "hilp:v", long_opts, NULL)) != -1) { switch (c) { - case 'i': - ishow = 1; - break; case 'h': - cooked = 1; + flags |= MNTDF_COOKED; + break; + case 'i': + flags |= MNTDF_INODES; break; case 'l': - lazy = 1; + flags |= MNTDF_LAZY; break; case 'p': pool_name = optarg; break; + case 'v': + flags |= MNTDF_VERBOSE; + break; default: return CMD_HELP; } } - if (optind < argc && !realpath(argv[optind], path)) { - rc = -errno; - fprintf(stderr, "error: invalid path '%s': %s\n", - argv[optind], strerror(-rc)); - return rc; - } + if (optind < argc && !realpath(argv[optind], path)) { + rc = -errno; + fprintf(stderr, "error: invalid path '%s': %s\n", + argv[optind], strerror(-rc)); + return rc; + } - while (!llapi_search_mounts(path, index++, mntdir, fsname)) { - /* Check if we have a mount point */ - if (mntdir[0] == '\0') - continue; + while (!llapi_search_mounts(path, index++, mntdir, fsname)) { + /* Check if we have a mount point */ + if (mntdir[0] == '\0') + continue; - rc = mntdf(mntdir, fsname, pool_name, ishow, cooked, lazy); - if (rc || path[0] != '\0') - break; - fsname[0] = '\0'; /* avoid matching in next loop */ - mntdir[0] = '\0'; /* avoid matching in next loop */ - } + rc = mntdf(mntdir, fsname, pool_name, flags); + if (rc || path[0] != '\0') + break; + fsname[0] = '\0'; /* avoid matching in next loop */ + mntdir[0] = '\0'; /* avoid matching in next loop */ + } - return rc; + return rc; } static int lfs_getname(int argc, char **argv) @@ -1960,7 +3432,6 @@ static int lfs_getname(int argc, char **argv) int rc = 0, index = 0, c; char buf[sizeof(struct obd_uuid)]; - optind = 0; while ((c = getopt(argc, argv, "h")) != -1) return CMD_HELP; @@ -2029,9 +3500,7 @@ static int lfs_check(int argc, char **argv) return rc; } - rc = llapi_target_iterate(num_types, obd_types, - mntdir, llapi_ping_target); - + rc = llapi_target_check(num_types, obd_types, mntdir); if (rc) fprintf(stderr, "error: %s: %s status failed\n", argv[0],argv[1]); @@ -2040,217 +3509,7 @@ static int lfs_check(int argc, char **argv) } -static int lfs_join(int argc, char **argv) -{ - fprintf(stderr, "join two lustre files into one.\n" - "obsolete, HEAD does not support it anymore.\n"); - return 0; -} - #ifdef HAVE_SYS_QUOTA_H -static int lfs_quotacheck(int argc, char **argv) -{ - int c, check_type = 0; - char *mnt; - struct if_quotacheck qchk; - struct if_quotactl qctl; - char *obd_type = (char *)qchk.obd_type; - int rc; - - memset(&qchk, 0, sizeof(qchk)); - - optind = 0; - while ((c = getopt(argc, argv, "gu")) != -1) { - switch (c) { - case 'u': - check_type |= 0x01; - break; - case 'g': - check_type |= 0x02; - break; - default: - fprintf(stderr, "error: %s: option '-%c' " - "unrecognized\n", argv[0], c); - return CMD_HELP; - } - } - - if (check_type) - check_type--; - else /* do quotacheck for both user & group quota by default */ - check_type = 0x02; - - if (argc == optind) - return CMD_HELP; - - mnt = argv[optind]; - - rc = llapi_quotacheck(mnt, check_type); - if (rc == -EOPNOTSUPP) { - fprintf(stderr, "error: quotacheck not supported by the quota " - "master.\nPlease note that quotacheck is deprecated as " - "of lustre 2.4.0 since space accounting is always " - "enabled.\nFilesystems not formatted with 2.4 utils or " - "beyond can be upgraded with tunefs.lustre --quota.\n"); - return rc; - } else if (rc) { - fprintf(stderr, "quotacheck failed: %s\n", strerror(-rc)); - return rc; - } - - rc = llapi_poll_quotacheck(mnt, &qchk); - if (rc) { - if (*obd_type) - fprintf(stderr, "%s %s ", obd_type, - obd_uuid2str(&qchk.obd_uuid)); - fprintf(stderr, "quota check failed: %s\n", strerror(-rc)); - return rc; - } - - memset(&qctl, 0, sizeof(qctl)); - qctl.qc_cmd = LUSTRE_Q_QUOTAON; - qctl.qc_type = check_type; - rc = llapi_quotactl(mnt, &qctl); - if (rc && rc != -EALREADY) { - if (*obd_type) - fprintf(stderr, "%s %s ", (char *)qctl.obd_type, - obd_uuid2str(&qctl.obd_uuid)); - fprintf(stderr, "%s turn on quota failed: %s\n", - argv[0], strerror(-rc)); - return rc; - } - - return 0; -} - -static int lfs_quotaon(int argc, char **argv) -{ - int c; - char *mnt; - struct if_quotactl qctl; - char *obd_type = (char *)qctl.obd_type; - int rc; - - memset(&qctl, 0, sizeof(qctl)); - qctl.qc_cmd = LUSTRE_Q_QUOTAON; - - optind = 0; - while ((c = getopt(argc, argv, "fgu")) != -1) { - switch (c) { - case 'u': - qctl.qc_type |= 0x01; - break; - case 'g': - qctl.qc_type |= 0x02; - break; - case 'f': - qctl.qc_cmd = LUSTRE_Q_QUOTAOFF; - break; - default: - fprintf(stderr, "error: %s: option '-%c' " - "unrecognized\n", argv[0], c); - return CMD_HELP; - } - } - - if (qctl.qc_type) - qctl.qc_type--; - else /* by default, enable quota for both user & group */ - qctl.qc_type = 0x02; - - if (argc == optind) - return CMD_HELP; - - mnt = argv[optind]; - - rc = llapi_quotactl(mnt, &qctl); - if (rc) { - if (rc == -EOPNOTSUPP) { - fprintf(stderr, "error: quotaon not supported by the " - "quota master.\nPlease note that quotaon/off is" - " deprecated as of lustre 2.4.0.\nQuota " - "enforcement should now be enabled on the MGS " - "via:\nmgs# lctl conf_param ${FSNAME}.quota." - "=\n(ost for block quota, mdt " - "for inode quota, u for user and g for group" - "\n"); - } else if (rc == -EALREADY) { - rc = 0; - } else if (rc == -ENOENT) { - fprintf(stderr, "error: cannot find quota database, " - "make sure you have run quotacheck\n"); - } else { - if (*obd_type) - fprintf(stderr, "%s %s ", obd_type, - obd_uuid2str(&qctl.obd_uuid)); - fprintf(stderr, "%s failed: %s\n", argv[0], - strerror(-rc)); - } - } - - return rc; -} - -static int lfs_quotaoff(int argc, char **argv) -{ - int c; - char *mnt; - struct if_quotactl qctl; - char *obd_type = (char *)qctl.obd_type; - int rc; - - memset(&qctl, 0, sizeof(qctl)); - qctl.qc_cmd = LUSTRE_Q_QUOTAOFF; - - optind = 0; - while ((c = getopt(argc, argv, "gu")) != -1) { - switch (c) { - case 'u': - qctl.qc_type |= 0x01; - break; - case 'g': - qctl.qc_type |= 0x02; - break; - default: - fprintf(stderr, "error: %s: option '-%c' " - "unrecognized\n", argv[0], c); - return CMD_HELP; - } - } - - if (qctl.qc_type) - qctl.qc_type--; - else /* by default, disable quota for both user & group */ - qctl.qc_type = 0x02; - - if (argc == optind) - return CMD_HELP; - - mnt = argv[optind]; - - rc = llapi_quotactl(mnt, &qctl); - if (rc) { - if (rc == -EOPNOTSUPP) { - fprintf(stderr, "error: quotaoff not supported by the " - "quota master.\nPlease note that quotaon/off is" - " deprecated as of lustre 2.4.0.\nQuota " - "enforcement can be disabled on the MGS via:\n" - "mgs# lctl conf_param ${FSNAME}.quota." - "=\"\"\n"); - } else if (rc == -EALREADY) { - rc = 0; - } else { - if (*obd_type) - fprintf(stderr, "%s %s ", obd_type, - obd_uuid2str(&qctl.obd_uuid)); - fprintf(stderr, "quotaoff failed: %s\n", - strerror(-rc)); - } - } - - return rc; -} - #define ARG2INT(nr, str, msg) \ do { \ char *endp; \ @@ -2352,30 +3611,38 @@ int lfs_setquota_times(int argc, char **argv) struct obd_dqblk *dqb = &qctl.qc_dqblk; struct obd_dqinfo *dqi = &qctl.qc_dqinfo; struct option long_opts[] = { - {"block-grace", required_argument, 0, 'b'}, - {"group", no_argument, 0, 'g'}, - {"inode-grace", required_argument, 0, 'i'}, - {"times", no_argument, 0, 't'}, - {"user", no_argument, 0, 'u'}, - {0, 0, 0, 0} - }; - - memset(&qctl, 0, sizeof(qctl)); - qctl.qc_cmd = LUSTRE_Q_SETINFO; - qctl.qc_type = UGQUOTA; - - optind = 0; - while ((c = getopt_long(argc, argv, "b:gi:tu", long_opts, NULL)) != -1) { - switch (c) { - case 'u': - case 'g': - if (qctl.qc_type != UGQUOTA) { - fprintf(stderr, "error: -u and -g can't be used " + { .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 }, + { .name = NULL } }; + int qtype; + + memset(&qctl, 0, sizeof(qctl)); + qctl.qc_cmd = LUSTRE_Q_SETINFO; + qctl.qc_type = ALLQUOTA; + + while ((c = getopt_long(argc, argv, "b:gi:ptu", + long_opts, NULL)) != -1) { + switch (c) { + case 'u': + qtype = USRQUOTA; + goto quota_type; + case 'g': + qtype = GRPQUOTA; + goto quota_type; + case 'p': + qtype = PRJQUOTA; +quota_type: + if (qctl.qc_type != ALLQUOTA) { + fprintf(stderr, "error: -u/g/p can't be used " "more than once\n"); - return CMD_HELP; - } - qctl.qc_type = (c == 'u') ? USRQUOTA : GRPQUOTA; - break; + return CMD_HELP; + } + qctl.qc_type = qtype; + break; case 'b': if ((dqi->dqi_bgrace = str2sec(optarg)) == ULONG_MAX) { fprintf(stderr, "error: bad block-grace: %s\n", @@ -2399,8 +3666,8 @@ int lfs_setquota_times(int argc, char **argv) } } - if (qctl.qc_type == UGQUOTA) { - fprintf(stderr, "error: neither -u nor -g specified\n"); + if (qctl.qc_type == ALLQUOTA) { + fprintf(stderr, "error: neither -u, -g nor -p specified\n"); return CMD_HELP; } @@ -2440,46 +3707,56 @@ int lfs_setquota(int argc, char **argv) {"inode-softlimit", required_argument, 0, 'i'}, {"inode-hardlimit", required_argument, 0, 'I'}, {"user", required_argument, 0, 'u'}, + {"projid", required_argument, 0, 'p'}, {0, 0, 0, 0} }; unsigned limit_mask = 0; char *endptr; + int qtype; - if (has_times_option(argc, argv)) - return lfs_setquota_times(argc, argv); + if (has_times_option(argc, argv)) + return lfs_setquota_times(argc, argv); - memset(&qctl, 0, sizeof(qctl)); - qctl.qc_cmd = LUSTRE_Q_SETQUOTA; - qctl.qc_type = UGQUOTA; /* UGQUOTA makes no sense for setquota, - * so it can be used as a marker that qc_type - * isn't reinitialized from command line */ + memset(&qctl, 0, sizeof(qctl)); + qctl.qc_cmd = LUSTRE_Q_SETQUOTA; + qctl.qc_type = ALLQUOTA; /* ALLQUOTA makes no sense for setquota, + * so it can be used as a marker that qc_type + * isn't reinitialized from command line */ - optind = 0; - while ((c = getopt_long(argc, argv, "b:B:g:i:I:u:", long_opts, NULL)) != -1) { - switch (c) { - case 'u': + while ((c = getopt_long(argc, argv, "b:B:g:i:I:p:u:", + long_opts, NULL)) != -1) { + switch (c) { + case 'u': + qtype = USRQUOTA; + rc = name2uid(&qctl.qc_id, optarg); + goto quota_type; case 'g': - if (qctl.qc_type != UGQUOTA) { - fprintf(stderr, "error: -u and -g can't be used" - " more than once\n"); - return CMD_HELP; - } - qctl.qc_type = (c == 'u') ? USRQUOTA : GRPQUOTA; - rc = name2id(&qctl.qc_id, optarg, - (qctl.qc_type == USRQUOTA) ? USER : GROUP); - if (rc) { - qctl.qc_id = strtoul(optarg, &endptr, 10); - if (*endptr != '\0') { - fprintf(stderr, "error: can't find id " - "for name %s\n", optarg); - return CMD_HELP; - } + qtype = GRPQUOTA; + rc = name2gid(&qctl.qc_id, optarg); + goto quota_type; + case 'p': + qtype = PRJQUOTA; + rc = name2projid(&qctl.qc_id, optarg); +quota_type: + if (qctl.qc_type != ALLQUOTA) { + fprintf(stderr, "error: -u and -g can't be used" + " more than once\n"); + return CMD_HELP; } - break; + qctl.qc_type = qtype; + if (rc) { + qctl.qc_id = strtoul(optarg, &endptr, 10); + if (*endptr != '\0') { + fprintf(stderr, "error: can't find id " + "for name %s\n", optarg); + return CMD_HELP; + } + } + break; case 'b': - ARG2ULL(dqb->dqb_bsoftlimit, optarg, 1024); - dqb->dqb_bsoftlimit >>= 10; - limit_mask |= BSLIMIT; + ARG2ULL(dqb->dqb_bsoftlimit, optarg, 1024); + dqb->dqb_bsoftlimit >>= 10; + limit_mask |= BSLIMIT; if (dqb->dqb_bsoftlimit && dqb->dqb_bsoftlimit <= 1024) /* <= 1M? */ fprintf(stderr, "warning: block softlimit is " @@ -2519,14 +3796,14 @@ int lfs_setquota(int argc, char **argv) "Lustre manual for details.\n"); break; default: /* getopt prints error message for us when opterr != 0 */ - return CMD_HELP; - } - } + return CMD_HELP; + } + } - if (qctl.qc_type == UGQUOTA) { - fprintf(stderr, "error: neither -u nor -g was specified\n"); - return CMD_HELP; - } + if (qctl.qc_type == ALLQUOTA) { + fprintf(stderr, "error: neither -u, -g nor -p was specified\n"); + return CMD_HELP; + } if (limit_mask == 0) { fprintf(stderr, "error: at least one limit must be specified\n"); @@ -2591,16 +3868,6 @@ int lfs_setquota(int argc, char **argv) return 0; } -static inline char *type2name(int check_type) -{ - if (check_type == USRQUOTA) - return "user"; - else if (check_type == GRPQUOTA) - return "group"; - else - return "unknown"; -} - /* Converts seconds value into format string * result is returned in buf * Notes: @@ -2660,30 +3927,37 @@ static void print_quota_title(char *name, struct if_quotactl *qctl, bool human_readable) { printf("Disk quotas for %s %s (%cid %u):\n", - type2name(qctl->qc_type), name, - *type2name(qctl->qc_type), qctl->qc_id); + qtype_name(qctl->qc_type), name, + *qtype_name(qctl->qc_type), qctl->qc_id); printf("%15s%8s %7s%8s%8s%8s %7s%8s%8s\n", "Filesystem", human_readable ? "used" : "kbytes", "quota", "limit", "grace", "files", "quota", "limit", "grace"); } -static void kbytes2str(__u64 num, char *buf, bool h) +static void kbytes2str(__u64 num, char *buf, int buflen, bool h) { if (!h) { - sprintf(buf, LPU64, num); + snprintf(buf, buflen, "%ju", (uintmax_t)num); } else { - if (num >> 30) - sprintf(buf, "%5.4gT", (double)num / (1 << 30)); + if (num >> 40) + snprintf(buf, buflen, "%5.4gP", + (double)num / ((__u64)1 << 40)); + else if (num >> 30) + snprintf(buf, buflen, "%5.4gT", + (double)num / (1 << 30)); else if (num >> 20) - sprintf(buf, "%5.4gG", (double)num / (1 << 20)); + snprintf(buf, buflen, "%5.4gG", + (double)num / (1 << 20)); else if (num >> 10) - sprintf(buf, "%5.4gM", (double)num / (1 << 10)); + snprintf(buf, buflen, "%5.4gM", + (double)num / (1 << 10)); else - sprintf(buf, LPU64"%s", num, "k"); + snprintf(buf, buflen, "%ju%s", (uintmax_t)num, "k"); } } +#define STRBUF_LEN 32 static void print_quota(char *mnt, struct if_quotactl *qctl, int type, int rc, bool h) { @@ -2694,9 +3968,9 @@ static void print_quota(char *mnt, struct if_quotactl *qctl, int type, if (qctl->qc_cmd == LUSTRE_Q_GETQUOTA || qctl->qc_cmd == Q_GETOQUOTA) { int bover = 0, iover = 0; struct obd_dqblk *dqb = &qctl->qc_dqblk; - char numbuf[3][32]; + char numbuf[3][STRBUF_LEN]; char timebuf[40]; - char strbuf[32]; + char strbuf[STRBUF_LEN]; if (dqb->dqb_bhardlimit && lustre_stoqb(dqb->dqb_curspace) >= dqb->dqb_bhardlimit) { @@ -2729,21 +4003,22 @@ static void print_quota(char *mnt, struct if_quotactl *qctl, int type, if (bover) diff2str(dqb->dqb_btime, timebuf, now); - kbytes2str(lustre_stoqb(dqb->dqb_curspace), strbuf, h); + kbytes2str(lustre_stoqb(dqb->dqb_curspace), + strbuf, sizeof(strbuf), h); if (rc == -EREMOTEIO) sprintf(numbuf[0], "%s*", strbuf); else sprintf(numbuf[0], (dqb->dqb_valid & QIF_SPACE) ? "%s" : "[%s]", strbuf); - kbytes2str(dqb->dqb_bsoftlimit, strbuf, h); + kbytes2str(dqb->dqb_bsoftlimit, strbuf, sizeof(strbuf), h); if (type == QC_GENERAL) sprintf(numbuf[1], (dqb->dqb_valid & QIF_BLIMITS) ? "%s" : "[%s]", strbuf); else sprintf(numbuf[1], "%s", "-"); - kbytes2str(dqb->dqb_bhardlimit, strbuf, h); + kbytes2str(dqb->dqb_bhardlimit, strbuf, sizeof(strbuf), h); sprintf(numbuf[2], (dqb->dqb_valid & QIF_BLIMITS) ? "%s" : "[%s]", strbuf); @@ -2755,16 +4030,17 @@ static void print_quota(char *mnt, struct if_quotactl *qctl, int type, diff2str(dqb->dqb_itime, timebuf, now); sprintf(numbuf[0], (dqb->dqb_valid & QIF_INODES) ? - LPU64 : "["LPU64"]", dqb->dqb_curinodes); + "%ju" : "[%ju]", (uintmax_t)dqb->dqb_curinodes); if (type == QC_GENERAL) sprintf(numbuf[1], (dqb->dqb_valid & QIF_ILIMITS) ? - LPU64 : "["LPU64"]", dqb->dqb_isoftlimit); + "%ju" : "[%ju]", + (uintmax_t)dqb->dqb_isoftlimit); else sprintf(numbuf[1], "%s", "-"); sprintf(numbuf[2], (dqb->dqb_valid & QIF_ILIMITS) ? - LPU64 : "["LPU64"]", dqb->dqb_ihardlimit); + "%ju" : "[%ju]", (uintmax_t)dqb->dqb_ihardlimit); if (type != QC_OSTIDX) printf(" %7s%c %6s %7s %7s", @@ -2803,8 +4079,8 @@ static int print_obd_quota(char *mnt, struct if_quotactl *qctl, int is_mdt, qctl->qc_valid = is_mdt ? QC_MDTIDX : QC_OSTIDX; rc = llapi_quotactl(mnt, qctl); if (rc) { - /* It is remote client case. */ - if (-rc == EOPNOTSUPP) { + /* It is remote client case. */ + if (rc == -EOPNOTSUPP) { rc = 0; goto out; } @@ -2831,39 +4107,40 @@ 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 = UGQUOTA }; + .qc_type = ALLQUOTA }; char *obd_type = (char *)qctl.obd_type; char *obd_uuid = (char *)qctl.obd_uuid.uuid; - int rc, rc1 = 0, rc2 = 0, rc3 = 0, + int rc = 0, rc1 = 0, rc2 = 0, rc3 = 0, verbose = 0, pass = 0, quiet = 0, inacc; char *endptr; __u32 valid = QC_GENERAL, idx = 0; __u64 total_ialloc = 0, total_balloc = 0; bool human_readable = false; + int qtype; - optind = 0; - while ((c = getopt(argc, argv, "gi:I:o:qtuvh")) != -1) { - switch (c) { - case 'u': - if (qctl.qc_type != UGQUOTA) { - fprintf(stderr, "error: use either -u or -g\n"); - return CMD_HELP; - } - qctl.qc_type = USRQUOTA; - break; - case 'g': - if (qctl.qc_type != UGQUOTA) { - fprintf(stderr, "error: use either -u or -g\n"); - return CMD_HELP; - } - qctl.qc_type = GRPQUOTA; - break; + while ((c = getopt(argc, argv, "gi:I:o:pqtuvh")) != -1) { + switch (c) { + case 'u': + qtype = USRQUOTA; + goto quota_type; + case 'g': + qtype = GRPQUOTA; + goto quota_type; + case 'p': + qtype = PRJQUOTA; +quota_type: + if (qctl.qc_type != ALLQUOTA) { + fprintf(stderr, "error: use either -u or -g\n"); + return CMD_HELP; + } + qctl.qc_type = qtype; + break; case 't': qctl.qc_cmd = LUSTRE_Q_GETINFO; break; case 'o': valid = qctl.qc_valid = QC_UUID; - strncpy(obd_uuid, optarg, sizeof(qctl.obd_uuid)); + strlcpy(obd_uuid, optarg, sizeof(qctl.obd_uuid)); break; case 'i': valid = qctl.qc_valid = QC_MDTIDX; @@ -2890,67 +4167,85 @@ static int lfs_quota(int argc, char **argv) } /* current uid/gid info for "lfs quota /path/to/lustre/mount" */ - if (qctl.qc_cmd == LUSTRE_Q_GETQUOTA && qctl.qc_type == UGQUOTA && - optind == argc - 1) { -ug_output: - memset(&qctl, 0, sizeof(qctl)); /* spoiled by print_*_quota */ - qctl.qc_cmd = LUSTRE_Q_GETQUOTA; - qctl.qc_valid = valid; - qctl.qc_idx = idx; - if (pass++ == 0) { - qctl.qc_type = USRQUOTA; - qctl.qc_id = geteuid(); - } else { - qctl.qc_type = GRPQUOTA; - qctl.qc_id = getegid(); - } - rc = id2name(&name, qctl.qc_id, - (qctl.qc_type == USRQUOTA) ? USER : GROUP); - if (rc) - name = ""; - /* lfs quota -u username /path/to/lustre/mount */ - } else if (qctl.qc_cmd == LUSTRE_Q_GETQUOTA) { - /* options should be followed by u/g-name and mntpoint */ - if (optind + 2 != argc || qctl.qc_type == UGQUOTA) { - fprintf(stderr, "error: missing quota argument(s)\n"); - return CMD_HELP; - } - - name = argv[optind++]; - rc = name2id(&qctl.qc_id, name, - (qctl.qc_type == USRQUOTA) ? USER : GROUP); - if (rc) { - qctl.qc_id = strtoul(name, &endptr, 10); - if (*endptr != '\0') { - fprintf(stderr, "error: can't find id for name " - "%s\n", name); - return CMD_HELP; - } - } - } else if (optind + 1 != argc || qctl.qc_type == UGQUOTA) { - fprintf(stderr, "error: missing quota info argument(s)\n"); - return CMD_HELP; - } + if (qctl.qc_cmd == LUSTRE_Q_GETQUOTA && qctl.qc_type == ALLQUOTA && + optind == argc - 1) { +all_output: + memset(&qctl, 0, sizeof(qctl)); /* spoiled by print_*_quota */ + qctl.qc_cmd = LUSTRE_Q_GETQUOTA; + qctl.qc_valid = valid; + qctl.qc_idx = idx; + qctl.qc_type = pass; + switch (qctl.qc_type) { + case USRQUOTA: + qctl.qc_id = geteuid(); + rc = uid2name(&name, qctl.qc_id); + break; + case GRPQUOTA: + qctl.qc_id = getegid(); + rc = gid2name(&name, qctl.qc_id); + break; + default: + rc = -ENOTSUP; + break; + } + if (rc) + name = ""; + pass++; + /* lfs quota -u username /path/to/lustre/mount */ + } else if (qctl.qc_cmd == LUSTRE_Q_GETQUOTA) { + /* options should be followed by u/g-name and mntpoint */ + if (optind + 2 != argc || qctl.qc_type == ALLQUOTA) { + fprintf(stderr, "error: missing quota argument(s)\n"); + return CMD_HELP; + } - mnt = argv[optind]; + name = argv[optind++]; + switch (qctl.qc_type) { + case USRQUOTA: + rc = name2uid(&qctl.qc_id, name); + break; + case GRPQUOTA: + rc = name2gid(&qctl.qc_id, name); + break; + case PRJQUOTA: + rc = name2projid(&qctl.qc_id, name); + break; + default: + rc = -ENOTSUP; + break; + } + if (rc) { + qctl.qc_id = strtoul(name, &endptr, 10); + if (*endptr != '\0') { + fprintf(stderr, "error: can't find id for name: %s\n", + name); + return CMD_HELP; + } + } + } else if (optind + 1 != argc || qctl.qc_type == ALLQUOTA) { + fprintf(stderr, "error: missing quota info argument(s)\n"); + return CMD_HELP; + } - rc1 = llapi_quotactl(mnt, &qctl); - if (rc1 < 0) { - switch (rc1) { - case -ESRCH: - fprintf(stderr, "%s quotas are not enabled.\n", - qctl.qc_type == USRQUOTA ? "user" : "group"); - goto out; - case -EPERM: - fprintf(stderr, "Permission denied.\n"); - case -ENOENT: - /* We already got a "No such file..." message. */ - goto out; - default: - fprintf(stderr, "Unexpected quotactl error: %s\n", - strerror(-rc1)); - } - } + mnt = argv[optind]; + rc1 = llapi_quotactl(mnt, &qctl); + if (rc1 < 0) { + switch (rc1) { + case -ESRCH: + fprintf(stderr, "%s quotas are not enabled.\n", + qtype_name(qctl.qc_type)); + goto out; + case -EPERM: + fprintf(stderr, "Permission denied.\n"); + case -ENODEV: + case -ENOENT: + /* We already got error message. */ + goto out; + default: + fprintf(stderr, "Unexpected quotactl error: %s\n", + strerror(-rc1)); + } + } if (qctl.qc_cmd == LUSTRE_Q_GETQUOTA && !quiet) print_quota_title(name, &qctl, human_readable); @@ -2969,27 +4264,29 @@ ug_output: if (qctl.qc_valid == QC_GENERAL && qctl.qc_cmd != LUSTRE_Q_GETINFO && verbose) { - char strbuf[32]; + char strbuf[STRBUF_LEN]; rc2 = print_obd_quota(mnt, &qctl, 1, human_readable, &total_ialloc); rc3 = print_obd_quota(mnt, &qctl, 0, human_readable, &total_balloc); - kbytes2str(total_balloc, strbuf, human_readable); - printf("Total allocated inode limit: "LPU64", total " - "allocated block limit: %s\n", total_ialloc, strbuf); + kbytes2str(total_balloc, strbuf, sizeof(strbuf), + human_readable); + printf("Total allocated inode limit: %ju, total " + "allocated block limit: %s\n", (uintmax_t)total_ialloc, + strbuf); } - if (rc1 || rc2 || rc3 || inacc) - printf("Some errors happened when getting quota info. " - "Some devices may be not working or deactivated. " - "The data in \"[]\" is inaccurate.\n"); + if (rc1 || rc2 || rc3 || inacc) + printf("Some errors happened when getting quota info. " + "Some devices may be not working or deactivated. " + "The data in \"[]\" is inaccurate.\n"); out: - if (pass == 1) - goto ug_output; + if (pass > 0 && pass < LL_MAXQUOTAS) + goto all_output; - return rc1; + return rc1; } #endif /* HAVE_SYS_QUOTA_H! */ @@ -3015,12 +4312,11 @@ static int flushctx_ioctl(char *mp) static int lfs_flushctx(int argc, char **argv) { - int kdestroy = 0, c; - FILE *proc = NULL; - char procline[PATH_MAX], *line; - int rc = 0; + int kdestroy = 0, c; + char mntdir[PATH_MAX] = {'\0'}; + int index = 0; + int rc = 0; - optind = 0; while ((c = getopt(argc, argv, "k")) != -1) { switch (c) { case 'k': @@ -3034,46 +4330,24 @@ static int lfs_flushctx(int argc, char **argv) } if (kdestroy) { - int rc; if ((rc = system("kdestroy > /dev/null")) != 0) { rc = WEXITSTATUS(rc); fprintf(stderr, "error destroying tickets: %d, continuing\n", rc); } } - if (optind >= argc) { - /* flush for all mounted lustre fs. */ - proc = fopen("/proc/mounts", "r"); - if (!proc) { - fprintf(stderr, "error: %s: can't open /proc/mounts\n", - argv[0]); - return -1; - } - - while ((line = fgets(procline, PATH_MAX, proc)) != NULL) { - char dev[PATH_MAX]; - char mp[PATH_MAX]; - char fs[PATH_MAX]; + if (optind >= argc) { + /* flush for all mounted lustre fs. */ + while (!llapi_search_mounts(NULL, index++, mntdir, NULL)) { + /* Check if we have a mount point */ + if (mntdir[0] == '\0') + continue; - if (sscanf(line, "%s %s %s", dev, mp, fs) != 3) { - fprintf(stderr, "%s: unexpected format in " - "/proc/mounts\n", - argv[0]); + if (flushctx_ioctl(mntdir)) rc = -1; - goto out; - } - if (strcmp(fs, "lustre") != 0) - continue; - /* we use '@' to determine it's a client. are there - * any other better way? - */ - if (strchr(dev, '@') == NULL) - continue; - - if (flushctx_ioctl(mp)) - rc = -1; - } + mntdir[0] = '\0'; /* avoid matching in next loop */ + } } else { /* flush fs as specified */ while (optind < argc) { @@ -3081,51 +4355,27 @@ static int lfs_flushctx(int argc, char **argv) rc = -1; } } - -out: - if (proc != NULL) - fclose(proc); return rc; } -static int lfs_lsetfacl(int argc, char **argv) -{ - argv[0]++; - return(llapi_lsetfacl(argc, argv)); -} - -static int lfs_lgetfacl(int argc, char **argv) -{ - argv[0]++; - return(llapi_lgetfacl(argc, argv)); -} - -static int lfs_rsetfacl(int argc, char **argv) -{ - argv[0]++; - return(llapi_rsetfacl(argc, argv)); -} - -static int lfs_rgetfacl(int argc, char **argv) -{ - argv[0]++; - return(llapi_rgetfacl(argc, argv)); -} - static int lfs_cp(int argc, char **argv) { - return(llapi_cp(argc, argv)); + fprintf(stderr, "remote client copy file(s).\n" + "obsolete, does not support it anymore.\n"); + return 0; } static int lfs_ls(int argc, char **argv) { - return(llapi_ls(argc, argv)); + fprintf(stderr, "remote client lists directory contents.\n" + "obsolete, does not support it anymore.\n"); + return 0; } static int lfs_changelog(int argc, char **argv) { void *changelog_priv; - struct changelog_ext_rec *rec; + struct changelog_rec *rec; long long startrec = 0, endrec = 0; char *mdd; struct option long_opts[] = { @@ -3135,7 +4385,6 @@ static int lfs_changelog(int argc, char **argv) char short_opts[] = "f"; int rc, follow = 0; - optind = 0; while ((rc = getopt_long(argc, argv, short_opts, long_opts, NULL)) != -1) { switch (rc) { @@ -3159,51 +4408,66 @@ static int lfs_changelog(int argc, char **argv) if (argc > optind) endrec = strtoll(argv[optind++], NULL, 10); - rc = llapi_changelog_start(&changelog_priv, - CHANGELOG_FLAG_BLOCK | - (follow ? CHANGELOG_FLAG_FOLLOW : 0), - mdd, startrec); - if (rc < 0) { - fprintf(stderr, "Can't start changelog: %s\n", - strerror(errno = -rc)); - return rc; - } + rc = llapi_changelog_start(&changelog_priv, + CHANGELOG_FLAG_BLOCK | + CHANGELOG_FLAG_JOBID | + (follow ? CHANGELOG_FLAG_FOLLOW : 0), + mdd, startrec); + if (rc < 0) { + fprintf(stderr, "Can't start changelog: %s\n", + strerror(errno = -rc)); + return rc; + } - while ((rc = llapi_changelog_recv(changelog_priv, &rec)) == 0) { - time_t secs; - struct tm ts; + while ((rc = llapi_changelog_recv(changelog_priv, &rec)) == 0) { + time_t secs; + struct tm ts; - if (endrec && rec->cr_index > endrec) { - llapi_changelog_free(&rec); - break; - } - if (rec->cr_index < startrec) { - llapi_changelog_free(&rec); - continue; - } + if (endrec && rec->cr_index > endrec) { + llapi_changelog_free(&rec); + break; + } + if (rec->cr_index < startrec) { + llapi_changelog_free(&rec); + continue; + } - secs = rec->cr_time >> 30; - gmtime_r(&secs, &ts); - printf(LPU64" %02d%-5s %02d:%02d:%02d.%06d %04d.%02d.%02d " - "0x%x t="DFID, rec->cr_index, rec->cr_type, - changelog_type2str(rec->cr_type), - ts.tm_hour, ts.tm_min, ts.tm_sec, - (int)(rec->cr_time & ((1<<30) - 1)), - ts.tm_year + 1900, ts.tm_mon + 1, ts.tm_mday, - rec->cr_flags & CLF_FLAGMASK, PFID(&rec->cr_tfid)); - if (rec->cr_namelen) - /* namespace rec includes parent and filename */ - printf(" p="DFID" %.*s", PFID(&rec->cr_pfid), - rec->cr_namelen, rec->cr_name); + secs = rec->cr_time >> 30; + gmtime_r(&secs, &ts); + printf("%ju %02d%-5s %02d:%02d:%02d.%09d %04d.%02d.%02d " + "0x%x t="DFID, (uintmax_t)rec->cr_index, rec->cr_type, + changelog_type2str(rec->cr_type), + ts.tm_hour, ts.tm_min, ts.tm_sec, + (int)(rec->cr_time & ((1 << 30) - 1)), + ts.tm_year + 1900, ts.tm_mon + 1, ts.tm_mday, + rec->cr_flags & CLF_FLAGMASK, PFID(&rec->cr_tfid)); + + if (rec->cr_flags & CLF_JOBID) { + struct changelog_ext_jobid *jid = + changelog_rec_jobid(rec); + + if (jid->cr_jobid[0] != '\0') + printf(" j=%s", jid->cr_jobid); + } - if (!fid_is_zero(&rec->cr_sfid)) - printf(" s="DFID" sp="DFID" %.*s", - PFID(&rec->cr_sfid), PFID(&rec->cr_spfid), - changelog_rec_snamelen(rec), - changelog_rec_sname(rec)); + if (rec->cr_namelen) + printf(" p="DFID" %.*s", PFID(&rec->cr_pfid), + rec->cr_namelen, changelog_rec_name(rec)); + + if (rec->cr_flags & CLF_RENAME) { + struct changelog_ext_rename *rnm = + changelog_rec_rename(rec); + + if (!fid_is_zero(&rnm->cr_sfid)) + printf(" s="DFID" sp="DFID" %.*s", + PFID(&rnm->cr_sfid), + PFID(&rnm->cr_spfid), + (int)changelog_rec_snamelen(rec), + changelog_rec_sname(rec)); + } printf("\n"); - llapi_changelog_free(&rec); + llapi_changelog_free(&rec); } llapi_changelog_fini(&changelog_priv); @@ -3216,41 +4480,49 @@ static int lfs_changelog(int argc, char **argv) static int lfs_changelog_clear(int argc, char **argv) { - long long endrec; - int rc; + long long endrec; + int rc; - if (argc != 4) - return CMD_HELP; + if (argc != 4) + return CMD_HELP; - endrec = strtoll(argv[3], NULL, 10); + endrec = strtoll(argv[3], NULL, 10); - rc = llapi_changelog_clear(argv[1], argv[2], endrec); - if (rc) - fprintf(stderr, "%s error: %s\n", argv[0], - strerror(errno = -rc)); - return rc; + rc = llapi_changelog_clear(argv[1], argv[2], endrec); + + if (rc == -EINVAL) + fprintf(stderr, "%s: record out of range: %llu\n", + argv[0], endrec); + else if (rc == -ENOENT) + fprintf(stderr, "%s: no changelog user: %s\n", + argv[0], argv[2]); + else if (rc) + fprintf(stderr, "%s error: %s\n", argv[0], + strerror(-rc)); + + if (rc) + errno = -rc; + + return rc; } static int lfs_fid2path(int argc, char **argv) { - struct option long_opts[] = { - {"cur", no_argument, 0, 'c'}, - {"link", required_argument, 0, 'l'}, - {"rec", required_argument, 0, 'r'}, - {0, 0, 0, 0} - }; - char short_opts[] = "cl:r:"; - char *device, *fid, *path; - long long recno = -1; - int linkno = -1; - int lnktmp; - int printcur = 0; + struct option long_opts[] = { + { .val = 'c', .name = "cur", .has_arg = no_argument }, + { .val = 'l', .name = "link", .has_arg = required_argument }, + { .val = 'r', .name = "rec", .has_arg = required_argument }, + { .name = NULL } }; + char short_opts[] = "cl:r:"; + char *device, *fid, *path; + long long recno = -1; + int linkno = -1; + int lnktmp; + int printcur = 0; int rc = 0; - optind = 0; - - while ((rc = getopt_long(argc, argv, short_opts, - long_opts, NULL)) != -1) { + while ((rc = getopt_long(argc, argv, short_opts, + long_opts, NULL)) != -1) { switch (rc) { case 'c': printcur++; @@ -3275,6 +4547,10 @@ static int lfs_fid2path(int argc, char **argv) device = argv[optind++]; path = calloc(1, PATH_MAX); + if (path == NULL) { + fprintf(stderr, "error: Not enough memory\n"); + return -errno; + } rc = 0; while (optind < argc) { @@ -3321,33 +4597,73 @@ static int lfs_fid2path(int argc, char **argv) static int lfs_path2fid(int argc, char **argv) { - char **path; - const char *sep = ""; - lustre_fid fid; - int rc = 0; + struct option long_opts[] = { + { .val = 'p', .name = "parents", .has_arg = no_argument }, + { .name = NULL } }; + char **path; + const char short_opts[] = "p"; + const char *sep = ""; + lustre_fid fid; + int rc = 0; + bool show_parents = false; + + while ((rc = getopt_long(argc, argv, short_opts, + long_opts, NULL)) != -1) { + switch (rc) { + case 'p': + show_parents = true; + break; + default: + fprintf(stderr, "error: %s: option '%s' unrecognized\n", + argv[0], argv[optind - 1]); + return CMD_HELP; + } + } - if (argc < 2) + if (optind > argc - 1) return CMD_HELP; - else if (argc > 2) + else if (optind < argc - 1) sep = ": "; - path = argv + 1; - while (*path != NULL) { - int err = llapi_path2fid(*path, &fid); + rc = 0; + for (path = argv + optind; *path != NULL; path++) { + int err = 0; + if (!show_parents) { + err = llapi_path2fid(*path, &fid); + if (!err) + printf("%s%s"DFID"\n", + *sep != '\0' ? *path : "", sep, + PFID(&fid)); + } else { + char name[NAME_MAX + 1]; + unsigned int linkno = 0; + + while ((err = llapi_path2parent(*path, linkno, &fid, + name, sizeof(name))) == 0) { + if (*sep != '\0' && linkno == 0) + printf("%s%s", *path, sep); + + printf("%s"DFID"/%s", linkno != 0 ? "\t" : "", + PFID(&fid), name); + linkno++; + } + + /* err == -ENODATA is end-of-loop */ + if (linkno > 0 && err == -ENODATA) { + printf("\n"); + err = 0; + } + } if (err) { - fprintf(stderr, "%s: can't get fid for %s: %s\n", - argv[0], *path, strerror(-err)); + fprintf(stderr, "%s: can't get %sfid for %s: %s\n", + argv[0], show_parents ? "parent " : "", *path, + strerror(-err)); if (rc == 0) { rc = err; errno = -err; } - goto out; } - printf("%s%s"DFID"\n", *sep != '\0' ? *path : "", sep, - PFID(&fid)); -out: - path++; } return rc; @@ -3365,7 +4681,6 @@ static int lfs_data_version(int argc, char **argv) if (argc < 2) return CMD_HELP; - optind = 0; while ((c = getopt(argc, argv, "nrw")) != -1) { switch (c) { case 'n': @@ -3393,7 +4708,7 @@ static int lfs_data_version(int argc, char **argv) if (rc < 0) err(errno, "cannot get version for %s", path); else - printf(LPU64 "\n", data_version); + printf("%ju" "\n", (uintmax_t)data_version); close(fd); return rc; @@ -3459,14 +4774,13 @@ static int lfs_hsm_state(int argc, char **argv) static int lfs_hsm_change_flags(int argc, char **argv, int mode) { struct option long_opts[] = { - {"lost", 0, 0, 'l'}, - {"norelease", 0, 0, 'r'}, - {"noarchive", 0, 0, 'a'}, - {"archived", 0, 0, 'A'}, - {"dirty", 0, 0, 'd'}, - {"exists", 0, 0, 'e'}, - {0, 0, 0, 0} - }; + { .val = 'A', .name = "archived", .has_arg = no_argument }, + { .val = 'a', .name = "noarchive", .has_arg = no_argument }, + { .val = 'd', .name = "dirty", .has_arg = no_argument }, + { .val = 'e', .name = "exists", .has_arg = no_argument }, + { .val = 'l', .name = "lost", .has_arg = no_argument }, + { .val = 'r', .name = "norelease", .has_arg = no_argument }, + { .name = NULL } }; char short_opts[] = "lraAde"; __u64 mask = 0; int c, rc; @@ -3475,7 +4789,6 @@ static int lfs_hsm_change_flags(int argc, char **argv, int mode) if (argc < 3) return CMD_HELP; - optind = 0; while ((c = getopt_long(argc, argv, short_opts, long_opts, NULL)) != -1) { switch (c) { @@ -3569,12 +4882,15 @@ static int lfs_hsm_action(int argc, char **argv) if ((hps == HPS_RUNNING) && (hua == HUA_ARCHIVE || hua == HUA_RESTORE)) - printf("("LPX64 " bytes moved)\n", he.length); + printf("(%llu bytes moved)\n", + (unsigned long long)he.length); else if ((he.offset + he.length) == LUSTRE_EOF) - printf("(from "LPX64 " to EOF)\n", he.offset); + printf("(from %llu to EOF)\n", + (unsigned long long)he.offset); else - printf("(from "LPX64 " to "LPX64")\n", - he.offset, he.offset + he.length); + printf("(from %llu to %llu)\n", + (unsigned long long)he.offset, + (unsigned long long)(he.offset + he.length)); } while (++i < argc); @@ -3600,7 +4916,7 @@ static int lfs_hsm_clear(int argc, char **argv) * * \return 0 on success. */ -static int lfs_hsm_prepare_file(char *file, struct lu_fid *fid, +static int lfs_hsm_prepare_file(const char *file, struct lu_fid *fid, dev_t *last_dev) { struct stat st; @@ -3611,6 +4927,13 @@ static int lfs_hsm_prepare_file(char *file, struct lu_fid *fid, fprintf(stderr, "Cannot stat %s: %s\n", file, strerror(errno)); return -errno; } + /* Checking for regular file as archiving as posix copytool + * rejects archiving files other than regular files + */ + if (!S_ISREG(st.st_mode)) { + fprintf(stderr, "error: \"%s\" is not a regular file\n", file); + return CMD_HELP; + } /* A request should be ... */ if (*last_dev != st.st_dev && *last_dev != 0) { fprintf(stderr, "All files should be " @@ -3628,16 +4951,62 @@ static int lfs_hsm_prepare_file(char *file, struct lu_fid *fid, return 0; } +/* Fill an HSM HUR item with a given file name. + * + * If mntpath is set, then the filename is actually a FID, and no + * lookup on the filesystem will be performed. + * + * \param[in] hur the user request to fill + * \param[in] idx index of the item inside the HUR to fill + * \param[in] mntpath mountpoint of Lustre + * \param[in] fname filename (if mtnpath is NULL) + * or FID (if mntpath is set) + * \param[in] last_dev pointer to last device id used + * + * \retval 0 on success + * \retval CMD_HELP or a negative errno on error + */ +static int fill_hur_item(struct hsm_user_request *hur, unsigned int idx, + const char *mntpath, const char *fname, + dev_t *last_dev) +{ + struct hsm_user_item *hui = &hur->hur_user_item[idx]; + int rc; + + 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 { + 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); + } + + if (rc == 0) + hur->hur_request.hr_itemcount++; + + return rc; +} + static int lfs_hsm_request(int argc, char **argv, int action) { struct option long_opts[] = { {"filelist", 1, 0, 'l'}, {"data", 1, 0, 'D'}, {"archive", 1, 0, 'a'}, + {"mntpath", 1, 0, 'm'}, {0, 0, 0, 0} }; dev_t last_dev = 0; - char short_opts[] = "l:D:a:"; + char short_opts[] = "l:D:a:m:"; struct hsm_user_request *hur, *oldhur; int c, i; size_t len; @@ -3650,13 +5019,13 @@ static int lfs_hsm_request(int argc, char **argv, int action) int archive_id = 0; FILE *fp; int nbfile_alloc = 0; - char some_file[PATH_MAX+1] = ""; + char *some_file = NULL; + char *mntpath = NULL; int rc; if (argc < 2) return CMD_HELP; - optind = 0; while ((c = getopt_long(argc, argv, short_opts, long_opts, NULL)) != -1) { switch (c) { @@ -3667,14 +5036,21 @@ static int lfs_hsm_request(int argc, char **argv, int action) opaque = optarg; break; case 'a': - if (action != HUA_ARCHIVE) { + if (action != HUA_ARCHIVE && + action != HUA_REMOVE) { fprintf(stderr, "error: -a is supported only " - "when archiving\n"); + "when archiving or removing\n"); return CMD_HELP; } archive_id = atoi(optarg); break; + case 'm': + if (some_file == NULL) { + mntpath = optarg; + some_file = strdup(optarg); + } + break; case '?': return CMD_HELP; default: @@ -3708,20 +5084,12 @@ static int lfs_hsm_request(int argc, char **argv, int action) hur->hur_request.hr_flags = 0; /* All remaining args are files, add them */ - if (nbfile != 0) { - if (strlen(argv[optind]) > sizeof(some_file)-1) { - free(hur); - return -E2BIG; - } - strncpy(some_file, argv[optind], sizeof(some_file)); - } + if (nbfile != 0 && some_file == NULL) + some_file = strdup(argv[optind]); for (i = 0; i < nbfile; i++) { - hur->hur_user_item[i].hui_extent.length = -1; - rc = lfs_hsm_prepare_file(argv[optind + i], - &hur->hur_user_item[i].hui_fid, - &last_dev); - hur->hur_request.hr_itemcount++; + rc = fill_hur_item(hur, i, mntpath, argv[optind + i], + &last_dev); if (rc) goto out_free; } @@ -3739,17 +5107,17 @@ static int lfs_hsm_request(int argc, char **argv, int action) } while ((rc = getline(&line, &len, fp)) != -1) { - struct hsm_user_item *hui; - - /* If allocated buffer was too small, gets something - * bigger */ + /* If allocated buffer was too small, get something + * larger */ if (nbfile_alloc <= hur->hur_request.hr_itemcount) { + ssize_t size; + nbfile_alloc = nbfile_alloc * 2 + 1; oldhur = hur; hur = llapi_hsm_user_request_alloc(nbfile_alloc, opaque_len); if (hur == NULL) { - fprintf(stderr, "Cannot allocate " + fprintf(stderr, "hsm: cannot allocate " "the request: %s\n", strerror(errno)); hur = oldhur; @@ -3757,7 +5125,19 @@ static int lfs_hsm_request(int argc, char **argv, int action) fclose(fp); goto out_free; } - memcpy(hur, oldhur, hur_len(oldhur)); + size = hur_len(oldhur); + if (size < 0) { + fprintf(stderr, "hsm: cannot allocate " + "%u files + %u bytes data\n", + oldhur->hur_request.hr_itemcount, + oldhur->hur_request.hr_data_len); + free(hur); + hur = oldhur; + rc = -E2BIG; + fclose(fp); + goto out_free; + } + memcpy(hur, oldhur, size); free(oldhur); } @@ -3765,25 +5145,21 @@ static int lfs_hsm_request(int argc, char **argv, int action) if (line[strlen(line) - 1] == '\n') line[strlen(line) - 1] = '\0'; - hui = - &hur->hur_user_item[hur->hur_request.hr_itemcount]; - hui->hui_extent.length = -1; - rc = lfs_hsm_prepare_file(line, &hui->hui_fid, - &last_dev); - hur->hur_request.hr_itemcount++; + rc = fill_hur_item(hur, hur->hur_request.hr_itemcount, + mntpath, line, &last_dev); if (rc) { fclose(fp); goto out_free; } - if ((some_file[0] == '\0') && - (strlen(line) < sizeof(some_file))) - strcpy(some_file, line); + if (some_file == NULL) { + some_file = line; + line = NULL; + } } rc = fclose(fp); - if (line) - free(line); + free(line); } /* If a --data was used, add it to the request */ @@ -3804,6 +5180,7 @@ static int lfs_hsm_request(int argc, char **argv, int action) } out_free: + free(some_file); free(hur); return rc; } @@ -3843,25 +5220,209 @@ static int lfs_swap_layouts(int argc, char **argv) SWAP_LAYOUTS_KEEP_ATIME); } +static const char *const ladvise_names[] = LU_LADVISE_NAMES; + +static enum lu_ladvise_type lfs_get_ladvice(const char *string) +{ + enum lu_ladvise_type advice; + + for (advice = 0; + advice < ARRAY_SIZE(ladvise_names); advice++) { + if (ladvise_names[advice] == NULL) + continue; + if (strcmp(string, ladvise_names[advice]) == 0) + return advice; + } + + return LU_LADVISE_INVALID; +} + +static int lfs_ladvise(int argc, char **argv) +{ + struct option long_opts[] = { + {"advice", required_argument, 0, 'a'}, + {"background", no_argument, 0, 'b'}, + {"end", required_argument, 0, 'e'}, + {"start", required_argument, 0, 's'}, + {"length", required_argument, 0, 'l'}, + {0, 0, 0, 0} + }; + char short_opts[] = "a:be:l:s:"; + int c; + int rc = 0; + const char *path; + int fd; + struct llapi_lu_ladvise advice; + enum lu_ladvise_type advice_type = LU_LADVISE_INVALID; + unsigned long long start = 0; + unsigned long long end = LUSTRE_EOF; + unsigned long long length = 0; + unsigned long long size_units; + unsigned long long flags = 0; + + optind = 0; + while ((c = getopt_long(argc, argv, short_opts, + long_opts, NULL)) != -1) { + switch (c) { + case 'a': + advice_type = lfs_get_ladvice(optarg); + if (advice_type == LU_LADVISE_INVALID) { + fprintf(stderr, "%s: invalid advice type " + "'%s'\n", argv[0], optarg); + fprintf(stderr, "Valid types:"); + + for (advice_type = 0; + advice_type < ARRAY_SIZE(ladvise_names); + advice_type++) { + if (ladvise_names[advice_type] == NULL) + continue; + fprintf(stderr, " %s", + ladvise_names[advice_type]); + } + fprintf(stderr, "\n"); + + return CMD_HELP; + } + break; + case 'b': + flags |= LF_ASYNC; + break; + case 'e': + size_units = 1; + rc = llapi_parse_size(optarg, &end, + &size_units, 0); + if (rc) { + fprintf(stderr, "%s: bad end offset '%s'\n", + argv[0], optarg); + return CMD_HELP; + } + break; + case 's': + size_units = 1; + rc = llapi_parse_size(optarg, &start, + &size_units, 0); + if (rc) { + fprintf(stderr, "%s: bad start offset " + "'%s'\n", argv[0], optarg); + return CMD_HELP; + } + break; + case 'l': + size_units = 1; + rc = llapi_parse_size(optarg, &length, + &size_units, 0); + if (rc) { + fprintf(stderr, "%s: bad length '%s'\n", + argv[0], optarg); + return CMD_HELP; + } + break; + case '?': + return CMD_HELP; + default: + fprintf(stderr, "%s: option '%s' unrecognized\n", + argv[0], argv[optind - 1]); + return CMD_HELP; + } + } + + if (advice_type == LU_LADVISE_INVALID) { + fprintf(stderr, "%s: please give an advice type\n", argv[0]); + fprintf(stderr, "Valid types:"); + for (advice_type = 0; advice_type < ARRAY_SIZE(ladvise_names); + advice_type++) { + if (ladvise_names[advice_type] == NULL) + continue; + fprintf(stderr, " %s", ladvise_names[advice_type]); + } + fprintf(stderr, "\n"); + return CMD_HELP; + } + + if (argc <= optind) { + fprintf(stderr, "%s: please give one or more file names\n", + argv[0]); + return CMD_HELP; + } + + if (end != LUSTRE_EOF && length != 0 && end != start + length) { + fprintf(stderr, "%s: conflicting arguments of -l and -e\n", + argv[0]); + return CMD_HELP; + } + + if (end == LUSTRE_EOF && length != 0) + end = start + length; + + if (end <= start) { + fprintf(stderr, "%s: range [%llu, %llu] is invalid\n", + argv[0], start, end); + return CMD_HELP; + } + + while (optind < argc) { + int rc2; + + path = argv[optind++]; + + fd = open(path, O_RDONLY); + if (fd < 0) { + fprintf(stderr, "%s: cannot open file '%s': %s\n", + argv[0], path, strerror(errno)); + rc2 = -errno; + goto next; + } + + advice.lla_start = start; + advice.lla_end = end; + advice.lla_advice = advice_type; + advice.lla_value1 = 0; + advice.lla_value2 = 0; + advice.lla_value3 = 0; + advice.lla_value4 = 0; + rc2 = llapi_ladvise(fd, flags, 1, &advice); + close(fd); + if (rc2 < 0) { + fprintf(stderr, "%s: cannot give advice '%s' to file " + "'%s': %s\n", argv[0], + ladvise_names[advice_type], + path, strerror(errno)); + } +next: + if (rc == 0 && rc2 < 0) + rc = rc2; + } + return rc; +} + +static int lfs_list_commands(int argc, char **argv) +{ + char buffer[81] = ""; /* 80 printable chars + terminating NUL */ + + Parser_list_commands(cmdlist, buffer, sizeof(buffer), NULL, 0, 4); + + return 0; +} + int main(int argc, char **argv) { int rc; - setlinebuf(stdout); + /* Ensure that liblustreapi constructor has run */ + if (!liblustreapi_initialized) + fprintf(stderr, "liblustreapi was not properly initialized\n"); - ptl_initialize(argc, argv); - if (obd_initialize(argc, argv) < 0) - exit(2); + setlinebuf(stdout); - Parser_init("lfs > ", cmdlist); + Parser_init("lfs > ", cmdlist); + progname = argv[0]; /* Used in error messages */ if (argc > 1) { rc = Parser_execarg(argc - 1, argv + 1, cmdlist); } else { rc = Parser_commands(); } - obd_finalize(argc, argv); return rc < 0 ? -rc : rc; }