X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre%2Futils%2Flfs.c;h=1c0b2fed0b7b52b24d47ffe7ce4adf78640ac831;hp=556f8374649466080324aa5bd02e5dca9c89f3bc;hb=281671b5ee43c2aea5d5b708aadf10fd1df45b16;hpb=1ea94be2430b358b898642461d9f111adeed9e70 diff --git a/lustre/utils/lfs.c b/lustre/utils/lfs.c index 556f837..1c0b2fe 100644 --- a/lustre/utils/lfs.c +++ b/lustre/utils/lfs.c @@ -51,6 +51,7 @@ #include #include #include +#include #include #include #include @@ -68,12 +69,11 @@ #include -#include +#include +#include #include #include -#include -#include #include "obdctl.h" /* all functions */ @@ -119,6 +119,7 @@ static int lfs_hsm_release(int argc, char **argv); 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"\ @@ -147,20 +148,26 @@ command_t cmdlist[] = { "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" - " [--stripe-count|-c] [--stripe-index|-i]\n" - " [--pool|-p] [--stripe-size|-S] [--directory|-d]\n" - " [--mdt-index|-M] [--recursive|-r] [--raw|-R]\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" + " ..."}, {"setdirstripe", lfs_setdirstripe, 0, "To create a remote directory on a specified MDT.\n" - "usage: setdirstripe <--index|-i mdt_index> \n" - "\tmdt_index: MDT index of first stripe\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\n" + "\tdefault_stripe: set default dirstripe of the directory\n"}, {"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] ..."}, + " [--recursive | -r] [ --default_stripe | -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" @@ -188,6 +195,7 @@ command_t cmdlist[] = { " [[!] --stripe-size|-S [+-]N[kMGT]] [[!] --type|-t ]\n" " [[!] --gid|-g|--group|-G |]\n" " [[!] --uid|-u|--user|-U |] [[!] --pool ]\n" + " [[!] --layout|-L released,raid0]\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"}, @@ -244,7 +252,8 @@ command_t cmdlist[] = { " while many targets still have 1MB or 1K inodes of spare\n" " quota space."}, {"quota", lfs_quota, 0, "Display disk usage and limits.\n" - "usage: quota [-q] [-v] [-o |-i |-I ]\n" + "usage: quota [-q] [-v] [-h] [-o |-i |-I " + "]\n" " [<-u|-g> |||] \n" " quota [-o |-i |-I ] -t <-u|-g> "}, #endif @@ -276,16 +285,16 @@ command_t cmdlist[] = { "interest to consumer , allowing the system to free up space.\n" "An of 0 means all records.\n" "usage: changelog_clear "}, - {"fid2path", lfs_fid2path, 0, - "Resolve the full path to a given FID. For a specific hardlink " - "specify link number .\n" - /* "For a historical name, specify changelog record .\n" */ - "usage: fid2path [--link ]" - /*[--rec ]*/}, - {"path2fid", lfs_path2fid, 0, "Display the fid for a given path.\n" - "usage: path2fid "}, - {"data_version", lfs_data_version, 0, "Display file data version for " - "a given path.\n" "usage: data_version [-n] "}, + {"fid2path", lfs_fid2path, 0, + "Resolve the full path(s) for given FID(s). For a specific hardlink " + "specify link number .\n" + /* "For a historical link name, specify changelog record .\n" */ + "usage: fid2path [--link ] ..." + /* [ --rec ] */ }, + {"path2fid", lfs_path2fid, 0, "Display the fid(s) for a given path(s).\n" + "usage: path2fid ..."}, + {"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, " "undergoing actions) for given files.\n usage: hsm_state ..."}, {"hsm_set", lfs_hsm_set, 0, "Set HSM user flag on specified files.\n" @@ -315,30 +324,19 @@ command_t cmdlist[] = { "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 layout to " + {"migrate", lfs_setstripe, 0, "migrate file from one OST layout to " "another (may be not safe with concurent writes).\n" SETSTRIPE_USAGE("migrate ", "")}, - {"help", Parser_help, 0, "help"}, - {"exit", Parser_quit, 0, "quit"}, - {"quit", Parser_quit, 0, "quit"}, - { 0, 0, 0, NULL } + {"mv", lfs_mv, 0, + "To move directories between MDTs.\n" + "usage: mv [--mdt-index|-M] " + "[--verbose|-v]\n"}, + {"help", Parser_help, 0, "help"}, + {"exit", Parser_quit, 0, "quit"}, + {"quit", Parser_quit, 0, "quit"}, + { 0, 0, 0, NULL } }; -static int isnumber(const char *str) -{ - const char *ptr; - - if (str[0] != '-' && !isdigit(str[0])) - return 0; - - for (ptr = str + 1; *ptr != '\0'; ptr++) { - if (!isdigit(*ptr)) - return 0; - } - - return 1; -} - #define MIGRATION_BLOCKS 1 static int lfs_migrate(char *name, unsigned long long stripe_size, @@ -360,6 +358,7 @@ static int lfs_migrate(char *name, unsigned long long stripe_size, __u64 rpos, wpos, bufoff; int gid = 0, sz; int have_gl = 0; + struct stat st, 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); @@ -405,7 +404,11 @@ static int lfs_migrate(char *name, unsigned long long stripe_size, } /* search for file directory pathname */ - strcpy(parent, name); + if (strlen(name) > sizeof(parent)-1) { + rc = -E2BIG; + goto free; + } + strncpy(parent, name, sizeof(parent)); ptr = strrchr(parent, '/'); if (ptr == NULL) { if (getcwd(parent, sizeof(parent)) == NULL) { @@ -444,8 +447,36 @@ static int lfs_migrate(char *name, unsigned long long stripe_size, goto free; } + /* Not-owner (root?) special case. + * Need to set owner/group of volatile file like original. + * This will allow to pass related check during layout_swap. + */ + rc = fstat(fd, &st); + if (rc != 0) { + rc = -errno; + fprintf(stderr, "cannot stat %s (%s)\n", 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)); + 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)); + goto error; + } + } + /* get file data version */ - rc = llapi_get_data_version(fd, &dv1, 0); + 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)); @@ -525,14 +556,12 @@ static int lfs_migrate(char *name, unsigned long long stripe_size, SWAP_LAYOUTS_KEEP_MTIME | SWAP_LAYOUTS_KEEP_ATIME); if (rc == -EAGAIN) { - fprintf(stderr, "file dataversion for %s has changed" - " during copy, migration is aborted\n", - name); + fprintf(stderr, "%s: dataversion changed during copy, " + "migration aborted\n", name); goto error; } if (rc != 0) - fprintf(stderr, "cannot swap layouts between %s and " - "a volatile file (%s)\n", + fprintf(stderr, "%s: swap layout to new file failed: %s\n", name, strerror(-rc)); error: @@ -575,9 +604,7 @@ static int lfs_setstripe(int argc, char **argv) struct option long_opts[] = { /* valid only in migrate mode */ {"block", no_argument, 0, 'b'}, -#if LUSTRE_VERSION >= OBD_OCD_VERSION(2,9,50,0) -#warning "remove deprecated --count option" -#else +#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. */ @@ -586,9 +613,7 @@ static int lfs_setstripe(int argc, char **argv) {"stripe-count", required_argument, 0, 'c'}, {"stripe_count", required_argument, 0, 'c'}, {"delete", no_argument, 0, 'd'}, -#if LUSTRE_VERSION >= OBD_OCD_VERSION(2,9,50,0) -#warning "remove deprecated --index option" -#else +#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. */ @@ -596,18 +621,14 @@ static int lfs_setstripe(int argc, char **argv) #endif {"stripe-index", required_argument, 0, 'i'}, {"stripe_index", required_argument, 0, 'i'}, -#if LUSTRE_VERSION >= OBD_OCD_VERSION(2,9,50,0) -#warning "remove deprecated --offset option" -#else +#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'}, + {"offset", required_argument, 0, 'o'}, #endif {"pool", required_argument, 0, 'p'}, -#if LUSTRE_VERSION >= OBD_OCD_VERSION(2,9,50,0) -#warning "remove deprecated --size option" -#else +#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. */ @@ -625,24 +646,13 @@ static int lfs_setstripe(int argc, char **argv) if (strcmp(argv[0], "migrate") == 0) migrate_mode = 1; -#if LUSTRE_VERSION < OBD_OCD_VERSION(2,4,50,0) - if (argc == 5 && argv[1][0] != '-' && - isnumber(argv[2]) && isnumber(argv[3]) && isnumber(argv[4])) { - fprintf(stderr, "error: obsolete usage of setstripe " - "positional parameters. Use -c, -i, -S instead.\n"); - return CMD_HELP; - } else -#else -#warning "remove obsolete positional parameter error" -#endif - { - optind = 0; - while ((c = getopt_long(argc, argv, "c:di:o:p:s:S:", - long_opts, NULL)) >= 0) { - switch (c) { - case 0: - /* Long options. */ - break; + optind = 0; + while ((c = getopt_long(argc, argv, "c:di:o:p:s:S:", + long_opts, NULL)) >= 0) { + switch (c) { + case 0: + /* Long options. */ + break; case 'b': if (migrate_mode == 0) { fprintf(stderr, "--block is valid only for" @@ -651,85 +661,76 @@ static int lfs_setstripe(int argc, char **argv) } migration_flags |= MIGRATION_BLOCKS; break; - case 'c': -#if LUSTRE_VERSION >= OBD_OCD_VERSION(2,9,50,0) -#warning "remove deprecated --count option" -#elif LUSTRE_VERSION >= OBD_OCD_VERSION(2,6,50,0) - if (strcmp(argv[optind - 1], "--count") == 0) - fprintf(stderr, "warning: '--count' deprecated" - ", use '--stripe-count' instead\n"); + 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 - stripe_count_arg = optarg; - break; - case 'd': - /* delete the default striping pattern */ - delete = 1; - break; - case 'o': -#if LUSTRE_VERSION >= OBD_OCD_VERSION(2,4,50,0) - fprintf(stderr, "warning: '--offset|-o' deprecated, " - "use '--stripe-index|-i' instead\n"); -#else - if (strcmp(argv[optind - 1], "--offset") == 0) - /* need --stripe-index established first */ - fprintf(stderr, "warning: '--offset' deprecated" - ", use '--index' instead\n"); + stripe_count_arg = optarg; + 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 'i': -#if LUSTRE_VERSION >= OBD_OCD_VERSION(2,9,50,0) -#warning "remove deprecated --offset and --index options" -#elif LUSTRE_VERSION >= OBD_OCD_VERSION(2,6,50,0) - if (strcmp(argv[optind - 1], "--index") == 0) - fprintf(stderr, "warning: '--index' deprecated" - ", use '--stripe-index' instead\n"); + 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; - break; - case 's': -#if LUSTRE_VERSION >= OBD_OCD_VERSION(2,9,50,0) -#warning "remove deprecated --size option" -#elif LUSTRE_VERSION >= OBD_OCD_VERSION(2,6,50,0) - fprintf(stderr, "warning: '--size|-s' deprecated, " - "use '--stripe-size|-S' instead\n"); + stripe_off_arg = optarg; + 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 - case 'S': - stripe_size_arg = optarg; - break; - case 'p': - pool_name_arg = optarg; - break; - default: - return CMD_HELP; - } - } +#endif /* LUSTRE_VERSION_CODE < OBD_OCD_VERSION(2, 9, 53, 0) */ + case 'S': + stripe_size_arg = optarg; + break; + case 'p': + pool_name_arg = optarg; + break; + default: + return CMD_HELP; + } + } - fname = argv[optind]; + 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 (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 (optind == argc) { - fprintf(stderr, "error: %s: missing filename|dirname\n", - argv[0]); - return CMD_HELP; - } + if (optind == argc) { + fprintf(stderr, "error: %s: missing filename|dirname\n", + argv[0]); + return CMD_HELP; + } - /* get the stripe size */ - if (stripe_size_arg != NULL) { - result = 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; - } - } + /* 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; + } + } /* get the stripe offset */ if (stripe_off_arg != NULL) { st_offset = strtol(stripe_off_arg, &end, 0); @@ -861,12 +862,34 @@ static int id2name(char **name, unsigned int id, int type) return 0; } +static int name2layout(__u32 *layout, char *name) +{ + char *ptr, *lyt; + + *layout = 0; + for (ptr = name; ; ptr = NULL) { + lyt = strtok(ptr, ","); + if (lyt == NULL) + break; + if (strcmp(lyt, "released") == 0) + *layout |= LOV_PATTERN_F_RELEASED; + else if (strcmp(lyt, "raid0") == 0) + *layout |= LOV_PATTERN_RAID0; + else + return -1; + } + return 0; +} + #define FIND_POOL_OPT 3 static int lfs_find(int argc, char **argv) { int c, ret; time_t t; - struct find_param param = { .maxdepth = -1, .quiet = 1 }; + struct find_param param = { + .fp_max_depth = -1, + .quiet = 1, + }; struct option long_opts[] = { {"atime", required_argument, 0, 'A'}, {"stripe-count", required_argument, 0, 'c'}, @@ -877,6 +900,7 @@ static int lfs_find(int argc, char **argv) {"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'}, @@ -905,11 +929,11 @@ 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:m:M:n:O:Ppqrs:S:t:u:U:v", - long_opts, NULL)) >= 0) { + 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) { xtime = NULL; xsign = NULL; if (neg_opt) @@ -944,24 +968,24 @@ static int lfs_find(int argc, char **argv) if (strcmp(optarg, "!") == 0) neg_opt = 2; break; - case 'A': - xtime = ¶m.atime; - xsign = ¶m.asign; - param.exclude_atime = !!neg_opt; - /* no break, this falls through to 'C' for ctime */ - case 'C': - if (c == 'C') { - xtime = ¶m.ctime; - xsign = ¶m.csign; - param.exclude_ctime = !!neg_opt; - } - /* no break, this falls through to 'M' for mtime */ - case 'M': - if (c == 'M') { - xtime = ¶m.mtime; - xsign = ¶m.msign; - param.exclude_mtime = !!neg_opt; - } + case 'A': + xtime = ¶m.fp_atime; + xsign = ¶m.fp_asign; + param.fp_exclude_atime = !!neg_opt; + /* no break, this falls through to 'C' for ctime */ + case 'C': + if (c == 'C') { + xtime = ¶m.fp_ctime; + xsign = ¶m.fp_csign; + param.fp_exclude_ctime = !!neg_opt; + } + /* no break, this falls through to 'M' for mtime */ + case 'M': + if (c == 'M') { + xtime = ¶m.fp_mtime; + xsign = ¶m.fp_msign; + param.fp_exclude_mtime = !!neg_opt; + } ret = set_time(&t, xtime, optarg); if (ret == INT_MAX) { ret = -1; @@ -989,14 +1013,14 @@ static int lfs_find(int argc, char **argv) param.check_stripecount = 1; param.exclude_stripecount = !!neg_opt; break; - case 'D': - param.maxdepth = strtol(optarg, 0, 0); - break; - case 'g': - case 'G': - ret = name2id(¶m.gid, optarg, GROUP); - if (ret) { - param.gid = strtoul(optarg, &endptr, 10); + case 'D': + param.fp_max_depth = strtol(optarg, 0, 0); + break; + case 'g': + case 'G': + ret = name2id(¶m.fp_gid, optarg, GROUP); + if (ret) { + param.fp_gid = strtoul(optarg, &endptr, 10); if (*endptr != '\0') { fprintf(stderr, "Group/GID: %s cannot " "be found.\n", optarg); @@ -1004,14 +1028,21 @@ static int lfs_find(int argc, char **argv) goto err; } } - param.exclude_gid = !!neg_opt; - param.check_gid = 1; + param.fp_exclude_gid = !!neg_opt; + param.fp_check_gid = 1; break; + case 'L': + ret = name2layout(¶m.layout, optarg); + if (ret) + goto err; + param.exclude_layout = !!neg_opt; + param.check_layout = 1; + break; case 'u': case 'U': - ret = name2id(¶m.uid, optarg, USER); - if (ret) { - param.uid = strtoul(optarg, &endptr, 10); + ret = name2id(¶m.fp_uid, optarg, USER); + if (ret) { + param.fp_uid = strtoul(optarg, &endptr, 10); if (*endptr != '\0') { fprintf(stderr, "User/UID: %s cannot " "be found.\n", optarg); @@ -1019,8 +1050,8 @@ static int lfs_find(int argc, char **argv) goto err; } } - param.exclude_uid = !!neg_opt; - param.check_uid = 1; + param.fp_exclude_uid = !!neg_opt; + param.fp_check_uid = 1; break; case FIND_POOL_OPT: if (strlen(optarg) > LOV_MAXPOOLNAME) { @@ -1085,20 +1116,24 @@ static int lfs_find(int argc, char **argv) param.obduuid = tmp; } for (token = buf; token && *token; token = next) { - char *uuid; - if (c == 'm') - uuid = - param.mdtuuid[param.num_mdts++].uuid; - else - uuid = - param.obduuid[param.num_obds++].uuid; + struct obd_uuid *puuid; + if (c == 'm') { + puuid = + ¶m.mdtuuid[param.num_mdts++]; + } else { + puuid = + ¶m.obduuid[param.num_obds++]; + } p = strchr(token, ','); next = 0; if (p) { *p = 0; next = p+1; } - strcpy((char *)uuid, token); + if (strlen(token) > sizeof(puuid->uuid)-1) + GOTO(err_free, ret = -E2BIG); + strncpy(puuid->uuid, token, + sizeof(puuid->uuid)); } err_free: if (buf) @@ -1110,63 +1145,75 @@ err_free: break; case 'P': break; - case 's': - if (optarg[0] == '+') { - param.size_sign = -1; - optarg++; - } else if (optarg[0] == '-') { - param.size_sign = 1; - optarg++; - } + case 's': + if (optarg[0] == '+') { + param.size_sign = -1; + optarg++; + } else if (optarg[0] == '-') { + param.size_sign = 1; + optarg++; + } - ret = parse_size(optarg, ¶m.size, - ¶m.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; - break; - case 'S': - if (optarg[0] == '+') { - param.stripesize_sign = -1; - optarg++; - } else if (optarg[0] == '-') { - param.stripesize_sign = 1; - optarg++; - } + ret = llapi_parse_size(optarg, ¶m.size, + ¶m.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; + break; + case 'S': + if (optarg[0] == '+') { + param.stripesize_sign = -1; + optarg++; + } else if (optarg[0] == '-') { + param.stripesize_sign = 1; + optarg++; + } - ret = parse_size(optarg, ¶m.stripesize, - ¶m.stripesize_units, 0); - if (ret) { - fprintf(stderr, "error: bad stripe_size '%s'\n", - optarg); - goto err; - } - param.check_stripesize = 1; - param.exclude_stripesize = !!neg_opt; - break; - case 't': - param.exclude_type = !!neg_opt; - switch(optarg[0]) { - case 'b': param.type = S_IFBLK; break; - case 'c': param.type = S_IFCHR; break; - case 'd': param.type = S_IFDIR; break; - case 'f': param.type = S_IFREG; break; - case 'l': param.type = S_IFLNK; break; - case 'p': param.type = S_IFIFO; break; - case 's': param.type = S_IFSOCK; break; -#ifdef S_IFDOOR /* Solaris only */ - case 'D': param.type = S_IFDOOR; break; -#endif - default: fprintf(stderr, "error: %s: bad type '%s'\n", - argv[0], optarg); - ret = CMD_HELP; - goto err; - }; - break; + ret = llapi_parse_size(optarg, ¶m.stripesize, + ¶m.stripesize_units, 0); + if (ret) { + fprintf(stderr, "error: bad stripe_size '%s'\n", + optarg); + goto err; + } + param.check_stripesize = 1; + param.exclude_stripesize = !!neg_opt; + break; + case 't': + param.fp_exclude_type = !!neg_opt; + switch (optarg[0]) { + case 'b': + param.fp_type = S_IFBLK; + break; + case 'c': + param.fp_type = S_IFCHR; + break; + case 'd': + param.fp_type = S_IFDIR; + break; + case 'f': + param.fp_type = S_IFREG; + break; + case 'l': + param.fp_type = S_IFLNK; + break; + case 'p': + param.fp_type = S_IFIFO; + break; + case 's': + param.fp_type = S_IFSOCK; + break; + default: + fprintf(stderr, "error: %s: bad type '%s'\n", + argv[0], optarg); + ret = CMD_HELP; + goto err; + }; + break; default: ret = CMD_HELP; goto err; @@ -1203,63 +1250,57 @@ err: static int lfs_getstripe_internal(int argc, char **argv, struct find_param *param) { - struct option long_opts[] = { -#if LUSTRE_VERSION >= OBD_OCD_VERSION(2,9,50,0) -#warning "remove deprecated --count option" -#else - /* 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", no_argument, 0, 'c'}, + struct option long_opts[] = { +#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", no_argument, 0, 'c'}, #endif - {"stripe-count", no_argument, 0, 'c'}, - {"stripe_count", no_argument, 0, 'c'}, - {"directory", no_argument, 0, 'd'}, - {"generation", no_argument, 0, 'g'}, -#if LUSTRE_VERSION >= OBD_OCD_VERSION(2,9,50,0) -#warning "remove deprecated --index option" -#else - /* 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", no_argument, 0, 'i'}, + {"stripe-count", no_argument, 0, 'c'}, + {"stripe_count", no_argument, 0, 'c'}, + {"directory", no_argument, 0, 'd'}, + {"default", no_argument, 0, 'D'}, + {"generation", no_argument, 0, 'g'}, +#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", no_argument, 0, 'i'}, #endif - {"stripe-index", no_argument, 0, 'i'}, - {"stripe_index", no_argument, 0, 'i'}, - {"mdt-index", no_argument, 0, 'M'}, - {"mdt_index", no_argument, 0, 'M'}, -#if LUSTRE_VERSION >= OBD_OCD_VERSION(2,9,50,0) -#warning "remove deprecated --offset option" -#else - /* 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", no_argument, 0, 'o'}, + {"stripe-index", no_argument, 0, 'i'}, + {"stripe_index", no_argument, 0, 'i'}, + {"layout", no_argument, 0, 'L'}, + {"mdt-index", no_argument, 0, 'M'}, + {"mdt_index", no_argument, 0, 'M'}, +#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", no_argument, 0, 'o'}, #endif - {"obd", required_argument, 0, 'O'}, - {"ost", required_argument, 0, 'O'}, - {"pool", no_argument, 0, 'p'}, - {"quiet", no_argument, 0, 'q'}, - {"recursive", no_argument, 0, 'r'}, - {"raw", no_argument, 0, 'R'}, -#if LUSTRE_VERSION >= OBD_OCD_VERSION(2,9,50,0) -#warning "remove deprecated --size option" -#else - /* 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", no_argument, 0, 's'}, + {"obd", required_argument, 0, 'O'}, + {"ost", required_argument, 0, 'O'}, + {"pool", no_argument, 0, 'p'}, + {"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) + /* 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", no_argument, 0, 's'}, #endif - {"stripe-size", no_argument, 0, 'S'}, - {"stripe_size", no_argument, 0, 'S'}, - {"verbose", no_argument, 0, 'v'}, - {0, 0, 0, 0} - }; - int c, rc; + {"stripe-size", no_argument, 0, 'S'}, + {"stripe_size", no_argument, 0, 'S'}, + {"verbose", no_argument, 0, 'v'}, + {0, 0, 0, 0} + }; + int c, rc; - param->maxdepth = 1; + param->fp_max_depth = 1; optind = 0; - while ((c = getopt_long(argc, argv, "cdghiMoO:pqrRsSv", + while ((c = getopt_long(argc, argv, "cdDghiLMoO:pqrRsSv", long_opts, NULL)) != -1) { switch (c) { case 'O': @@ -1275,7 +1316,10 @@ static int lfs_getstripe_internal(int argc, char **argv, param->quiet++; break; case 'd': - param->maxdepth = 0; + param->fp_max_depth = 0; + break; + case 'D': + param->get_default_lmv = 1; break; case 'r': param->recursive = 1; @@ -1284,69 +1328,66 @@ static int lfs_getstripe_internal(int argc, char **argv, param->verbose = VERBOSE_ALL | VERBOSE_DETAIL; break; case 'c': -#if LUSTRE_VERSION >= OBD_OCD_VERSION(2,9,50,0) -#warning "remove deprecated --count option" -#elif LUSTRE_VERSION >= OBD_OCD_VERSION(2,6,50,0) +#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; - param->maxdepth = 0; + param->fp_max_depth = 0; } break; +#if LUSTRE_VERSION_CODE < OBD_OCD_VERSION(2, 9, 53, 0) case 's': -#if LUSTRE_VERSION >= OBD_OCD_VERSION(2,9,50,0) -#warning "remove deprecated --size option" -#elif LUSTRE_VERSION >= OBD_OCD_VERSION(2,6,50,0) +#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; - param->maxdepth = 0; + param->fp_max_depth = 0; } break; +#if LUSTRE_VERSION_CODE < OBD_OCD_VERSION(2, 9, 53, 0) case 'o': -#if LUSTRE_VERSION >= OBD_OCD_VERSION(2,4,50,0) fprintf(stderr, "warning: '--offset|-o' deprecated, " "use '--stripe-index|-i' instead\n"); -#else - if (strcmp(argv[optind - 1], "--offset") == 0) - /* need --stripe-index established first */ - fprintf(stderr, "warning: '--offset' deprecated" - ", use '--index' instead\n"); #endif case 'i': -#if LUSTRE_VERSION >= OBD_OCD_VERSION(2,9,50,0) -#warning "remove deprecated --offset and --index options" -#elif LUSTRE_VERSION >= OBD_OCD_VERSION(2,6,50,0) +#if LUSTRE_VERSION_CODE >= OBD_OCD_VERSION(2, 6, 53, 0) if (strcmp(argv[optind - 1], "--index") == 0) fprintf(stderr, "warning: '--index' deprecated" ", use '--stripe-index' instead\n"); #endif if (!(param->verbose & VERBOSE_DETAIL)) { param->verbose |= VERBOSE_OFFSET; - param->maxdepth = 0; + param->fp_max_depth = 0; } break; case 'p': if (!(param->verbose & VERBOSE_DETAIL)) { param->verbose |= VERBOSE_POOL; - param->maxdepth = 0; + param->fp_max_depth = 0; } break; case 'g': if (!(param->verbose & VERBOSE_DETAIL)) { param->verbose |= VERBOSE_GENERATION; - param->maxdepth = 0; + param->fp_max_depth = 0; + } + break; + case 'L': + if (!(param->verbose & VERBOSE_DETAIL)) { + param->verbose |= VERBOSE_LAYOUT; + param->fp_max_depth = 0; } break; case 'M': if (!(param->verbose & VERBOSE_DETAIL)) - param->maxdepth = 0; + param->fp_max_depth = 0; param->verbose |= VERBOSE_MDTINDEX; break; case 'R': @@ -1361,7 +1402,7 @@ static int lfs_getstripe_internal(int argc, char **argv, return CMD_HELP; if (param->recursive) - param->maxdepth = -1; + param->fp_max_depth = -1; if (!param->verbose) param->verbose = VERBOSE_ALL; @@ -1434,30 +1475,44 @@ static int lfs_getdirstripe(int argc, char **argv) /* functions */ static int lfs_setdirstripe(int argc, char **argv) { - char *dname; - int result; - int st_offset, st_count; - char *end; - int c; - char *stripe_off_arg = NULL; - int flags = 0; + char *dname; + int result; + unsigned int stripe_offset = -1; + unsigned int stripe_count = 1; + enum lmv_hash_type hash_type; + char *end; + int c; + char *stripe_offset_opt = NULL; + char *stripe_count_opt = NULL; + char *stripe_hash_opt = NULL; + int default_stripe = 0; struct option long_opts[] = { - {"index", required_argument, 0, 'i'}, + {"count", required_argument, 0, 'c'}, + {"index", required_argument, 0, 'i'}, + {"hash-type", required_argument, 0, 't'}, + {"default_stripe", required_argument, 0, 'D'}, {0, 0, 0, 0} }; - st_offset = -1; - st_count = 1; optind = 0; - while ((c = getopt_long(argc, argv, "i:o", - long_opts, NULL)) >= 0) { + + while ((c = getopt_long(argc, argv, "c:Di:t:", long_opts, NULL)) >= 0) { switch (c) { case 0: /* Long options. */ break; + case 'c': + stripe_count_opt = optarg; + break; + case 'D': + default_stripe = 1; + break; case 'i': - stripe_off_arg = optarg; + stripe_offset_opt = optarg; + break; + case 't': + stripe_hash_opt = optarg; break; default: fprintf(stderr, "error: %s: option '%s' " @@ -1473,22 +1528,55 @@ static int lfs_setdirstripe(int argc, char **argv) return CMD_HELP; } - dname = argv[optind]; - if (stripe_off_arg == NULL) { - fprintf(stderr, "error: %s: missing stripe_off.\n", + if (stripe_offset_opt == NULL && stripe_count_opt == NULL) { + fprintf(stderr, "error: %s: missing stripe offset and count.\n", argv[0]); return CMD_HELP; } - /* get the stripe offset */ - st_offset = strtoul(stripe_off_arg, &end, 0); - if (*end != '\0') { - fprintf(stderr, "error: %s: bad stripe offset '%s'\n", - argv[0], stripe_off_arg); + + if (stripe_offset_opt != NULL) { + /* get the stripe offset */ + stripe_offset = strtoul(stripe_offset_opt, &end, 0); + if (*end != '\0') { + fprintf(stderr, "error: %s: bad stripe offset '%s'\n", + argv[0], stripe_offset_opt); + return CMD_HELP; + } + } + + if (stripe_hash_opt == NULL || + strcmp(stripe_hash_opt, LMV_HASH_NAME_FNV_1A_64) == 0) { + 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; } + + /* get the stripe count */ + if (stripe_count_opt != NULL) { + stripe_count = strtoul(stripe_count_opt, &end, 0); + if (*end != '\0') { + fprintf(stderr, "error: %s: bad stripe count '%s'\n", + argv[0], stripe_count_opt); + return CMD_HELP; + } + } + + dname = argv[optind]; do { - result = llapi_dir_create_pool(dname, flags, st_offset, - st_count, 0, NULL); + if (default_stripe == 1) { + result = llapi_dir_set_default_lmv_stripe(dname, + stripe_offset, stripe_count, + hash_type, NULL); + } else { + result = llapi_dir_create_pool(dname, 0, stripe_offset, + stripe_count, hash_type, + NULL); + } + if (result) { fprintf(stderr, "error: %s: create stripe dir '%s' " "failed\n", argv[0], dname); @@ -1527,6 +1615,61 @@ static int lfs_rmentry(int argc, char **argv) return result; } +static int lfs_mv(int argc, char **argv) +{ + struct find_param param = { + .fp_max_depth = -1, + .mdtindex = -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} + }; + + while ((c = getopt_long(argc, argv, "M:v", long_opts, NULL)) != -1) { + switch (c) { + case 'M': { + param.mdtindex = strtoul(optarg, &end, 0); + if (*end != '\0') { + fprintf(stderr, "%s: invalid MDT index'%s'\n", + argv[0], optarg); + return CMD_HELP; + } + break; + } + case 'v': { + param.verbose = VERBOSE_DETAIL; + break; + } + default: + fprintf(stderr, "error: %s: unrecognized option '%s'\n", + argv[0], argv[optind - 1]); + return CMD_HELP; + } + } + + if (param.mdtindex == -1) { + fprintf(stderr, "%s MDT index must be indicated\n", argv[0]); + return CMD_HELP; + } + + if (optind >= argc) { + fprintf(stderr, "%s missing operand path\n", argv[0]); + return CMD_HELP; + } + + param.migrate = 1; + rc = llapi_mv(argv[optind], ¶m); + if (rc != 0) + fprintf(stderr, "cannot migrate '%s' to MDT%04x: %s\n", + argv[optind], param.mdtindex, strerror(-rc)); + return rc; +} + static int lfs_osts(int argc, char **argv) { return lfs_tgts(argc, argv); @@ -1642,16 +1785,17 @@ struct ll_stat_type { static int mntdf(char *mntdir, char *fsname, char *pool, int ishow, int cooked, int lazy) { - 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 *tp; - __u32 index; - __u32 type; - int rc; + 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 *tp; + __u64 ost_ffree = 0; + __u32 index; + __u32 type; + int rc; if (pool) { poolname = strchr(pool, '.'); @@ -1705,23 +1849,32 @@ static int mntdf(char *mntdir, char *fsname, char *pool, int ishow, 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 * - stat_buf.os_bsize; - sum.os_bavail += stat_buf.os_bavail * - stat_buf.os_bsize; - } - } else if (rc == -EINVAL || rc == -EFAULT) { - break; - } - } - } + sum.os_blocks += stat_buf.os_blocks * + stat_buf.os_bsize; + sum.os_bfree += stat_buf.os_bfree * + stat_buf.os_bsize; + sum.os_bavail += stat_buf.os_bavail * + stat_buf.os_bsize; + ost_ffree += stat_buf.os_ffree; + } + } else if (rc == -EINVAL || rc == -EFAULT) { + break; + } + } + } - printf("\n"); - showdf(mntdir, &sum, "filesystem summary:", ishow, cooked, NULL, 0,0); - printf("\n"); - return 0; + /* If we don't have as many objects free on the OST as inodes + * on the MDS, we reduce the total number of inodes to + * compensate, so that the "inodes in use" number is correct. + * Matches ll_statfs_internal() so the results are consistent. */ + if (ost_ffree < sum.os_ffree) { + sum.os_files = (sum.os_files - sum.os_ffree) + ost_ffree; + sum.os_ffree = ost_ffree; + } + printf("\n"); + showdf(mntdir, &sum, "filesystem summary:", ishow, cooked, NULL, 0, 0); + printf("\n"); + return 0; } static int lfs_df(int argc, char **argv) @@ -1737,24 +1890,25 @@ static int lfs_df(int argc, char **argv) {0, 0, 0, 0} }; - optind = 0; + optind = 0; while ((c = getopt_long(argc, argv, "hilp:", long_opts, NULL)) != -1) { - switch (c) { - case 'i': - ishow = 1; - break; - case 'h': - cooked = 1; - break; - case 'l': - lazy = 1; - case 'p': - pool_name = optarg; - break; - default: - return CMD_HELP; - } - } + switch (c) { + case 'i': + ishow = 1; + break; + case 'h': + cooked = 1; + break; + case 'l': + lazy = 1; + break; + case 'p': + pool_name = optarg; + break; + default: + return CMD_HELP; + } + } if (optind < argc && !realpath(argv[optind], path)) { rc = -errno; fprintf(stderr, "error: invalid path '%s': %s\n", @@ -2143,17 +2297,17 @@ error: return ULONG_MAX; } -#define ARG2ULL(nr, str, def_units) \ -do { \ - unsigned long long limit, units = def_units; \ - int rc; \ - \ - rc = parse_size(str, &limit, &units, 1); \ - if (rc < 0) { \ - fprintf(stderr, "error: bad limit value %s\n", str); \ - return CMD_HELP; \ - } \ - nr = limit; \ +#define ARG2ULL(nr, str, def_units) \ +do { \ + unsigned long long limit, units = def_units; \ + int rc; \ + \ + rc = llapi_parse_size(str, &limit, &units, 1); \ + if (rc < 0) { \ + fprintf(stderr, "error: bad limit value %s\n", str); \ + return CMD_HELP; \ + } \ + nr = limit; \ } while (0) static inline int has_times_option(int argc, char **argv) @@ -2479,26 +2633,47 @@ static void diff2str(time_t seconds, char *buf, time_t now) __sec2str(seconds - now, buf); } -static void print_quota_title(char *name, struct if_quotactl *qctl) +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); + 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) { - printf("Disk quotas for %s %s (%cid %u):\n", - type2name(qctl->qc_type), name, - *type2name(qctl->qc_type), qctl->qc_id); - printf("%15s%8s %7s%8s%8s%8s %7s%8s%8s\n", - "Filesystem", - "kbytes", "quota", "limit", "grace", - "files", "quota", "limit", "grace"); + if (!h) { + sprintf(buf, LPU64, num); + } else { + if (num >> 30) + sprintf(buf, "%5.4gT", (double)num / (1 << 30)); + else if (num >> 20) + sprintf(buf, "%5.4gG", (double)num / (1 << 20)); + else if (num >> 10) + sprintf(buf, "%5.4gM", (double)num / (1 << 10)); + else + sprintf(buf, LPU64"%s", num, "k"); + } } -static void print_quota(char *mnt, struct if_quotactl *qctl, int type, int rc) +static void print_quota(char *mnt, struct if_quotactl *qctl, int type, + int rc, bool h) { time_t now; time(&now); if (qctl->qc_cmd == LUSTRE_Q_GETQUOTA || qctl->qc_cmd == Q_GETOQUOTA) { - int bover = 0, iover = 0; - struct obd_dqblk *dqb = &qctl->qc_dqblk; + int bover = 0, iover = 0; + struct obd_dqblk *dqb = &qctl->qc_dqblk; + char numbuf[3][32]; + char timebuf[40]; + char strbuf[32]; if (dqb->dqb_bhardlimit && toqb(dqb->dqb_curspace) >= dqb->dqb_bhardlimit) { @@ -2515,68 +2690,67 @@ static void print_quota(char *mnt, struct if_quotactl *qctl, int type, int rc) dqb->dqb_curinodes >= dqb->dqb_ihardlimit) { iover = 1; } else if (dqb->dqb_isoftlimit && dqb->dqb_itime) { - if (dqb->dqb_btime > now) { - iover = 2; - } else { - iover = 3; - } + if (dqb->dqb_itime > now) { + iover = 2; + } else { + iover = 3; + } } -#if 0 /* XXX: always print quotas even when no usages */ - if (dqb->dqb_curspace || dqb->dqb_curinodes) -#endif - { - char numbuf[3][32]; - char timebuf[40]; - if (strlen(mnt) > 15) - printf("%s\n%15s", mnt, ""); - else - printf("%15s", mnt); + if (strlen(mnt) > 15) + printf("%s\n%15s", mnt, ""); + else + printf("%15s", mnt); + + if (bover) + diff2str(dqb->dqb_btime, timebuf, now); + + kbytes2str(toqb(dqb->dqb_curspace), 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); + 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); + sprintf(numbuf[2], (dqb->dqb_valid & QIF_BLIMITS) ? + "%s" : "[%s]", strbuf); + + printf(" %7s%c %6s %7s %7s", + numbuf[0], bover ? '*' : ' ', numbuf[1], + numbuf[2], bover > 1 ? timebuf : "-"); + + if (iover) + diff2str(dqb->dqb_itime, timebuf, now); + + sprintf(numbuf[0], (dqb->dqb_valid & QIF_INODES) ? + LPU64 : "["LPU64"]", dqb->dqb_curinodes); + + if (type == QC_GENERAL) + sprintf(numbuf[1], (dqb->dqb_valid & QIF_ILIMITS) ? + LPU64 : "["LPU64"]", dqb->dqb_isoftlimit); + else + sprintf(numbuf[1], "%s", "-"); + + sprintf(numbuf[2], (dqb->dqb_valid & QIF_ILIMITS) ? + LPU64 : "["LPU64"]", dqb->dqb_ihardlimit); + + if (type != QC_OSTIDX) + printf(" %7s%c %6s %7s %7s", + numbuf[0], iover ? '*' : ' ', numbuf[1], + numbuf[2], iover > 1 ? timebuf : "-"); + else + printf(" %7s %7s %7s %7s", "-", "-", "-", "-"); + printf("\n"); - if (bover) - diff2str(dqb->dqb_btime, timebuf, now); - if (rc == -EREMOTEIO) - sprintf(numbuf[0], LPU64"*", - toqb(dqb->dqb_curspace)); - else - sprintf(numbuf[0], - (dqb->dqb_valid & QIF_SPACE) ? - LPU64 : "["LPU64"]", - toqb(dqb->dqb_curspace)); - if (type == QC_GENERAL) - sprintf(numbuf[1], (dqb->dqb_valid & QIF_BLIMITS) - ? LPU64 : "["LPU64"]", - dqb->dqb_bsoftlimit); - else - sprintf(numbuf[1], "%s", "-"); - sprintf(numbuf[2], (dqb->dqb_valid & QIF_BLIMITS) - ? LPU64 : "["LPU64"]", dqb->dqb_bhardlimit); - printf(" %7s%c %6s %7s %7s", - numbuf[0], bover ? '*' : ' ', numbuf[1], - numbuf[2], bover > 1 ? timebuf : "-"); - - if (iover) - diff2str(dqb->dqb_itime, timebuf, now); - - sprintf(numbuf[0], (dqb->dqb_valid & QIF_INODES) ? - LPU64 : "["LPU64"]", dqb->dqb_curinodes); - if (type == QC_GENERAL) - sprintf(numbuf[1], (dqb->dqb_valid & QIF_ILIMITS) - ? LPU64 : "["LPU64"]", - dqb->dqb_isoftlimit); - else - sprintf(numbuf[1], "%s", "-"); - sprintf(numbuf[2], (dqb->dqb_valid & QIF_ILIMITS) ? - LPU64 : "["LPU64"]", dqb->dqb_ihardlimit); - if (type != QC_OSTIDX) - printf(" %7s%c %6s %7s %7s", - numbuf[0], iover ? '*' : ' ', numbuf[1], - numbuf[2], iover > 1 ? timebuf : "-"); - else - printf(" %7s %7s %7s %7s", "-", "-", "-", "-"); - printf("\n"); - } } else if (qctl->qc_cmd == LUSTRE_Q_GETINFO || qctl->qc_cmd == Q_GETOINFO) { char bgtimebuf[40]; @@ -2589,7 +2763,8 @@ static void print_quota(char *mnt, struct if_quotactl *qctl, int type, int rc) } } -static int print_obd_quota(char *mnt, struct if_quotactl *qctl, int is_mdt) +static int print_obd_quota(char *mnt, struct if_quotactl *qctl, int is_mdt, + bool h, __u64 *total) { int rc = 0, rc1 = 0, count = 0; __u32 valid = qctl->qc_valid; @@ -2618,29 +2793,33 @@ static int print_obd_quota(char *mnt, struct if_quotactl *qctl, int is_mdt) continue; } - print_quota(obd_uuid2str(&qctl->obd_uuid), qctl, qctl->qc_valid, 0); - } - + print_quota(obd_uuid2str(&qctl->obd_uuid), qctl, + qctl->qc_valid, 0, h); + *total += is_mdt ? qctl->qc_dqblk.dqb_ihardlimit : + qctl->qc_dqblk.dqb_bhardlimit; + } out: - qctl->qc_valid = valid; - return rc ? : rc1; + qctl->qc_valid = valid; + return rc ? : rc1; } 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 }; - char *obd_type = (char *)qctl.obd_type; - char *obd_uuid = (char *)qctl.obd_uuid.uuid; - int rc, rc1 = 0, rc2 = 0, rc3 = 0, - verbose = 0, pass = 0, quiet = 0, inacc; - char *endptr; - __u32 valid = QC_GENERAL, idx = 0; + int c; + char *mnt, *name = NULL; + struct if_quotactl qctl = { .qc_cmd = LUSTRE_Q_GETQUOTA, + .qc_type = UGQUOTA }; + char *obd_type = (char *)qctl.obd_type; + char *obd_uuid = (char *)qctl.obd_uuid.uuid; + int rc, 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; - optind = 0; - while ((c = getopt(argc, argv, "gi:I:o:qtuv")) != -1) { + optind = 0; + while ((c = getopt(argc, argv, "gi:I:o:qtuvh")) != -1) { switch (c) { case 'u': if (qctl.qc_type != UGQUOTA) { @@ -2677,6 +2856,9 @@ static int lfs_quota(int argc, char **argv) case 'q': quiet = 1; break; + case 'h': + human_readable = true; + break; default: fprintf(stderr, "error: %s: option '-%c' " "unrecognized\n", argv[0], c); @@ -2747,8 +2929,8 @@ ug_output: } } - if (qctl.qc_cmd == LUSTRE_Q_GETQUOTA && !quiet) - print_quota_title(name, &qctl); + if (qctl.qc_cmd == LUSTRE_Q_GETQUOTA && !quiet) + print_quota_title(name, &qctl, human_readable); if (rc1 && *obd_type) fprintf(stderr, "%s %s ", obd_type, obd_uuid); @@ -2756,15 +2938,24 @@ ug_output: if (qctl.qc_valid != QC_GENERAL) mnt = ""; - inacc = (qctl.qc_cmd == LUSTRE_Q_GETQUOTA) && - ((qctl.qc_dqblk.dqb_valid&(QIF_LIMITS|QIF_USAGE))!=(QIF_LIMITS|QIF_USAGE)); + inacc = (qctl.qc_cmd == LUSTRE_Q_GETQUOTA) && + ((qctl.qc_dqblk.dqb_valid & (QIF_LIMITS|QIF_USAGE)) != + (QIF_LIMITS|QIF_USAGE)); - print_quota(mnt, &qctl, QC_GENERAL, rc1); + print_quota(mnt, &qctl, QC_GENERAL, rc1, human_readable); - if (qctl.qc_valid == QC_GENERAL && qctl.qc_cmd != LUSTRE_Q_GETINFO && verbose) { - rc2 = print_obd_quota(mnt, &qctl, 1); - rc3 = print_obd_quota(mnt, &qctl, 0); - } + if (qctl.qc_valid == QC_GENERAL && qctl.qc_cmd != LUSTRE_Q_GETINFO && + verbose) { + char strbuf[32]; + + 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); + } if (rc1 || rc2 || rc3 || inacc) printf("Some errors happened when getting quota info. " @@ -3030,7 +3221,7 @@ static int lfs_fid2path(int argc, char **argv) int linkno = -1; int lnktmp; int printcur = 0; - int rc; + int rc = 0; optind = 0; @@ -3054,112 +3245,133 @@ static int lfs_fid2path(int argc, char **argv) return CMD_HELP; } } - device = argv[optind++]; - fid = argv[optind++]; - if (optind != argc) - return CMD_HELP; - path = calloc(1, PATH_MAX); + if (argc < 3) + return CMD_HELP; - lnktmp = (linkno >= 0) ? linkno : 0; - while (1) { - int oldtmp = lnktmp; - long long rectmp = recno; - rc = llapi_fid2path(device, fid, path, PATH_MAX, &rectmp, - &lnktmp); - if (rc < 0) { - fprintf(stderr, "%s error: %s\n", argv[0], - strerror(errno = -rc)); - break; - } + device = argv[optind++]; + path = calloc(1, PATH_MAX); - if (printcur) - fprintf(stdout, "%lld ", rectmp); - if (device[0] == '/') { - fprintf(stdout, "%s", device); - if (device[strlen(device) - 1] != '/') - fprintf(stdout, "/"); - } else if (path[0] == '\0') { - fprintf(stdout, "/"); - } - fprintf(stdout, "%s\n", path); + rc = 0; + while (optind < argc) { + fid = argv[optind++]; + + lnktmp = (linkno >= 0) ? linkno : 0; + while (1) { + int oldtmp = lnktmp; + long long rectmp = recno; + int rc2; + rc2 = llapi_fid2path(device, fid, path, PATH_MAX, + &rectmp, &lnktmp); + if (rc2 < 0) { + fprintf(stderr, "%s: error on FID %s: %s\n", + argv[0], fid, strerror(errno = -rc2)); + if (rc == 0) + rc = rc2; + break; + } - if (linkno >= 0) - /* specified linkno */ - break; - if (oldtmp == lnktmp) - /* no more links */ - break; - } + if (printcur) + fprintf(stdout, "%lld ", rectmp); + if (device[0] == '/') { + fprintf(stdout, "%s", device); + if (device[strlen(device) - 1] != '/') + fprintf(stdout, "/"); + } else if (path[0] == '\0') { + fprintf(stdout, "/"); + } + fprintf(stdout, "%s\n", path); + + if (linkno >= 0) + /* specified linkno */ + break; + if (oldtmp == lnktmp) + /* no more links */ + break; + } + } - free(path); - return rc; + free(path); + return rc; } static int lfs_path2fid(int argc, char **argv) { - char *path; - lustre_fid fid; - int rc; - - if (argc != 2) - return CMD_HELP; - - path = argv[1]; - rc = llapi_path2fid(path, &fid); - if (rc) { - fprintf(stderr, "can't get fid for %s: %s\n", path, - strerror(errno = -rc)); - return rc; - } + char **path; + const char *sep = ""; + lustre_fid fid; + int rc = 0; - printf(DFID"\n", PFID(&fid)); + if (argc < 2) + return CMD_HELP; + else if (argc > 2) + sep = ": "; + + path = argv + 1; + while (*path != NULL) { + int err = llapi_path2fid(*path, &fid); + + if (err) { + fprintf(stderr, "%s: can't get fid for %s: %s\n", + argv[0], *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 0; + return rc; } static int lfs_data_version(int argc, char **argv) { - char *path; - __u64 data_version; - int fd; - int rc; - int c; - int nolock = 0; + char *path; + __u64 data_version; + int fd; + int rc; + int c; + int data_version_flags = LL_DV_RD_FLUSH; /* Read by default */ - if (argc < 2) - return CMD_HELP; + if (argc < 2) + return CMD_HELP; - optind = 0; - while ((c = getopt(argc, argv, "n")) != -1) { - switch (c) { - case 'n': - nolock = LL_DV_NOFLUSH; - break; - default: - return CMD_HELP; - } - } - if (optind == argc) - return CMD_HELP; + optind = 0; + while ((c = getopt(argc, argv, "nrw")) != -1) { + switch (c) { + case 'n': + data_version_flags = 0; + break; + case 'r': + data_version_flags |= LL_DV_RD_FLUSH; + break; + case 'w': + data_version_flags |= LL_DV_WR_FLUSH; + break; + default: + return CMD_HELP; + } + } + if (optind == argc) + return CMD_HELP; - path = argv[optind]; - fd = open(path, O_RDONLY); - if (fd < 0) { - fprintf(stderr, "can't open %s: %s\n", path, - strerror(errno)); - return errno; - } + path = argv[optind]; + fd = open(path, O_RDONLY); + if (fd < 0) + err(errno, "cannot open file %s", path); - rc = llapi_get_data_version(fd, &data_version, nolock); - if (rc) { - fprintf(stderr, "can't get version for %s: %s\n", path, - strerror(errno = -rc)); - } else + rc = llapi_get_data_version(fd, &data_version, data_version_flags); + if (rc < 0) + err(errno, "cannot get version for %s", path); + else printf(LPU64 "\n", data_version); close(fd); - return rc; } @@ -3472,8 +3684,13 @@ 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) - strcpy(some_file, argv[optind]); + if (nbfile != 0) { + if (strlen(argv[optind]) > sizeof(some_file)-1) { + free(hur); + return -E2BIG; + } + strncpy(some_file, argv[optind], sizeof(some_file)); + } for (i = 0; i < nbfile; i++) { hur->hur_user_item[i].hui_extent.length = -1; @@ -3513,6 +3730,7 @@ static int lfs_hsm_request(int argc, char **argv, int action) strerror(errno)); hur = oldhur; rc = -errno; + fclose(fp); goto out_free; } memcpy(hur, oldhur, hur_len(oldhur)); @@ -3529,8 +3747,10 @@ static int lfs_hsm_request(int argc, char **argv, int action) rc = lfs_hsm_prepare_file(line, &hui->hui_fid, &last_dev); hur->hur_request.hr_itemcount++; - if (rc) + if (rc) { + fclose(fp); goto out_free; + } if ((some_file[0] == '\0') && (strlen(line) < sizeof(some_file)))