X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Futils%2Flfs.c;h=20f2d6031a752cdba8cda798a7fa37eb0fc1d22c;hb=a9650116ab7ccea22a5a8852e7894f28d17edabd;hp=845da41262da09ca5753e0e357466884aef3abc9;hpb=c16f92af14cbd952f4d1108d71a17c7543796ee5;p=fs%2Flustre-release.git diff --git a/lustre/utils/lfs.c b/lustre/utils/lfs.c index 845da41..20f2d60 100644 --- a/lustre/utils/lfs.c +++ b/lustre/utils/lfs.c @@ -1,28 +1,50 @@ /* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*- * vim:expandtab:shiftwidth=8:tabstop=8: * - * Copyright (C) 2002 Cluster File Systems, Inc. - * Author: Peter J. Braam - * Author: Phil Schwan - * Author: Robert Read + * GPL HEADER START * - * This file is part of Lustre, http://www.lustre.org. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Lustre is free software; you can redistribute it and/or - * modify it under the terms of version 2 of the GNU General Public - * License as published by the Free Software Foundation. + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 only, + * as published by the Free Software Foundation. * - * Lustre is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License version 2 for more details (a copy is included + * in the LICENSE file that accompanied this code). * - * You should have received a copy of the GNU General Public License - * along with Lustre; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + * 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. + * + * GPL HEADER END + */ +/* + * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved. + * Use is subject to license terms. + */ +/* + * This file is part of Lustre, http://www.lustre.org/ + * Lustre is a trademark of Sun Microsystems, Inc. + * + * lustre/utils/lfs.c + * + * Author: Peter J. Braam + * Author: Phil Schwan + * Author: Robert Read */ +/* for O_DIRECTORY */ +#ifndef _GNU_SOURCE +#define _GNU_SOURCE +#endif + #include #include #include @@ -37,6 +59,10 @@ #include #include #include +#ifdef HAVE_SYS_QUOTA_H +# include +#endif + /* For dirname() */ #include @@ -47,8 +73,9 @@ #include #include #include +#include -#include "parser.h" +#include #include "obdctl.h" unsigned int libcfs_subsystem_debug = 0; @@ -61,13 +88,14 @@ static int lfs_osts(int argc, char **argv); static int lfs_df(int argc, char **argv); static int lfs_check(int argc, char **argv); static int lfs_catinfo(int argc, char **argv); -#ifdef HAVE_QUOTA_SUPPORT +#ifdef HAVE_SYS_QUOTA_H static int lfs_quotachown(int argc, char **argv); 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); +static int lfs_quotainv(int argc, char **argv); #endif static int lfs_flushctx(int argc, char **argv); static int lfs_join(int argc, char **argv); @@ -77,6 +105,11 @@ 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); +static int lfs_changelog(int argc, char **argv); +static int lfs_changelog_clear(int argc, char **argv); +static int lfs_fid2path(int argc, char **argv); +static int lfs_path2fid(int argc, char **argv); /* all avaialable commands */ command_t cmdlist[] = { @@ -84,30 +117,36 @@ command_t cmdlist[] = { "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 \n" - " or \n" - " setstripe [--size|-s stripe_size]\n" - " [--index|-i stripe_index]\n" - " [--count|-c stripe_count]\n" + "usage: setstripe [--size|-s stripe_size] [--count|-c stripe_count]\n" + " [--index|-i|--offset|-o start_ost_index]\n" + " [--pool|-p ] \n" " or \n" - " setstripe -d (to delete default striping)\n" + " setstripe -d (to delete default striping)\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 respectively)\n" - "\tstripe_index: OST index of first stripe (-1 filesystem default)\n" - "\tstripe_count: Number of OSTs to stripe over (0 default, -1 all)"}, + "\t Can be specified with k, m or g (in KB, MB and GB\n" + "\t respectively)\n" + "\tstart_ost_index: OST index of first stripe (-1 filesystem default)\n" + "\tstripe_count: Number of OSTs to stripe over (0 default, -1 all)\n" + "\tpool: Name of OST pool"}, {"getstripe", lfs_getstripe, 0, - "To list the striping info for a given filename or files in a\n" + "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 [--obd|-O ] [--quiet | -q] [--verbose | -v]\n" - " [--recursive | -r] ..."}, + " [--count | -c ] [--index | -i | --offset | -o ]\n" + " [--size | -s ] [--pool | -p ] [--directory | -d]\n" + " [--mdt | -M] [--recursive | -r] ..."}, + {"pool_list", lfs_poollist, 0, + "List pools or pool OSTs\n" + "usage: pool_list [.] | \n"}, {"find", lfs_find, 0, "To find files that match given parameters recursively in a directory tree.\n" - "usage: find ... \n" + "usage: find ...\n" " [[!] --atime|-A [+-]N] [[!] --mtime|-M [+-]N] [[!] --ctime|-C [+-]N]\n" " [--maxdepth|-D N] [[!] --name|-n ] [--print0|-P]\n" - " [--print|-p] [--obd|-O ] [[!] --size|-s [+-]N[bkMGTP]]\n" - " [[!] --type|-t ] [[!] --gid|-g N] [[!] --group|-G ]\n" - " [[!] --uid|-u N] [[!] --user|-U ]\n" + " [--print|-p] [[!] --obd|-O ] [[!] --size|-s [+-]N[bkMGTP]]\n" + " [[!] --type|-t ] [[!] --gid|-g|--group|-G |]\n" + " [[!] --uid|-u|--user|-U |]\n" + " [[!] --pool ]\n" "\t !: used before an option indicates 'NOT' the requested attribute\n" "\t -: used before an value indicates 'AT MOST' the requested value\n" "\t +: used before an option indicates 'AT LEAST' the requested value\n"}, @@ -121,14 +160,15 @@ command_t cmdlist[] = { "\tkeywords are one of followings: config, deletions.\n" "\tnode name must be provided when use keyword config."}, {"join", lfs_join, 0, - "join two lustre files into one - join A, B, will be like cat B >> A & del B\n" - "usage: join \n"}, - {"osts", lfs_osts, 0, "osts"}, + "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]"}, {"df", lfs_df, 0, "report filesystem disk space usage or inodes usage" - "of each MDS/OSD.\n" - "Usage: df [-i] [-h] [path]"}, -#ifdef HAVE_QUOTA_SUPPORT + "of each MDS and all OSDs or a batch belonging to a specific pool .\n" + "Usage: df [-i] [-h] [--pool|-p [.] [path]"}, +#ifdef HAVE_SYS_QUOTA_H {"quotachown",lfs_quotachown, 0, "Change files' owner or group on the specified filesystem.\n" "usage: quotachown [-i] \n" @@ -142,10 +182,28 @@ command_t cmdlist[] = { {"quotaoff", lfs_quotaoff, 0, "Turn filesystem quotas off.\n" "usage: quotaoff [ -ug ] "}, {"setquota", lfs_setquota, 0, "Set filesystem quotas.\n" - "usage: setquota [ -u | -g ] \n" - " setquota -t [ -u | -g ] "}, + "usage: setquota <-u|-g> |||\n" + " -b -B \n" + " -i -I \n" + " setquota -t <-u|-g> \n" + " setquota <-u|--user|-g|--group> |||\n" + " [--block-softlimit ]\n" + " [--block-hardlimit ]\n" + " [--inode-softlimit ]\n" + " [--inode-hardlimit ] \n" + " setquota [-t] <-u|--user|-g|--group>\n" + " [--block-grace ]\n" + " [--inode-grace ] \n" + " -b can be used instead of --block-softlimit/--block-grace\n" + " -B can be used instead of --block-hardlimit\n" + " -i can be used instead of --inode-softlimit/--inode-grace\n" + " -I can be used instead of --inode-hardlimit"}, {"quota", lfs_quota, 0, "Display disk usage and limits.\n" - "usage: quota [ -o obd_uuid ] [{-u|-g }|-t] "}, + "usage: quota [-q] [-v] [-o |-i |-I ]\n" + " [<-u|-g> |||] \n" + " quota [-o |-i |-I ] -t <-u|-g> "}, + {"quotainv", lfs_quotainv, 0, "Invalidate quota data.\n" + "usage: quotainv [-u|-g] "}, #endif {"flushctx", lfs_flushctx, 0, "Flush security context for current user.\n" "usage: flushctx [-k] [mountpoint...]"}, @@ -167,12 +225,43 @@ command_t cmdlist[] = { {"ls", lfs_ls, 0, "Remote user list directory contents.\n" "usage: ls [OPTION]... [FILE]..."}, + {"changelog", lfs_changelog, 0, + "Show the metadata changes on an MDT." + "\nusage: changelog [startrec [endrec]]"}, + {"changelog_clear", lfs_changelog_clear, 0, + "Indicate that old changelog records up to are no longer of " + "interest to consumer , allowing the system to free up space.\n" + "An of 0 means all records.\n" + "usage: changelog_clear "}, + {"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 "}, {"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; +} + /* functions */ static int lfs_setstripe(int argc, char **argv) { @@ -186,12 +275,15 @@ static int lfs_setstripe(int argc, char **argv) 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; struct option long_opts[] = { {"size", required_argument, 0, 's'}, {"count", required_argument, 0, 'c'}, {"index", required_argument, 0, 'i'}, + {"offset", required_argument, 0, 'o'}, + {"pool", required_argument, 0, 'p'}, {"delete", no_argument, 0, 'd'}, {0, 0, 0, 0} }; @@ -199,26 +291,21 @@ static int lfs_setstripe(int argc, char **argv) st_size = 0; st_offset = -1; st_count = 0; - if (argc == 3 && strcmp(argv[1], "-d") == 0) { - /* for compatibility with the existing positional parameter - * usage */ - fname = argv[2]; - optind = 2; - } else if (argc == 5 && - (argv[2][0] != '-' || isdigit(argv[2][1])) && - (argv[3][0] != '-' || isdigit(argv[3][1])) && - (argv[4][0] != '-' || isdigit(argv[4][1])) ) { - /* for compatibility with the existing positional parameter - * usage */ - fname = argv[1]; - stripe_size_arg = argv[2]; - stripe_off_arg = argv[3]; - stripe_count_arg = argv[4]; - optind = 4; - } else { + +#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 code" +#endif + { optind = 0; - while ((c = getopt_long(argc, argv, "c:di:s:", - long_opts, NULL)) >= 0) { + while ((c = getopt_long(argc, argv, "c:di:o:s:p:", + long_opts, NULL)) >= 0) { switch (c) { case 0: /* Long options. */ @@ -231,11 +318,15 @@ static int lfs_setstripe(int argc, char **argv) delete = 1; break; case 'i': + case 'o': stripe_off_arg = optarg; break; case 's': stripe_size_arg = optarg; break; + case 'p': + pool_name_arg = optarg; + break; case '?': return CMD_HELP; default: @@ -245,40 +336,37 @@ static int lfs_setstripe(int argc, char **argv) return CMD_HELP; } } - if (optind < argc) - fname = argv[optind]; - else - return CMD_HELP; + fname = argv[optind]; - if (delete && - (stripe_size_arg != NULL || stripe_off_arg != NULL || - stripe_count_arg != NULL)) { + 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 or -i options\n", + "-s, -c -o or -p options\n", argv[0]); return CMD_HELP; } } - if (optind != argc - 1) { - fprintf(stderr, "error: %s: only 1 filename|dirname can be " - "specified: '%s'\n", - argv[0], argv[argc - 1]); + + 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); + result = parse_size(stripe_size_arg, &st_size, &size_units, 0); if (result) { - fprintf(stderr,"error: bad size '%s'\n", - stripe_size_arg); + fprintf(stderr, "error: %s: bad size '%s'\n", + argv[0], stripe_size_arg); return result; } } /* get the stripe offset */ if (stripe_off_arg != NULL) { - st_offset = strtoul(stripe_off_arg, &end, 0); + 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); @@ -295,19 +383,33 @@ static int lfs_setstripe(int argc, char **argv) } } - result = llapi_file_create(fname, st_size, st_offset, st_count, 0); - if (result) - fprintf(stderr, "error: %s: create stripe file failed\n", - argv[0]); + do { + result = llapi_file_create_pool(fname, st_size, st_offset, + st_count, 0, pool_name_arg); + if (result) { + fprintf(stderr,"error: %s: create stripe file '%s' " + "failed\n", argv[0], fname); + break; + } + fname = argv[++optind]; + } while (fname != NULL); return result; } +static int lfs_poollist(int argc, char **argv) +{ + if (argc != 2) + return CMD_HELP; + + return llapi_poollist(argv[1]); +} + static int set_time(time_t *time, time_t *set, char *str) { time_t t; int res = 0; - + if (str[0] == '+') res = 1; else if (str[0] == '-') @@ -328,9 +430,12 @@ static int set_time(time_t *time, time_t *set, char *str) return res; } +#define USER 0 +#define GROUP 1 + static int name2id(unsigned int *id, char *name, int type) { - if (type == USRQUOTA) { + if (type == USER) { struct passwd *entry; if (!(entry = getpwnam(name))) { @@ -357,7 +462,7 @@ static int name2id(unsigned int *id, char *name, int type) static int id2name(char **name, unsigned int id, int type) { - if (type == USRQUOTA) { + if (type == USER) { struct passwd *entry; if (!(entry = getpwuid(id))) { @@ -382,13 +487,13 @@ static int id2name(char **name, unsigned int id, int type) return 0; } +#define FIND_POOL_OPT 3 static int lfs_find(int argc, char **argv) { int new_fashion = 1; int c, ret; time_t t; struct find_param param = { .maxdepth = -1 }; - char str[1024]; struct option long_opts[] = { /* New find options. */ {"atime", required_argument, 0, 'A'}, @@ -400,6 +505,8 @@ static int lfs_find(int argc, char **argv) {"uid", required_argument, 0, 'u'}, {"user", required_argument, 0, 'U'}, {"name", required_argument, 0, 'n'}, + /* no short option for pool, p/P already used */ + {"pool", required_argument, 0, FIND_POOL_OPT}, /* --obd is considered as a new option. */ {"obd", required_argument, 0, 'O'}, {"ost", required_argument, 0, 'O'}, @@ -424,13 +531,20 @@ static int lfs_find(int argc, char **argv) time(&t); optind = 0; - while ((c = getopt_long_only(argc, argv, "-A:C:D:g:G:M:n:PpO:qrs:t:u:U:v", + /* when getopt_long_only() hits '!' it returns 1, puts "!" in optarg */ + while ((c = getopt_long_only(argc,argv,"-A:C:D:g:G:M:n:PpO:qrs:t:u:U:v", long_opts, NULL)) >= 0) { xtime = NULL; xsign = NULL; if (neg_opt) --neg_opt; /* '!' is part of option */ + /* when getopt_long_only() finds a string which is not + * an option nor a known option argument it returns 1 + * in that case if we already have found pathstart and pathend + * (i.e. we have the list of pathnames), + * the only supported value is "!" + */ isoption = (c != 1) || (strcmp(optarg, "!") == 0); if (!isoption && pathend != -1) { fprintf(stderr, "err: %s: filename|dirname must either " @@ -452,35 +566,29 @@ static int lfs_find(int argc, char **argv) /* Long options. */ break; case 1: + /* unknown; opt is "!" or path component, + * checking done above. + */ if (strcmp(optarg, "!") == 0) neg_opt = 2; break; case 'A': xtime = ¶m.atime; xsign = ¶m.asign; + param.exclude_atime = !!neg_opt; case 'C': if (c == 'C') { xtime = ¶m.ctime; xsign = ¶m.csign; + param.exclude_ctime = !!neg_opt; } case 'M': if (c == 'M') { xtime = ¶m.mtime; xsign = ¶m.msign; + param.exclude_mtime = !!neg_opt; } new_fashion = 1; - if (neg_opt) { - if (optarg[0] == '-') - optarg[0] = '+'; - else if (optarg[0] == '+') - optarg[0] = '-'; - else { - str[0] = '-'; - str[1] = '\0'; - strcat(str, optarg); - optarg = str; - } - } ret = set_time(&t, xtime, optarg); if (ret == INT_MAX) return -1; @@ -492,44 +600,50 @@ static int lfs_find(int argc, char **argv) param.maxdepth = strtol(optarg, 0, 0); break; case 'g': - new_fashion = 1; - param.gid = strtol(optarg, &endptr, 10); - if (optarg == endptr) { - fprintf(stderr, "Bad gid: %s\n", optarg); - return CMD_HELP; - } - param.exclude_gid = !!neg_opt; - param.check_gid = 1; - break; case 'G': new_fashion = 1; - ret = name2id(¶m.gid, optarg, GRPQUOTA); - if (ret != 0) { - fprintf(stderr, "Group: %s cannot be found.\n", optarg); - return -1; + ret = name2id(¶m.gid, optarg, GROUP); + if (ret) { + param.gid = strtoul(optarg, &endptr, 10); + if (*endptr != '\0') { + fprintf(stderr, "Group/GID: %s cannot " + "be found.\n", optarg); + return -1; + } } param.exclude_gid = !!neg_opt; param.check_gid = 1; break; case 'u': + case 'U': new_fashion = 1; - param.uid = strtol(optarg, &endptr, 10); - if (optarg == endptr) { - fprintf(stderr, "Bad uid: %s\n", optarg); - return CMD_HELP; + ret = name2id(¶m.uid, optarg, USER); + if (ret) { + param.uid = strtoul(optarg, &endptr, 10); + if (*endptr != '\0') { + fprintf(stderr, "User/UID: %s cannot " + "be found.\n", optarg); + return -1; + } } param.exclude_uid = !!neg_opt; param.check_uid = 1; break; - case 'U': + case FIND_POOL_OPT: new_fashion = 1; - ret = name2id(¶m.uid, optarg, USRQUOTA); - if (ret != 0) { - fprintf(stderr, "User: %s cannot be found.\n", optarg); + if (strlen(optarg) > LOV_MAXPOOLNAME) { + fprintf(stderr, + "Pool name %s is too long" + " (max is %d)\n", optarg, + LOV_MAXPOOLNAME); return -1; } - param.exclude_uid = !!neg_opt; - param.check_uid = 1; + /* 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; break; case 'n': new_fashion = 1; @@ -546,8 +660,10 @@ static int lfs_find(int argc, char **argv) return -ENOMEM; strcpy(buf, (char *)optarg); + param.exclude_obd = !!neg_opt; + if (param.num_alloc_obds == 0) { - param.obduuid = (struct obd_uuid *)malloc(FIND_MAX_OSTS * + param.obduuid = malloc(FIND_MAX_OSTS * sizeof(struct obd_uuid)); if (param.obduuid == NULL) return -ENOMEM; @@ -603,18 +719,6 @@ static int lfs_find(int argc, char **argv) }; break; case 's': - if (neg_opt) { - if (optarg[0] == '-') - optarg[0] = '+'; - else if (optarg[0] == '+') - optarg[0] = '-'; - else { - str[0] = '-'; - str[1] = '\0'; - strcat(str, optarg); - optarg = str; - } - } if (optarg[0] == '+') param.size_sign = -1; else if (optarg[0] == '-') @@ -622,12 +726,15 @@ static int lfs_find(int argc, char **argv) if (param.size_sign) optarg++; - ret = parse_size(optarg, ¶m.size,¶m.size_units); + ret = parse_size(optarg, ¶m.size, + ¶m.size_units, 0); if (ret) { fprintf(stderr,"error: bad size '%s'\n", optarg); return ret; } + param.check_size = 1; + param.exclude_size = !!neg_opt; break; case 'v': new_fashion = 0; @@ -642,7 +749,7 @@ static int lfs_find(int argc, char **argv) return CMD_HELP; }; } - + if (pathstart == -1) { fprintf(stderr, "error: %s: no filename|pathname\n", argv[0]); @@ -664,7 +771,7 @@ static int lfs_find(int argc, char **argv) if (!param.recursive && param.maxdepth == -1) param.maxdepth = 1; } - + do { if (new_fashion) ret = llapi_find(argv[pathstart], ¶m); @@ -688,15 +795,22 @@ static int lfs_getstripe(int argc, char **argv) {"obd", 1, 0, 'O'}, {"quiet", 0, 0, 'q'}, {"recursive", 0, 0, 'r'}, + {"count", 0, 0, 'c'}, + {"size", 0, 0, 's'}, + {"index", 0, 0, 'i'}, + {"offset", 0, 0, 'o'}, + {"pool", 0, 0, 'p'}, {"verbose", 0, 0, 'v'}, + {"directory", 0, 0, 'd'}, + {"mdt", 0, 0, 'M'}, {0, 0, 0, 0} }; - char short_opts[] = "hO:qrv"; int c, rc; struct find_param param = { 0 }; + param.maxdepth = 1; optind = 0; - while ((c = getopt_long(argc, argv, short_opts, + while ((c = getopt_long(argc, argv, "cdhiMoO:pqrsv", long_opts, NULL)) != -1) { switch (c) { case 'O': @@ -710,14 +824,43 @@ static int lfs_getstripe(int argc, char **argv) break; case 'q': param.quiet++; - param.verbose = 0; + break; + case 'd': + param.maxdepth = 0; break; case 'r': param.recursive = 1; break; case 'v': - param.verbose++; - param.quiet = 0; + param.verbose = VERBOSE_ALL | VERBOSE_DETAIL; + break; + case 'c': + if (!(param.verbose & VERBOSE_DETAIL)) { + param.verbose |= VERBOSE_COUNT; + param.maxdepth = 0; + } + break; + case 's': + if (!(param.verbose & VERBOSE_DETAIL)) { + param.verbose |= VERBOSE_SIZE; + param.maxdepth = 0; + } + break; + case 'i': + case 'o': + if (!(param.verbose & VERBOSE_DETAIL)) { + param.verbose |= VERBOSE_OFFSET; + param.maxdepth = 0; + } + break; + case 'p': + if (!(param.verbose & VERBOSE_DETAIL)) { + param.verbose |= VERBOSE_POOL; + param.maxdepth = 0; + } + break; + case 'M': + param.get_mdt_index = 1; break; case '?': return CMD_HELP; @@ -731,49 +874,54 @@ static int lfs_getstripe(int argc, char **argv) if (optind >= argc) return CMD_HELP; - param.maxdepth = param.recursive ? -1 : 1; + if (param.recursive) + param.maxdepth = -1; + + if (!param.verbose) + param.verbose = VERBOSE_ALL; + if (param.quiet) + param.verbose = VERBOSE_OBJID; do { rc = llapi_getstripe(argv[optind], ¶m); } while (++optind < argc && !rc); if (rc) - fprintf(stderr, "error: %s failed for %s.\n", + fprintf(stderr, "error: %s failed for %s.\n", argv[0], argv[optind - 1]); return rc; } static int lfs_osts(int argc, char **argv) { - FILE *fp; - struct mntent *mnt = NULL; - struct obd_uuid *obduuid = NULL; + char mntdir[PATH_MAX] = {'\0'}, path[PATH_MAX] = {'\0'}; struct find_param param; - int rc=0; + int index = 0, rc=0; - if (argc != 1) + if (argc > 2) return CMD_HELP; - fp = setmntent(MOUNTED, "r"); + if (argc == 2 && !realpath(argv[1], path)) { + rc = -errno; + fprintf(stderr, "error: invalid path '%s': %s\n", + argv[1], strerror(-rc)); + return rc; + } + + while (!llapi_search_mounts(path, index++, mntdir, NULL)) { + /* Check if we have a mount point */ + if (mntdir[0] == '\0') + continue; - if (fp == NULL) { - fprintf(stderr, "%s: setmntent(%s): %s:", argv[0], MOUNTED, - strerror (errno)); - } else { - mnt = getmntent(fp); memset(¶m, 0, sizeof(param)); - param.obduuid = obduuid; - while (feof(fp) == 0 && ferror(fp) ==0) { - if (llapi_is_lustre_mnt(mnt)) { - rc = llapi_getstripe(mnt->mnt_dir, ¶m); - if (rc) - fprintf(stderr, - "error: %s: failed on %s\n", - argv[0], mnt->mnt_dir); - } - mnt = getmntent(fp); + rc = llapi_ostlist(mntdir, ¶m); + if (rc) { + fprintf(stderr, "error: %s: failed on %s\n", + argv[0], mntdir); } - endmntent(fp); + if (path[0] != '\0') + break; + memset(mntdir, 0, PATH_MAX); } return rc; @@ -789,47 +937,11 @@ static int lfs_osts(int argc, char **argv) radix; \ }) #define UUF "%-20s" -#define CSF "%9s" -#define CDF "%9llu" -#define HSF "%8s" -#define HDF "%6.1f" -#define RSF "%5s" -#define RDF "%4d%%" - -static int path2mnt(char *path, FILE *fp, char *mntdir, int dir_len) -{ - char rpath[PATH_MAX] = {'\0'}; - struct mntent *mnt; - int rc, len, out_len = 0; - - if (!realpath(path, rpath)) { - rc = -errno; - fprintf(stderr, "error: lfs df: invalid path '%s': %s\n", - path, strerror(-rc)); - return rc; - } - - len = 0; - mnt = getmntent(fp); - while (feof(fp) == 0 && ferror(fp) == 0) { - if (llapi_is_lustre_mnt(mnt)) { - len = strlen(mnt->mnt_dir); - if (len > out_len && - !strncmp(rpath, mnt->mnt_dir, len)) { - out_len = len; - memset(mntdir, 0, dir_len); - strncpy(mntdir, mnt->mnt_dir, dir_len); - } - } - mnt = getmntent(fp); - } - - if (out_len > 0) - return 0; - - fprintf(stderr, "error: lfs df: %s isn't mounted on lustre\n", path); - return -EINVAL; -} +#define CSF "%11s" +#define CDF "%11llu" +#define HDF "%8.1f%c" +#define RSF "%4s" +#define RDF "%3d%%" static int showdf(char *mntdir, struct obd_statfs *stat, char *uuid, int ishow, int cooked, @@ -859,8 +971,8 @@ static int showdf(char *mntdir, struct obd_statfs *stat, total = (stat->os_blocks * stat->os_bsize) >> shift; } - if (total > 0) - ratio = (double)used / (double)total; + if ((used + avail) > 0) + ratio = (double)used / (double)(used + avail); if (cooked) { int i; @@ -869,21 +981,21 @@ static int showdf(char *mntdir, struct obd_statfs *stat, cook_val = (double)total; i = COOK(cook_val); if (i > 0) - sprintf(tbuf, HDF"%c", cook_val, suffix[i - 1]); + 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"%c", cook_val, suffix[i - 1]); + 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"%c", cook_val, suffix[i - 1]); + sprintf(abuf, HDF, cook_val, suffix[i - 1]); else sprintf(abuf, CDF, avail); } else { @@ -892,7 +1004,7 @@ static int showdf(char *mntdir, struct obd_statfs *stat, sprintf(abuf, CDF, avail); } - sprintf(rbuf, RDF, (int)(ratio * 100)); + sprintf(rbuf, RDF, (int)(ratio * 100 + 0.5)); printf(UUF" "CSF" "CSF" "CSF" "RSF" %-s", uuid, tbuf, ubuf, abuf, rbuf, mntdir); if (type) @@ -912,13 +1024,35 @@ static int showdf(char *mntdir, struct obd_statfs *stat, return 0; } -static int mntdf(char *mntdir, int ishow, int cooked) +struct ll_stat_type { + int st_op; + char *st_name; +}; + +static int mntdf(char *mntdir, char *fsname, char *pool, int ishow, int cooked) { struct obd_statfs stat_buf, sum = { .os_bsize = 1 }; struct obd_uuid uuid_buf; + char *poolname = NULL; + struct ll_stat_type types[] = { { LL_STATFS_MDC, "MDT" }, + { LL_STATFS_LOV, "OST" }, + { 0, NULL } }; + struct ll_stat_type *tp; __u32 index; int rc; + 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 (ishow) printf(UUF" "CSF" "CSF" "CSF" "RSF" %-s\n", "UUID", "Inodes", "IUsed", "IFree", @@ -928,78 +1062,68 @@ static int mntdf(char *mntdir, int ishow, int cooked) "UUID", cooked ? "bytes" : "1K-blocks", "Used", "Available", "Use%", "Mounted on"); - for (index = 0; ; index++) { - memset(&stat_buf, 0, sizeof(struct obd_statfs)); - memset(&uuid_buf, 0, sizeof(struct obd_uuid)); - rc = llapi_obd_statfs(mntdir, LL_STATFS_MDC, index, - &stat_buf, &uuid_buf); - if (rc == -ENODEV) - break; - - if (rc == -EAGAIN) - continue; - - if (rc == -ENOTCONN || rc == -ETIMEDOUT || rc == -EIO || - rc == -ENODATA || rc == 0) { - showdf(mntdir, &stat_buf, uuid_buf.uuid, ishow, cooked, - "MDT", index, rc); - } else { - fprintf(stderr, - "error: llapi_obd_statfs(%s): %s (%d)\n", - uuid_buf.uuid, strerror(-rc), rc); - return rc; - } - if (rc == 0) { - sum.os_ffree += stat_buf.os_ffree; - sum.os_files += stat_buf.os_files; - } - } - - for (index = 0; ; index++) { - memset(&stat_buf, 0, sizeof(struct obd_statfs)); - memset(&uuid_buf, 0, sizeof(struct obd_uuid)); - rc = llapi_obd_statfs(mntdir, LL_STATFS_LOV, index, - &stat_buf, &uuid_buf); - if (rc == -ENODEV) - break; + 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)); + rc = llapi_obd_statfs(mntdir, tp->st_op, index, + &stat_buf, &uuid_buf); + if (rc == -ENODEV) + break; - if (rc == -EAGAIN) - continue; + if (poolname && tp->st_op == LL_STATFS_LOV && + llapi_search_ost(fsname, poolname, + obd_uuid2str(&uuid_buf)) != 1) + continue; - if (rc == -ENOTCONN || rc == -ETIMEDOUT || rc == -EIO || - rc == -ENODATA || rc == 0) { - showdf(mntdir, &stat_buf, uuid_buf.uuid, ishow, cooked, - "OST", index, rc); - } else { - fprintf(stderr, - "error: llapi_obd_statfs failed: %s (%d)\n", - strerror(-rc), rc); - return rc; - } - if (rc == 0) { - 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; + /* 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_MDC) { + 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; + } } } printf("\n"); showdf(mntdir, &sum, "filesystem summary:", ishow, cooked, NULL, 0,0); - + printf("\n"); return 0; } static int lfs_df(int argc, char **argv) { - FILE *fp; - char *path = NULL; - struct mntent *mnt = NULL; - char *mntdir = NULL; + char mntdir[PATH_MAX] = {'\0'}, path[PATH_MAX] = {'\0'}; int ishow = 0, cooked = 0; - int c, rc = 0; + int c, rc = 0, index = 0; + char fsname[PATH_MAX] = "", *pool_name = NULL; + struct option long_opts[] = { + {"pool", required_argument, 0, 'p'}, + {0, 0, 0, 0} + }; optind = 0; - while ((c = getopt(argc, argv, "ih")) != -1) { + while ((c = getopt_long(argc, argv, "hip:", long_opts, NULL)) != -1) { switch (c) { case 'i': ishow = 1; @@ -1007,62 +1131,39 @@ static int lfs_df(int argc, char **argv) case 'h': cooked = 1; break; + case 'p': + pool_name = optarg; + break; default: return CMD_HELP; } } - if (optind < argc ) - path = argv[optind]; - - fp = setmntent(MOUNTED, "r"); - if (fp == NULL) { + if (optind < argc && !realpath(argv[optind], path)) { rc = -errno; - fprintf(stderr, "error: %s: open %s failed( %s )\n", - argv[0], MOUNTED, strerror(errno)); + fprintf(stderr, "error: invalid path '%s': %s\n", + argv[optind], strerror(-rc)); return rc; } - if ((mntdir = malloc(PATH_MAX)) == NULL) { - fprintf(stderr, "error: cannot allocate %d bytes\n", - PATH_MAX); - return -ENOMEM; - } - memset(mntdir, 0, PATH_MAX); - - if (path) { - rc = path2mnt(path, fp, mntdir, PATH_MAX); - if (rc) { - endmntent(fp); - free(mntdir); - return rc; - } + while (!llapi_search_mounts(path, index++, mntdir, fsname)) { + /* Check if we have a mount point */ + if (mntdir[0] == '\0') + continue; - rc = mntdf(mntdir, ishow, cooked); - printf("\n"); - endmntent(fp); - } else { - mnt = getmntent(fp); - while (feof(fp) == 0 && ferror(fp) == 0) { - if (llapi_is_lustre_mnt(mnt)) { - rc = mntdf(mnt->mnt_dir, ishow, cooked); - if (rc) - break; - printf("\n"); - } - mnt = getmntent(fp); - } - endmntent(fp); + rc = mntdf(mntdir, fsname, pool_name, ishow, cooked); + if (rc || path[0] != '\0') + break; + fsname[0] = '\0'; /* avoid matching in next loop */ + mntdir[0] = '\0'; /* avoid matching in next loop */ } - free(mntdir); return rc; } static int lfs_check(int argc, char **argv) { int rc; - FILE *fp; - struct mntent *mnt = NULL; + char mntdir[PATH_MAX] = {'\0'}; int num_types = 1; char *obd_types[2]; char obd_type1[4]; @@ -1088,26 +1189,14 @@ static int lfs_check(int argc, char **argv) return CMD_HELP; } - fp = setmntent(MOUNTED, "r"); - if (fp == NULL) { - fprintf(stderr, "setmntent(%s): %s:", MOUNTED, - strerror (errno)); - } else { - mnt = getmntent(fp); - while (feof(fp) == 0 && ferror(fp) ==0) { - if (llapi_is_lustre_mnt(mnt)) - break; - mnt = getmntent(fp); - } - endmntent(fp); - } - - if (!mnt) { + rc = llapi_search_mounts(NULL, 0, mntdir, NULL); + if (rc < 0 || mntdir[0] == '\0') { fprintf(stderr, "No suitable Lustre mount found\n"); - return -1; + return rc; } - rc = llapi_target_check(num_types, obd_types, mnt->mnt_dir); + rc = llapi_target_iterate(num_types, obd_types, + mntdir, llapi_ping_target); if (rc) fprintf(stderr, "error: %s: %s status failed\n", @@ -1119,8 +1208,7 @@ static int lfs_check(int argc, char **argv) static int lfs_catinfo(int argc, char **argv) { - FILE *fp; - struct mntent *mnt = NULL; + char mntdir[PATH_MAX] = {'\0'}; int rc; if (argc < 2 || (!strcmp(argv[1],"config") && argc < 3)) @@ -1129,25 +1217,12 @@ static int lfs_catinfo(int argc, char **argv) if (strcmp(argv[1], "config") && strcmp(argv[1], "deletions")) return CMD_HELP; - fp = setmntent(MOUNTED, "r"); - if (fp == NULL) { - fprintf(stderr, "setmntent(%s): %s:", MOUNTED, - strerror(errno)); - } else { - mnt = getmntent(fp); - while (feof(fp) == 0 && ferror(fp) == 0) { - if (llapi_is_lustre_mnt(mnt)) - break; - mnt = getmntent(fp); - } - endmntent(fp); - } - - if (mnt) { + rc = llapi_search_mounts(NULL, 0, mntdir, NULL); + if (rc == 0 && mntdir[0] != '\0') { if (argc == 3) - rc = llapi_catinfo(mnt->mnt_dir, argv[1], argv[2]); + rc = llapi_catinfo(mntdir, argv[1], argv[2]); else - rc = llapi_catinfo(mnt->mnt_dir, argv[1], NULL); + rc = llapi_catinfo(mntdir, argv[1], NULL); } else { fprintf(stderr, "no lustre_lite mounted.\n"); rc = -1; @@ -1156,40 +1231,14 @@ static int lfs_catinfo(int argc, char **argv) return rc; } -int lfs_join(int argc, char **argv) +static int lfs_join(int argc, char **argv) { - char *name_head, *name_tail; - int fd, rc; - loff_t size; - - if (argc != 3) - return CMD_HELP; - name_head = argv[1]; - fd = open(name_head, O_WRONLY); - if (fd < 0) { - fprintf(stderr, "Can not open name_head %s rc=%d\n", - name_head, fd); - return fd; - } - size = lseek(fd, 0, SEEK_END); - if (size % JOIN_FILE_ALIGN) { - fprintf(stderr,"head file %s size %llu must be mutiple of %d\n", - name_head, (long long)size, JOIN_FILE_ALIGN); - rc = -EINVAL; - goto out; - } - name_tail = argv[2]; - rc = ioctl(fd, LL_IOC_JOIN, name_tail); -out: - close(fd); - if (rc) { - fprintf(stderr, "Lustre joining files: %s, %s, failed\n", - argv[1], argv[2]); - } - return rc; + fprintf(stderr, "join two lustre files into one.\n" + "obsolete, HEAD does not support it anymore.\n"); + return 0; } -#ifdef HAVE_QUOTA_SUPPORT +#ifdef HAVE_SYS_QUOTA_H static int lfs_quotachown(int argc, char **argv) { @@ -1216,15 +1265,13 @@ static int lfs_quotachown(int argc, char **argv) return rc; } - 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 = qchk.obd_type; - char *obd_uuid = qchk.obd_uuid.uuid; + char *obd_type = (char *)qchk.obd_type; int rc; memset(&qchk, 0, sizeof(qchk)); @@ -1255,16 +1302,6 @@ static int lfs_quotacheck(int argc, char **argv) mnt = argv[optind]; - memset(&qctl, 0, sizeof(qctl)); - qctl.qc_cmd = LUSTRE_Q_QUOTAOFF; - qctl.qc_id = QFMT_LDISKFS; - qctl.qc_type = check_type; - rc = llapi_quotactl(mnt, &qctl); - if (rc) { - fprintf(stderr, "quota off failed: %s\n", strerror(errno)); - return rc; - } - rc = llapi_quotacheck(mnt, check_type); if (rc) { fprintf(stderr, "quotacheck failed: %s\n", strerror(errno)); @@ -1274,20 +1311,20 @@ static int lfs_quotacheck(int argc, char **argv) rc = llapi_poll_quotacheck(mnt, &qchk); if (rc) { if (*obd_type) - fprintf(stderr, "%s %s ", obd_type, obd_uuid); + fprintf(stderr, "%s %s ", obd_type, + obd_uuid2str(&qchk.obd_uuid)); fprintf(stderr, "quota check failed: %s\n", strerror(errno)); return rc; } memset(&qctl, 0, sizeof(qctl)); qctl.qc_cmd = LUSTRE_Q_QUOTAON; - qctl.qc_id = QFMT_LDISKFS; qctl.qc_type = check_type; rc = llapi_quotactl(mnt, &qctl); - if (rc) { + if (rc && errno != EALREADY) { if (*obd_type) - fprintf(stderr, "%s %s ", - qctl.obd_type, qctl.obd_uuid.uuid); + 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(errno)); return rc; @@ -1301,13 +1338,11 @@ static int lfs_quotaon(int argc, char **argv) int c; char *mnt; struct if_quotactl qctl; - char *obd_type = qctl.obd_type; - char *obd_uuid = qctl.obd_uuid.uuid; + char *obd_type = (char *)qctl.obd_type; int rc; memset(&qctl, 0, sizeof(qctl)); qctl.qc_cmd = LUSTRE_Q_QUOTAON; - qctl.qc_id = QFMT_LDISKFS; optind = 0; while ((c = getopt(argc, argv, "ugf")) != -1) { @@ -1340,13 +1375,21 @@ static int lfs_quotaon(int argc, char **argv) rc = llapi_quotactl(mnt, &qctl); if (rc) { - if (*obd_type) - fprintf(stderr, "%s %s ", obd_type, obd_uuid); - fprintf(stderr, "%s failed: %s\n", argv[0], strerror(errno)); - return rc; + if (errno == EALREADY) { + rc = 0; + } else if (errno == 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(errno)); + } } - return 0; + return rc; } static int lfs_quotaoff(int argc, char **argv) @@ -1354,8 +1397,7 @@ static int lfs_quotaoff(int argc, char **argv) int c; char *mnt; struct if_quotactl qctl; - char *obd_type = qctl.obd_type; - char *obd_uuid = qctl.obd_uuid.uuid; + char *obd_type = (char *)qctl.obd_type; int rc; memset(&qctl, 0, sizeof(qctl)); @@ -1389,9 +1431,62 @@ static int lfs_quotaoff(int argc, char **argv) rc = llapi_quotactl(mnt, &qctl); if (rc) { - if (*obd_type) - fprintf(stderr, "%s %s ", obd_type, obd_uuid); - fprintf(stderr, "quotaoff failed: %s\n", strerror(errno)); + if (errno == 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(errno)); + } + } + + return rc; +} + +static int lfs_quotainv(int argc, char **argv) +{ + int c; + char *mnt; + struct if_quotactl qctl; + int rc; + + memset(&qctl, 0, sizeof(qctl)); + qctl.qc_cmd = LUSTRE_Q_INVALIDATE; + + optind = 0; + while ((c = getopt(argc, argv, "ugf")) != -1) { + switch (c) { + case 'u': + qctl.qc_type |= 0x01; + break; + case 'g': + qctl.qc_type |= 0x02; + break; + case 'f': + qctl.qc_cmd = LUSTRE_Q_FINVALIDATE; + 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, invalidate 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) { + fprintf(stderr, "quotainv failed: %s\n", strerror(errno)); return rc; } @@ -1417,8 +1512,8 @@ do { \ * 2. specifiers may be encountered multiple times (2s3s is 5 seconds) * 3. empty integer value is interpreted as 0 */ - -static unsigned long str2sec(const char* timestr) { +static unsigned long str2sec(const char* timestr) +{ const char spec[] = "smhdw"; const unsigned long mult[] = {1, 60, 60*60, 24*60*60, 7*24*60*60}; unsigned long val = 0; @@ -1439,7 +1534,7 @@ static unsigned long str2sec(const char* timestr) { v = strtoul(timestr, &tail, 10); if (v == ULONG_MAX || *tail == '\0') - /* value too large (ULONG_MAX or more) + /* value too large (ULONG_MAX or more) or missing specifier */ goto error; @@ -1467,87 +1562,246 @@ error: return ULONG_MAX; } -int lfs_setquota(int argc, char **argv) +#define ARG2ULL(nr, str, defscale) \ +do { \ + unsigned long long limit, units = 0; \ + 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 = ((units == 0) ? (defscale) : 1) * limit; \ +} while (0) + +static inline int has_times_option(int argc, char **argv) { - int c; - char *mnt; + int i; + + for (i = 1; i < argc; i++) + if (!strcmp(argv[i], "-t")) + return 1; + + return 0; +} + +int lfs_setquota_times(int argc, char **argv) +{ + int c, rc; struct if_quotactl qctl; - char *obd_type = qctl.obd_type; - char *obd_uuid = qctl.obd_uuid.uuid; - int rc; + char *mnt, *obd_type = (char *)qctl.obd_type; + struct obd_dqblk *dqb = &qctl.qc_dqblk; + struct obd_dqinfo *dqi = &qctl.qc_dqinfo; + struct option long_opts[] = { + {"user", no_argument, 0, 'u'}, + {"group", no_argument, 0, 'g'}, + {"block-grace", required_argument, 0, 'b'}, + {"inode-grace", required_argument, 0, 'i'}, + {"times", no_argument, 0, 't'}, + {0, 0, 0, 0} + }; memset(&qctl, 0, sizeof(qctl)); - qctl.qc_cmd = LUSTRE_Q_SETQUOTA; + qctl.qc_cmd = LUSTRE_Q_SETINFO; + qctl.qc_type = UGQUOTA; optind = 0; - while ((c = getopt(argc, argv, "ugt")) != -1) { + while ((c = getopt_long(argc, argv, "b:i:gtu", long_opts, NULL)) != -1) { switch (c) { case 'u': - qctl.qc_type |= 0x01; - break; case 'g': - qctl.qc_type |= 0x02; + 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; break; - case 't': - qctl.qc_cmd = LUSTRE_Q_SETINFO; + case 'b': + if ((dqi->dqi_bgrace = str2sec(optarg)) == ULONG_MAX) { + fprintf(stderr, "error: bad block-grace: %s\n", + optarg); + return CMD_HELP; + } + dqb->dqb_valid |= QIF_BTIME; break; - default: - fprintf(stderr, "error: %s: option '-%c' " - "unrecognized\n", argv[0], c); + case 'i': + if ((dqi->dqi_igrace = str2sec(optarg)) == ULONG_MAX) { + fprintf(stderr, "error: bad inode-grace: %s\n", + optarg); + return CMD_HELP; + } + dqb->dqb_valid |= QIF_ITIME; + break; + case 't': /* Yes, of course! */ + break; + default: /* getopt prints error message for us when opterr != 0 */ return CMD_HELP; } } - if (qctl.qc_type) - qctl.qc_type--; - if (qctl.qc_type == UGQUOTA) { - fprintf(stderr, "error: user and group quotas can't be set " - "both\n"); + fprintf(stderr, "error: neither -u nor -g specified\n"); return CMD_HELP; } - if (qctl.qc_cmd == LUSTRE_Q_SETQUOTA) { - struct obd_dqblk *dqb = &qctl.qc_dqblk; + if (optind != argc - 1) { + fprintf(stderr, "error: unexpected parameters encountered\n"); + return CMD_HELP; + } - if (optind + 6 != argc) - return CMD_HELP; + mnt = argv[optind]; + rc = llapi_quotactl(mnt, &qctl); + if (rc) { + if (*obd_type) + fprintf(stderr, "%s %s ", obd_type, + obd_uuid2str(&qctl.obd_uuid)); + fprintf(stderr, "setquota failed: %s\n", strerror(errno)); + return rc; + } - rc = name2id(&qctl.qc_id, argv[optind++], qctl.qc_type); - if (rc) { - fprintf(stderr, "error: find id for name %s failed: %s\n", - argv[optind - 1], strerror(errno)); + return 0; +} + +#define BSLIMIT (1 << 0) +#define BHLIMIT (1 << 1) +#define ISLIMIT (1 << 2) +#define IHLIMIT (1 << 3) + +int lfs_setquota(int argc, char **argv) +{ + int c, rc; + struct if_quotactl qctl; + char *mnt, *obd_type = (char *)qctl.obd_type; + struct obd_dqblk *dqb = &qctl.qc_dqblk; + struct option long_opts[] = { + {"user", required_argument, 0, 'u'}, + {"group", required_argument, 0, 'g'}, + {"block-softlimit", required_argument, 0, 'b'}, + {"block-hardlimit", required_argument, 0, 'B'}, + {"inode-softlimit", required_argument, 0, 'i'}, + {"inode-hardlimit", required_argument, 0, 'I'}, + {0, 0, 0, 0} + }; + unsigned limit_mask = 0; + char *endptr; + + 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 */ + + optind = 0; + while ((c = getopt_long(argc, argv, "b:B:i:I:g:u:", 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" + " 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; + } + } + break; + case 'b': + ARG2ULL(dqb->dqb_bsoftlimit, optarg, 1024); + dqb->dqb_bsoftlimit >>= 10; + limit_mask |= BSLIMIT; + break; + case 'B': + ARG2ULL(dqb->dqb_bhardlimit, optarg, 1024); + dqb->dqb_bhardlimit >>= 10; + limit_mask |= BHLIMIT; + break; + case 'i': + ARG2ULL(dqb->dqb_isoftlimit, optarg, 1); + limit_mask |= ISLIMIT; + break; + case 'I': + ARG2ULL(dqb->dqb_ihardlimit, optarg, 1); + limit_mask |= IHLIMIT; + break; + default: /* getopt prints error message for us when opterr != 0 */ return CMD_HELP; } + } - ARG2INT(dqb->dqb_bsoftlimit, argv[optind++], "block-softlimit"); - ARG2INT(dqb->dqb_bhardlimit, argv[optind++], "block-hardlimit"); - ARG2INT(dqb->dqb_isoftlimit, argv[optind++], "inode-softlimit"); - ARG2INT(dqb->dqb_ihardlimit, argv[optind++], "inode-hardlimit"); + if (qctl.qc_type == UGQUOTA) { + fprintf(stderr, "error: neither -u nor -g was specified\n"); + return CMD_HELP; + } - dqb->dqb_valid = QIF_LIMITS; - } else { - struct obd_dqinfo *dqi = &qctl.qc_dqinfo; + if (limit_mask == 0) { + fprintf(stderr, "error: at least one limit must be specified\n"); + return CMD_HELP; + } - if (optind + 3 != argc) - return CMD_HELP; + if (optind != argc - 1) { + fprintf(stderr, "error: unexpected parameters encountered\n"); + return CMD_HELP; + } - if ((dqi->dqi_bgrace = str2sec(argv[optind++])) == ULONG_MAX) { - fprintf(stderr, "error: bad %s: %s\n", "block-grace", argv[optind - 1]); - return CMD_HELP; + mnt = argv[optind]; + + if ((!(limit_mask & BHLIMIT) ^ !(limit_mask & BSLIMIT)) || + (!(limit_mask & IHLIMIT) ^ !(limit_mask & ISLIMIT))) { + /* sigh, we can't just set blimits/ilimits */ + struct if_quotactl tmp_qctl = {.qc_cmd = LUSTRE_Q_GETQUOTA, + .qc_type = qctl.qc_type, + .qc_id = qctl.qc_id}; + + rc = llapi_quotactl(mnt, &tmp_qctl); + if (rc < 0) { + fprintf(stderr, "error: setquota failed while retrieving" + " current quota settings (%s)\n", + strerror(errno)); + return rc; } - if ((dqi->dqi_igrace = str2sec(argv[optind++])) == ULONG_MAX) { - fprintf(stderr, "error: bad %s: %s\n", "inode-grace", argv[optind - 1]); - return CMD_HELP; + + if (!(limit_mask & BHLIMIT)) + dqb->dqb_bhardlimit = tmp_qctl.qc_dqblk.dqb_bhardlimit; + if (!(limit_mask & BSLIMIT)) + dqb->dqb_bsoftlimit = tmp_qctl.qc_dqblk.dqb_bsoftlimit; + if (!(limit_mask & IHLIMIT)) + dqb->dqb_ihardlimit = tmp_qctl.qc_dqblk.dqb_ihardlimit; + if (!(limit_mask & ISLIMIT)) + dqb->dqb_isoftlimit = tmp_qctl.qc_dqblk.dqb_isoftlimit; + + /* Keep grace times if we have got no softlimit arguments */ + if ((limit_mask & BHLIMIT) && !(limit_mask & BSLIMIT)) { + dqb->dqb_valid |= QIF_BTIME; + dqb->dqb_btime = tmp_qctl.qc_dqblk.dqb_btime; + } + + if ((limit_mask & IHLIMIT) && !(limit_mask & ISLIMIT)) { + dqb->dqb_valid |= QIF_ITIME; + dqb->dqb_itime = tmp_qctl.qc_dqblk.dqb_itime; } } - mnt = argv[optind]; + dqb->dqb_valid |= (limit_mask & (BHLIMIT | BSLIMIT)) ? QIF_BLIMITS : 0; + dqb->dqb_valid |= (limit_mask & (IHLIMIT | ISLIMIT)) ? QIF_ILIMITS : 0; rc = llapi_quotactl(mnt, &qctl); if (rc) { if (*obd_type) - fprintf(stderr, "%s %s ", obd_type, obd_uuid); + fprintf(stderr, "%s %s ", obd_type, + obd_uuid2str(&qctl.obd_uuid)); fprintf(stderr, "setquota failed: %s\n", strerror(errno)); return rc; } @@ -1565,7 +1819,6 @@ static inline char *type2name(int check_type) return "unknown"; } - /* Converts seconds value into format string * result is returned in buf * Notes: @@ -1573,12 +1826,12 @@ static inline char *type2name(int check_type) * 2. zero fields are not filled (except for p. 3): 5d1s * 3. zero seconds value is presented as "0s" */ -static void sec2str(time_t seconds, char *buf) +static char * __sec2str(time_t seconds, char *buf) { const char spec[] = "smhdw"; const unsigned long mult[] = {1, 60, 60*60, 24*60*60, 7*24*60*60}; unsigned long c; - char* tail = buf; + char *tail = buf; int i; for (i = sizeof(mult) / sizeof(mult[0]) - 1 ; i >= 0; i--) { @@ -1589,8 +1842,24 @@ static void sec2str(time_t seconds, char *buf) seconds %= mult[i]; } + + return tail; } +static void sec2str(time_t seconds, char *buf, int rc) +{ + char *tail = buf; + + if (rc) + *tail++ = '['; + + tail = __sec2str(seconds, tail); + + if (rc && tail - buf < 39) { + *tail++ = ']'; + *tail++ = 0; + } +} static void diff2str(time_t seconds, char *buf, time_t now) { @@ -1602,7 +1871,7 @@ static void diff2str(time_t seconds, char *buf, time_t now) strcpy(buf, "none"); return; } - sec2str(seconds - now, buf); + __sec2str(seconds - now, buf); } static void print_quota_title(char *name, struct if_quotactl *qctl) @@ -1616,7 +1885,7 @@ static void print_quota_title(char *name, struct if_quotactl *qctl) "files", "quota", "limit", "grace"); } -static void print_quota(char *mnt, struct if_quotactl *qctl, int ost_only) +static void print_quota(char *mnt, struct if_quotactl *qctl, int type, int rc) { time_t now; @@ -1627,10 +1896,10 @@ static void print_quota(char *mnt, struct if_quotactl *qctl, int ost_only) struct obd_dqblk *dqb = &qctl->qc_dqblk; if (dqb->dqb_bhardlimit && - toqb(dqb->dqb_curspace) > dqb->dqb_bhardlimit) { + toqb(dqb->dqb_curspace) >= dqb->dqb_bhardlimit) { bover = 1; } else if (dqb->dqb_bsoftlimit && - toqb(dqb->dqb_curspace) > dqb->dqb_bsoftlimit) { + toqb(dqb->dqb_curspace) >= dqb->dqb_bsoftlimit) { if (dqb->dqb_btime > now) { bover = 2; } else { @@ -1639,10 +1908,10 @@ static void print_quota(char *mnt, struct if_quotactl *qctl, int ost_only) } if (dqb->dqb_ihardlimit && - dqb->dqb_curinodes > dqb->dqb_ihardlimit) { + dqb->dqb_curinodes >= dqb->dqb_ihardlimit) { iover = 1; } else if (dqb->dqb_isoftlimit && - dqb->dqb_curinodes > dqb->dqb_isoftlimit) { + dqb->dqb_curinodes >= dqb->dqb_isoftlimit) { if (dqb->dqb_btime > now) { iover = 2; } else { @@ -1664,24 +1933,45 @@ static void print_quota(char *mnt, struct if_quotactl *qctl, int ost_only) if (bover) diff2str(dqb->dqb_btime, timebuf, now); - - sprintf(numbuf[0], LPU64, toqb(dqb->dqb_curspace)); - sprintf(numbuf[1], LPU64, dqb->dqb_bsoftlimit); - sprintf(numbuf[2], LPU64, dqb->dqb_bhardlimit); + if (rc == -1 && errno == 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 : ""); + numbuf[2], bover > 1 ? timebuf : "-"); if (iover) diff2str(dqb->dqb_itime, timebuf, now); - sprintf(numbuf[0], LPU64, dqb->dqb_curinodes); - sprintf(numbuf[1], LPU64, dqb->dqb_isoftlimit); - sprintf(numbuf[2], LPU64, dqb->dqb_ihardlimit); - if (!ost_only) + 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 : ""); + numbuf[2], iover > 1 ? timebuf : "-"); + else + printf(" %7s %7s %7s %7s", "-", "-", "-", "-"); printf("\n"); } } else if (qctl->qc_cmd == LUSTRE_Q_GETINFO || @@ -1689,110 +1979,101 @@ static void print_quota(char *mnt, struct if_quotactl *qctl, int ost_only) char bgtimebuf[40]; char igtimebuf[40]; - sec2str(qctl->qc_dqinfo.dqi_bgrace, bgtimebuf); - sec2str(qctl->qc_dqinfo.dqi_igrace, igtimebuf); + sec2str(qctl->qc_dqinfo.dqi_bgrace, bgtimebuf, rc); + sec2str(qctl->qc_dqinfo.dqi_igrace, igtimebuf, rc); printf("Block grace time: %s; Inode grace time: %s\n", bgtimebuf, igtimebuf); } } -static void print_mds_quota(char *mnt, struct if_quotactl *qctl) +static int print_obd_quota(char *mnt, struct if_quotactl *qctl, int is_mdt) { - int rc; + int rc = 0, rc1 = 0, count = 0; + __u32 valid = qctl->qc_valid; - /* XXX: this is a flag to mark that only mds quota is wanted */ - qctl->qc_dqblk.dqb_valid = 1; - rc = llapi_quotactl(mnt, qctl); + rc = llapi_get_obd_count(mnt, &count, is_mdt); if (rc) { - fprintf(stderr, "quotactl failed: %s\n", strerror(errno)); - return; - } - qctl->qc_dqblk.dqb_valid = 0; - - print_quota(qctl->obd_uuid.uuid, qctl, 0); -} - -static void print_lov_quota(char *mnt, struct if_quotactl *qctl) -{ - DIR *dir; - struct obd_uuid *uuids = NULL, *uuidp; - int obdcount = 1024; - int i, rc; - - dir = opendir(mnt); - if (!dir) { - fprintf(stderr, "open %s failed: %s\n", mnt, strerror(errno)); - return; - } - - uuids = (struct obd_uuid *)malloc(INIT_ALLOC_NUM_OSTS * - sizeof(struct obd_uuid)); - if (uuids == NULL) - goto out; - -retry_get_uuids: - rc = llapi_lov_get_uuids(dirfd(dir), uuids, &obdcount); - if (rc != 0) { - struct obd_uuid *uuids_temp; - - if (rc == -EOVERFLOW) { - uuids_temp = realloc(uuids, obdcount * - sizeof(struct obd_uuid)); - if (uuids_temp != NULL) - goto retry_get_uuids; - else - rc = -ENOMEM; - } - - fprintf(stderr, "get ost uuid failed: %s\n", strerror(rc)); - goto out; + fprintf(stderr, "can not get %s count: %s\n", + is_mdt ? "mdt": "ost", strerror(errno)); + return rc; } - for (i = 0, uuidp = uuids; i < obdcount; i++, uuidp++) { - memcpy(&qctl->obd_uuid, uuidp, sizeof(*uuidp)); - - /* XXX clear this flag to get quota from osts */ - qctl->qc_dqblk.dqb_valid = 0; + for (qctl->qc_idx = 0; qctl->qc_idx < count; qctl->qc_idx++) { + qctl->qc_valid = is_mdt ? QC_MDTIDX : QC_OSTIDX; rc = llapi_quotactl(mnt, qctl); if (rc) { - fprintf(stderr, "%s quotactl failed: %s\n", - uuidp->uuid, strerror(errno)); + /* It is remote client case. */ + if (errno == EOPNOTSUPP) { + rc = 0; + goto out; + } + + if (!rc1) + rc1 = rc; + fprintf(stderr, "quotactl %s%d failed.\n", + is_mdt ? "mdt": "ost", qctl->qc_idx); continue; } - print_quota(uuidp->uuid, qctl, 1); + print_quota(obd_uuid2str(&qctl->obd_uuid), qctl, qctl->qc_valid, 0); } out: - closedir(dir); - return; + qctl->qc_valid = valid; + return rc ? : rc1; } static int lfs_quota(int argc, char **argv) { int c; - char *name = NULL, *mnt; + char *mnt, *name = NULL; struct if_quotactl qctl = { .qc_cmd = LUSTRE_Q_GETQUOTA, - .qc_type = 0x01 }; - char *obd_type = qctl.obd_type; - char *obd_uuid = qctl.obd_uuid.uuid; - int rc; + .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; optind = 0; - while ((c = getopt(argc, argv, "ugto:")) != -1) { + while ((c = getopt(argc, argv, "ugto:i:I:qv")) != -1) { switch (c) { case 'u': - qctl.qc_type = 0x01; + if (qctl.qc_type != UGQUOTA) { + fprintf(stderr, "error: use either -u or -g\n"); + return CMD_HELP; + } + qctl.qc_type = USRQUOTA; break; case 'g': - qctl.qc_type = 0x02; + if (qctl.qc_type != UGQUOTA) { + fprintf(stderr, "error: use either -u or -g\n"); + return CMD_HELP; + } + qctl.qc_type = GRPQUOTA; 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)); break; + case 'i': + valid = qctl.qc_valid = QC_MDTIDX; + idx = qctl.qc_idx = atoi(optarg); + break; + case 'I': + valid = qctl.qc_valid = QC_OSTIDX; + idx = qctl.qc_idx = atoi(optarg); + break; + case 'v': + verbose = 1; + break; + case 'q': + quiet = 1; + break; default: fprintf(stderr, "error: %s: option '-%c' " "unrecognized\n", argv[0], c); @@ -1800,57 +2081,100 @@ static int lfs_quota(int argc, char **argv) } } - if (qctl.qc_type) - qctl.qc_type--; - - - if (qctl.qc_cmd == LUSTRE_Q_GETQUOTA) { - if (optind + 2 != argc) { + /* 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); + rc = name2id(&qctl.qc_id, name, + (qctl.qc_type == USRQUOTA) ? USER : GROUP); if (rc) { - fprintf(stderr,"error: can't find id for name %s: %s\n", - name, strerror(errno)); - return CMD_HELP; + 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; + } } - print_quota_title(name, &qctl); - } else if (optind + 1 != argc) { + } else if (optind + 1 != argc || qctl.qc_type == UGQUOTA) { fprintf(stderr, "error: missing quota info argument(s)\n"); return CMD_HELP; } mnt = argv[optind]; - rc = llapi_quotactl(mnt, &qctl); - if (rc) { - if (*obd_type) - fprintf(stderr, "%s %s ", obd_type, obd_uuid); - fprintf(stderr, "quota failed: %s\n", strerror(errno)); - return rc; + rc1 = llapi_quotactl(mnt, &qctl); + if (rc1 == -1) { + switch (errno) { + 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(errno)); + } } - if (!name) - rc = id2name(&name, getuid(), qctl.qc_type); + if (qctl.qc_cmd == LUSTRE_Q_GETQUOTA && !quiet) + print_quota_title(name, &qctl); + + if (rc1 && *obd_type) + fprintf(stderr, "%s %s ", obd_type, obd_uuid); - if (*obd_uuid) { + if (qctl.qc_valid != QC_GENERAL) mnt = ""; - name = obd_uuid; - } - print_quota(mnt, &qctl, 0); + 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); - if (!*obd_uuid && qctl.qc_cmd != LUSTRE_Q_GETINFO) { - print_mds_quota(mnt, &qctl); - print_lov_quota(mnt, &qctl); + 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); } - return 0; + 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; + + return rc1; } -#endif /* HAVE_QUOTA_SUPPORT */ +#endif /* HAVE_SYS_QUOTA_H! */ static int flushctx_ioctl(char *mp) { @@ -1892,8 +2216,13 @@ static int lfs_flushctx(int argc, char **argv) } } - if (kdestroy) - system("kdestroy > /dev/null"); + 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. */ @@ -1972,6 +2301,212 @@ static int lfs_ls(int argc, char **argv) return(llapi_ls(argc, argv)); } +static int lfs_changelog(int argc, char **argv) +{ + void *changelog_priv; + struct changelog_rec *rec; + long long startrec = 0, endrec = 0; + char *mdd; + struct option long_opts[] = { + {"follow", no_argument, 0, 'f'}, + {0, 0, 0, 0} + }; + char short_opts[] = "f"; + int rc, follow = 0; + + optind = 0; + while ((rc = getopt_long(argc, argv, short_opts, + long_opts, NULL)) != -1) { + switch (rc) { + case 'f': + follow++; + break; + case '?': + return CMD_HELP; + default: + fprintf(stderr, "error: %s: option '%s' unrecognized\n", + argv[0], argv[optind - 1]); + return CMD_HELP; + } + } + if (optind >= argc) + return CMD_HELP; + + mdd = argv[optind++]; + if (argc > optind) + startrec = strtoll(argv[optind++], NULL, 10); + if (argc > optind) + endrec = strtoll(argv[optind++], NULL, 10); + + rc = llapi_changelog_start(&changelog_priv, + CHANGELOG_FLAG_BLOCK | + (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; + + 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\n", PFID(&rec->cr_pfid), + rec->cr_namelen, rec->cr_name); + else + printf("\n"); + + llapi_changelog_free(&rec); + } + + llapi_changelog_fini(&changelog_priv); + + if (rc < 0) + fprintf(stderr, "Changelog: %s\n", strerror(errno = -rc)); + + return (rc == 1 ? 0 : rc); +} + +static int lfs_changelog_clear(int argc, char **argv) +{ + long long endrec; + int rc; + + if (argc != 4) + return CMD_HELP; + + 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; +} + +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; + int rc; + + optind = 0; + + while ((rc = getopt_long(argc, argv, short_opts, + long_opts, NULL)) != -1) { + switch (rc) { + case 'c': + printcur++; + break; + case 'l': + linkno = strtol(optarg, NULL, 10); + break; + case 'r': + recno = strtoll(optarg, NULL, 10); + break; + case '?': + return CMD_HELP; + default: + fprintf(stderr, "error: %s: option '%s' unrecognized\n", + argv[0], argv[optind - 1]); + return CMD_HELP; + } + } + device = argv[optind++]; + fid = argv[optind++]; + if (optind != argc) + return CMD_HELP; + + path = calloc(1, PATH_MAX); + + 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; + } + + 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; +} + +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; + } + + printf(DFID"\n", PFID(&fid)); + + return 0; +} + int main(int argc, char **argv) { int rc; @@ -1993,5 +2528,6 @@ int main(int argc, char **argv) } obd_finalize(argc, argv); - return rc; + return rc < 0 ? -rc : rc; } +