X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Futils%2Flfs.c;h=69433cdcda012684806ad030a27b2aaef6471fca;hb=5833895424f425d6552eedd8a34488dad0c1676b;hp=4c7a99e1863de5ec79eb952db0399d18a83a34cc;hpb=69efd816d879bda5627e68bf701fb420ac12f2b4;p=fs%2Flustre-release.git diff --git a/lustre/utils/lfs.c b/lustre/utils/lfs.c index 4c7a99e..69433cd 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 2008 Sun Microsystems, Inc. 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,8 +59,13 @@ #include #include #include +#ifdef HAVE_SYS_QUOTA_H +# include +#endif + /* For dirname() */ #include +#include #include #include @@ -48,7 +75,7 @@ #include #include -#include "parser.h" +#include #include "obdctl.h" unsigned int libcfs_subsystem_debug = 0; @@ -61,18 +88,28 @@ 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); -static int lfs_getfacl(int argc, char **argv); -static int lfs_setfacl(int argc, char **argv); +static int lfs_lsetfacl(int argc, char **argv); +static int lfs_lgetfacl(int argc, char **argv); +static int lfs_rsetfacl(int argc, char **argv); +static int lfs_rgetfacl(int argc, char **argv); +static int lfs_cp(int argc, char **argv); +static int lfs_ls(int argc, char **argv); +static int lfs_poollist(int argc, char **argv); +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[] = { @@ -80,28 +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] [--offset|-o start_ost]\n" + " [--count|-c stripe_count] [--pool|-p pool_name]\n" + " \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: OST index of first stripe (-1 filesystem default)\n" + "\tstripe_count: Number of OSTs to stripe over (0 default, -1 all)\n" + "\tpool_name: 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" + " [--count | -c ] [--size | -s ] [--index | -i ]\n" + " [--offset | -o ] [--pool | -p ]\n" " [--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 ] [[!] --type|-t ]\n" + " [--print|-p] [--obd|-O ] [[!] --size|-s [+-]N[bkMGTP]]\n" + " [[!] --type|-t ] [[!] --gid|-g N] [[!] --group|-G ]\n" + " [[!] --uid|-u N] [[!] --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"}, @@ -122,7 +167,7 @@ command_t cmdlist[] = { "report filesystem disk space usage or inodes usage" "of each MDS/OSD.\n" "Usage: df [-i] [-h] [path]"}, -#ifdef HAVE_QUOTA_SUPPORT +#ifdef HAVE_SYS_QUOTA_H {"quotachown",lfs_quotachown, 0, "Change files' owner or group on the specified filesystem.\n" "usage: quotachown [-i] \n" @@ -136,25 +181,83 @@ 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 ] -b -B -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 [-v] [-o obd_uuid|-i mdt_idx|-I ost_idx] [{-u|-g }|-t] "}, + {"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...]"}, - {"getfacl", lfs_getfacl, 0, - "Get file access control list in remote client.\n" - "usage: getfacl [-dRLPvh] file"}, - {"setfacl", lfs_setfacl, 0, - "Set file access control list in remote client.\n" - "usage: setfacl [-bkndRLPvh] [{-m|-x} acl_spec] [{-M|-X} acl_file] file"}, + {"lsetfacl", lfs_lsetfacl, 0, + "Remote user setfacl for user/group on the same remote client.\n" + "usage: lsetfacl [-bkndRLPvh] [{-m|-x} acl_spec] [{-M|-X} acl_file] file ..."}, + {"lgetfacl", lfs_lgetfacl, 0, + "Remote user getfacl for user/group on the same remote client.\n" + "usage: lgetfacl [-dRLPvh] file ..."}, + {"rsetfacl", lfs_rsetfacl, 0, + "Remote user setfacl for user/group on other clients.\n" + "usage: rsetfacl [-bkndRLPvh] [{-m|-x} acl_spec] [{-M|-X} acl_file] file ..."}, + {"rgetfacl", lfs_rgetfacl, 0, + "Remote user getfacl for user/group on other clients.\n" + "usage: rgetfacl [-dRLPvh] file ..."}, + {"cp", lfs_cp, 0, + "Remote user copy files and directories.\n" + "usage: cp [OPTION]... [-T] SOURCE DEST\n\tcp [OPTION]... SOURCE... DIRECTORY\n\tcp [OPTION]... -t DIRECTORY SOURCE..."}, + {"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 [--follow] [startrec [endrec]]" + "\n(note: --follow is only valid when run on MDT node)"}, + {"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) { @@ -168,12 +271,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} }; @@ -181,15 +287,12 @@ 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])) ) { + +#if LUSTRE_VERSION < OBD_OCD_VERSION(2,1,0,0) + if (argc == 5 && argv[1][0] != '-' && + isnumber(argv[2]) && isnumber(argv[3]) && isnumber(argv[4])) { + fprintf(stderr, "warning: deprecated usage of setstripe " + "positional parameters. Use -c, -i, -s instead.\n"); /* for compatibility with the existing positional parameter * usage */ fname = argv[1]; @@ -197,10 +300,14 @@ static int lfs_setstripe(int argc, char **argv) stripe_off_arg = argv[3]; stripe_count_arg = argv[4]; optind = 4; - } else { - while ((c = getopt_long(argc, argv, "c:di:s:", - long_opts, NULL)) >= 0) - { + } else +#else +#warning "remove obsolete positional parameter code" +#endif + { + optind = 0; + while ((c = getopt_long(argc, argv, "c:di:o:s:p:", + long_opts, NULL)) >= 0) { switch (c) { case 0: /* Long options. */ @@ -213,11 +320,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: @@ -227,34 +338,31 @@ 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; } } @@ -277,19 +385,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] == '-') @@ -310,6 +432,64 @@ 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 == USER) { + struct passwd *entry; + + if (!(entry = getpwnam(name))) { + if (!errno) + errno = ENOENT; + return -1; + } + + *id = entry->pw_uid; + } else { + struct group *entry; + + if (!(entry = getgrnam(name))) { + if (!errno) + errno = ENOENT; + return -1; + } + + *id = entry->gr_gid; + } + + return 0; +} + +static int id2name(char **name, unsigned int id, int type) +{ + if (type == USER) { + struct passwd *entry; + + if (!(entry = getpwuid(id))) { + if (!errno) + errno = ENOENT; + return -1; + } + + *name = entry->pw_name; + } else { + struct group *entry; + + if (!(entry = getgrgid(id))) { + if (!errno) + errno = ENOENT; + return -1; + } + + *name = entry->gr_name; + } + + return 0; +} + +#define FIND_POOL_OPT 3 static int lfs_find(int argc, char **argv) { int new_fashion = 1; @@ -323,7 +503,13 @@ static int lfs_find(int argc, char **argv) {"ctime", required_argument, 0, 'C'}, {"mtime", required_argument, 0, 'M'}, {"maxdepth", required_argument, 0, 'D'}, + {"gid", required_argument, 0, 'g'}, + {"group", required_argument, 0, 'G'}, + {"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'}, @@ -343,16 +529,25 @@ static int lfs_find(int argc, char **argv) time_t *xtime; int *xsign; int isoption; + char *endptr; time(&t); - while ((c = getopt_long_only(argc, argv, "-A:C:D:M:n:PpO:qrs:t:v", + optind = 0; + /* 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 " @@ -374,6 +569,9 @@ 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; @@ -413,6 +611,70 @@ static int lfs_find(int argc, char **argv) new_fashion = 1; 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; + param.gid = strtol(optarg, &endptr, 10); + if (optarg == endptr) { + ret = name2id(¶m.gid, optarg, GROUP); + if (ret != 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': + new_fashion = 1; + param.uid = strtol(optarg, &endptr, 10); + if (optarg == endptr) { + fprintf(stderr, "Bad uid: %s\n", optarg); + return CMD_HELP; + } + param.exclude_uid = !!neg_opt; + param.check_uid = 1; + break; + case 'U': + new_fashion = 1; + param.uid = strtol(optarg, &endptr, 10); + if (optarg == endptr) { + ret = name2id(¶m.uid, optarg, USER); + if (ret != 0) { + fprintf(stderr, "User/UID: %s cannot " + "be found.\n", optarg); + return -1; + } + } + param.exclude_uid = !!neg_opt; + param.check_uid = 1; + break; + case FIND_POOL_OPT: + new_fashion = 1; + if (strlen(optarg) > LOV_MAXPOOLNAME) { + fprintf(stderr, + "Pool name %s is too long" + " (max is %d)\n", optarg, + LOV_MAXPOOLNAME); + return -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; param.pattern = (char *)optarg; @@ -429,7 +691,7 @@ static int lfs_find(int argc, char **argv) strcpy(buf, (char *)optarg); 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; @@ -504,7 +766,8 @@ 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); @@ -524,7 +787,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]); @@ -546,7 +809,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); @@ -570,10 +833,15 @@ 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'}, {0, 0, 0, 0} }; - char short_opts[] = "hO:qrv"; + char short_opts[] = "hO:qrvcsiop"; int c, rc; struct find_param param = { 0 }; @@ -592,15 +860,27 @@ static int lfs_getstripe(int argc, char **argv) break; case 'q': param.quiet++; - param.verbose = 0; break; case 'r': param.recursive = 1; break; case 'v': - param.verbose++; + param.verbose = VERBOSE_ALL | VERBOSE_DETAIL; param.quiet = 0; break; + case 'c': + param.verbose |= VERBOSE_COUNT; + break; + case 's': + param.verbose |= VERBOSE_SIZE; + break; + case 'i': + case 'o': + param.verbose |= VERBOSE_OFFSET; + break; + case 'p': + param.verbose |= VERBOSE_POOL; + break; case '?': return CMD_HELP; default: @@ -620,7 +900,7 @@ static int lfs_getstripe(int argc, char **argv) } 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; } @@ -629,7 +909,6 @@ static int lfs_osts(int argc, char **argv) { FILE *fp; struct mntent *mnt = NULL; - struct obd_uuid *obduuid = NULL; struct find_param param; int rc=0; @@ -643,9 +922,8 @@ static int lfs_osts(int argc, char **argv) strerror (errno)); } else { mnt = getmntent(fp); - memset(¶m, 0, sizeof(param)); - param.obduuid = obduuid; while (feof(fp) == 0 && ferror(fp) ==0) { + memset(¶m, 0, sizeof(param)); if (llapi_is_lustre_mnt(mnt)) { rc = llapi_getstripe(mnt->mnt_dir, ¶m); if (rc) @@ -720,7 +998,8 @@ static int showdf(char *mntdir, struct obd_statfs *stat, long long avail, used, total; double ratio = 0; char *suffix = "KMGTPEZY"; - char tbuf[10], ubuf[10], abuf[10], rbuf[10]; + /* Note if we have >2^64 bytes/fs these buffers will need to be grown */ + char tbuf[20], ubuf[20], abuf[20], rbuf[20]; if (!uuid || !stat) return -EINVAL; @@ -822,12 +1101,12 @@ static int mntdf(char *mntdir, int ishow, int cooked) if (rc == -ENOTCONN || rc == -ETIMEDOUT || rc == -EIO || rc == -ENODATA || rc == 0) { - showdf(mntdir, &stat_buf, uuid_buf.uuid, ishow, cooked, - "MDT", index, rc); + showdf(mntdir, &stat_buf, obd_uuid2str(&uuid_buf), + ishow, cooked, "MDT", index, rc); } else { fprintf(stderr, "error: llapi_obd_statfs(%s): %s (%d)\n", - uuid_buf.uuid, strerror(-rc), rc); + obd_uuid2str(&uuid_buf), strerror(-rc), rc); return rc; } if (rc == 0) { @@ -849,8 +1128,8 @@ static int mntdf(char *mntdir, int ishow, int cooked) if (rc == -ENOTCONN || rc == -ETIMEDOUT || rc == -EIO || rc == -ENODATA || rc == 0) { - showdf(mntdir, &stat_buf, uuid_buf.uuid, ishow, cooked, - "OST", index, rc); + showdf(mntdir, &stat_buf, obd_uuid2str(&uuid_buf), + ishow, cooked, "OST", index, rc); } else { fprintf(stderr, "error: llapi_obd_statfs failed: %s (%d)\n", @@ -875,7 +1154,7 @@ static int lfs_df(int argc, char **argv) FILE *fp; char *path = NULL; struct mntent *mnt = NULL; - char mntdir[PATH_MAX] = {'\0'}; + char *mntdir = NULL; int ishow = 0, cooked = 0; int c, rc = 0; @@ -902,10 +1181,19 @@ static int lfs_df(int argc, char **argv) argv[0], MOUNTED, strerror(errno)); 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, sizeof(mntdir)); + rc = path2mnt(path, fp, mntdir, PATH_MAX); if (rc) { endmntent(fp); + free(mntdir); return rc; } @@ -926,6 +1214,7 @@ static int lfs_df(int argc, char **argv) endmntent(fp); } + free(mntdir); return rc; } @@ -978,7 +1267,8 @@ static int lfs_check(int argc, char **argv) return -1; } - rc = llapi_target_check(num_types, obd_types, mnt->mnt_dir); + rc = llapi_target_iterate(num_types, obd_types, + mnt->mnt_dir, llapi_ping_target); if (rc) fprintf(stderr, "error: %s: %s status failed\n", @@ -1060,13 +1350,14 @@ out: return rc; } -#ifdef HAVE_QUOTA_SUPPORT +#ifdef HAVE_SYS_QUOTA_H static int lfs_quotachown(int argc, char **argv) { int c,rc; int flag = 0; + optind = 0; while ((c = getopt(argc, argv, "i")) != -1) { switch (c) { case 'i': @@ -1086,15 +1377,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)); @@ -1127,10 +1416,9 @@ static int lfs_quotacheck(int argc, char **argv) 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) { + if (rc && errno != EALREADY) { fprintf(stderr, "quota off failed: %s\n", strerror(errno)); return rc; } @@ -1144,20 +1432,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; @@ -1171,13 +1459,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) { @@ -1210,13 +1496,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) { + fprintf(stderr, "\n%s quotas are enabled already.\n", + qctl.qc_type == 0x02 ? "user/group" : + (qctl.qc_type == 0x00 ? "user" : "group")); + rc = 0; + } 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) @@ -1224,8 +1518,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)); @@ -1259,64 +1552,66 @@ 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)); - return rc; + if (errno == EALREADY) { + fprintf(stderr, "\n%s quotas are disabled already.\n", + qctl.qc_type == 0x02 ? "user/group" : + (qctl.qc_type == 0x00 ? "user" : "group")); + 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 0; + return rc; } -static int name2id(unsigned int *id, char *name, int type) +static int lfs_quotainv(int argc, char **argv) { - if (type == USRQUOTA) { - struct passwd *entry; - - if (!(entry = getpwnam(name))) { - if (!errno) - errno = ENOENT; - return -1; - } + int c; + char *mnt; + struct if_quotactl qctl; + int rc; - *id = entry->pw_uid; - } else { - struct group *entry; + memset(&qctl, 0, sizeof(qctl)); + qctl.qc_cmd = LUSTRE_Q_INVALIDATE; - if (!(entry = getgrnam(name))) { - if (!errno) - errno = ENOENT; - return -1; + 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; } - - *id = entry->gr_gid; } - return 0; -} - -static int id2name(char **name, unsigned int id, int type) -{ - if (type == USRQUOTA) { - struct passwd *entry; - - if (!(entry = getpwuid(id))) { - if (!errno) - errno = ENOENT; - return -1; - } + if (qctl.qc_type) + qctl.qc_type--; + else /* by default, invalidate quota for both user & group */ + qctl.qc_type = 0x02; - *name = entry->pw_name; - } else { - struct group *entry; + if (argc == optind) + return CMD_HELP; - if (!(entry = getgrgid(id))) { - if (!errno) - errno = ENOENT; - return -1; - } + mnt = argv[optind]; - *name = entry->gr_name; + rc = llapi_quotactl(mnt, &qctl); + if (rc) { + fprintf(stderr, "quotainv failed: %s\n", strerror(errno)); + return rc; } return 0; @@ -1341,7 +1636,7 @@ do { \ * 2. specifiers may be encountered multiple times (2s3s is 5 seconds) * 3. empty integer value is interpreted as 0 */ - + static unsigned long str2sec(const char* timestr) { const char spec[] = "smhdw"; const unsigned long mult[] = {1, 60, 60*60, 24*60*60, 7*24*60*60}; @@ -1363,7 +1658,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; @@ -1391,87 +1686,229 @@ 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, "ugb:i:t", 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 CMD_HELP; - } + return 0; +} - 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"); +#define BSLIMIT (1 << 0) +#define BHLIMIT (1 << 1) +#define ISLIMIT (1 << 2) +#define IHLIMIT (1 << 3) - dqb->dqb_valid = QIF_LIMITS; - } else { - struct obd_dqinfo *dqi = &qctl.qc_dqinfo; +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; - if (optind + 3 != argc) - return CMD_HELP; + 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 */ - if ((dqi->dqi_bgrace = str2sec(argv[optind++])) == ULONG_MAX) { - fprintf(stderr, "error: bad %s: %s\n", "block-grace", argv[optind - 1]); + optind = 0; + while ((c = getopt_long(argc, argv, "u:g:b:B:i:I:", 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) { + fprintf(stderr, "error: unknown id %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; } - if ((dqi->dqi_igrace = str2sec(argv[optind++])) == ULONG_MAX) { - fprintf(stderr, "error: bad %s: %s\n", "inode-grace", argv[optind - 1]); + } + + if (qctl.qc_type == UGQUOTA) { + fprintf(stderr, "error: neither -u nor -g are specified\n"); + return CMD_HELP; + } + + if (limit_mask == 0) { + fprintf(stderr, "error: at least one limit must be specified\n"); + return CMD_HELP; + } + + if (optind != argc - 1) { + fprintf(stderr, "error: unexpected parameters encountered\n"); + 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: getquota failed\n"); 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; } - 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; } @@ -1540,7 +1977,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; @@ -1551,10 +1988,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 { @@ -1563,10 +2000,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 { @@ -1588,10 +2025,22 @@ 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 : ""); @@ -1599,10 +2048,17 @@ static void print_quota(char *mnt, struct if_quotactl *qctl, int ost_only) 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 : ""); @@ -1620,103 +2076,89 @@ static void print_quota(char *mnt, struct if_quotactl *qctl, int ost_only) } } -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; + __u32 valid = QC_GENERAL, idx = 0; optind = 0; - while ((c = getopt(argc, argv, "ugto:")) != -1) { + while ((c = getopt(argc, argv, "ugto:i:I:v")) != -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; default: fprintf(stderr, "error: %s: option '-%c' " "unrecognized\n", argv[0], c); @@ -1724,57 +2166,82 @@ 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; } - 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; } + if (qctl.qc_cmd == LUSTRE_Q_GETQUOTA) + print_quota_title(name, &qctl); + 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 && errno == EALREADY) { + fprintf(stderr, "\n%s quotas are not enabled.\n", + qctl.qc_type == USRQUOTA ? "user" : "group"); + goto out; } + if (rc1 && *obd_type) + fprintf(stderr, "%s %s ", obd_type, obd_uuid); - if (!name) - rc = id2name(&name, getuid(), qctl.qc_type); - - if (*obd_uuid) { + if (qctl.qc_valid != QC_GENERAL) mnt = ""; - name = obd_uuid; - } - print_quota(mnt, &qctl, 0); + 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); } + if (rc1 || rc2 || rc3) + 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 0; } -#endif /* HAVE_QUOTA_SUPPORT */ +#endif /* HAVE_SYS_QUOTA_H! */ static int flushctx_ioctl(char *mp) { @@ -1862,117 +2329,268 @@ static int lfs_flushctx(int argc, char **argv) return rc; } -/* - * We assume one and only one filename is supplied as the - * last parameter. - */ -static int acl_cmd_parse(int argc, char **argv, char *fname, char *cmd) +static int lfs_lsetfacl(int argc, char **argv) { - char *dname, *rpath = NULL; - char path[PATH_MAX], cwd[PATH_MAX]; - FILE *fp; - struct mntent *mnt; - int i; + argv[0]++; + return(llapi_lsetfacl(argc, argv)); +} - if (argc < 2) - return -1; +static int lfs_lgetfacl(int argc, char **argv) +{ + argv[0]++; + return(llapi_lgetfacl(argc, argv)); +} - /* FIXME the premise is there is no sub-mounted filesystems under this - * mounted lustre tree. */ - strncpy(fname, argv[argc - 1], PATH_MAX); +static int lfs_rsetfacl(int argc, char **argv) +{ + argv[0]++; + return(llapi_rsetfacl(argc, argv)); +} - /* get path prefix */ - dname = dirname(fname); +static int lfs_rgetfacl(int argc, char **argv) +{ + argv[0]++; + return(llapi_rgetfacl(argc, argv)); +} - /* try to resolve the pathname into relative to the root of the mounted - * lustre filesystem. - */ - if (getcwd(cwd, sizeof(cwd)) == NULL) { - fprintf(stderr, "getcwd %s failed: %s\n", cwd, strerror(errno)); - return -1; - } +static int lfs_cp(int argc, char **argv) +{ + return(llapi_cp(argc, argv)); +} - if (chdir(dname) == -1) { - fprintf(stderr, "chdir to %s failed: %s\n", - dname, strerror(errno)); - return -1; - } +static int lfs_ls(int argc, char **argv) +{ + return(llapi_ls(argc, argv)); +} - if (getcwd(path, sizeof(path)) == NULL) { - fprintf(stderr, "getcwd %s: %s\n", path, strerror(errno)); - return -1; +/* A helper function to return single, whole lines delimited by newline. + Returns length of line. Not reentrant! */ +static int get_next_full_line(int fd, char **ptr) +{ + static char buf[8192]; /* bigger than MAX_PATH_LENGTH */ + static char *sptr = buf, *eptr = buf; + static int len, rem; + + if ((*ptr == NULL) /* first time */ + || (eptr >= buf + len) /* buffer empty */) { + sptr = eptr = buf; + len = read(fd, buf, sizeof(buf)); + if (len <= 0) + return len; + } else { + sptr = eptr + 1; } - if (chdir(cwd) == -1) { - fprintf(stderr, "chdir back to %s: %s\n", - cwd, strerror(errno)); - return -1; +full_line: + while (eptr < buf + len) { + eptr++; + /* parse full lines */ + if (*eptr == '\n') { + *eptr = '\0'; + *ptr = sptr; + return (eptr - sptr); + } } - strncat(path, "/", PATH_MAX); - strncpy(fname, argv[argc - 1], PATH_MAX); - strncat(path, basename(fname), PATH_MAX); + /* partial line; move to front of buf */ + rem = buf + len - sptr; + memcpy(buf, sptr, rem); + sptr = buf; + eptr = buf + rem; + len = read(fd, eptr, sizeof(buf) - rem); + if (len <= 0) + return len; + len += rem; + goto full_line; +} - fp = setmntent(MOUNTED, "r"); - if (fp == NULL) { - fprintf(stderr, "setmntent %s failed: %s\n", - MOUNTED, strerror(errno)); - return -1; - } +static int lfs_changelog(int argc, char **argv) +{ + long long startrec = 0, endrec = 0, recnum; + int fd, len; + char c, *mdd, *ptr = NULL; + struct option long_opts[] = { + {"follow", no_argument, 0, 'f'}, + {0, 0, 0, 0} + }; + char short_opts[] = "f"; + int follow = 0; - while (1) { - mnt = getmntent(fp); - if (!mnt) + optind = 0; + while ((c = getopt_long(argc, argv, short_opts, + long_opts, NULL)) != -1) { + switch (c) { + 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; - if (!llapi_is_lustre_mnttype(mnt->mnt_type)) - continue; + mdd = argv[optind++]; + if (argc > optind) + startrec = strtoll(argv[optind++], NULL, 10); + if (argc > optind) + endrec = strtoll(argv[optind++], NULL, 10); - if (!strncmp(mnt->mnt_dir, path, strlen(mnt->mnt_dir))) { - rpath = path + strlen(mnt->mnt_dir); - break; - } + fd = llapi_changelog_open(mdd, startrec); + if (fd < 0) { + fprintf(stderr, "%s Can't open changelog: %s\n", argv[0], + strerror(errno = -fd)); + return fd; } - endmntent(fp); - /* remove char '/' from rpath to be a relative path */ - while (rpath && *rpath == '/') rpath++; + while ((len = get_next_full_line(fd, &ptr)) >= 0) { + if (len == 0) { + struct pollfd pfds[1]; + int rc; - if (!rpath) { - fprintf(stderr, - "%s: file %s doesn't belong to a lustre file system!\n", - argv[0], argv[argc - 1]); - return -1; + if (!follow) + break; + pfds[0].fd = fd; + pfds[0].events = POLLIN; + rc = poll(pfds, 1, -1); + if (rc < 0) + break; + continue; + } + /* eg. 2 02MKDIR 4405821890 t=[0x100000400/0x5] p=[0x100000400/0x4] pics */ + sscanf(ptr, "%lld *", &recnum); + if (endrec && recnum > endrec) + break; + if (recnum < startrec) + continue; + printf("%.*s\n", len, ptr); } - for (i = 0; i < argc - 1; i++) { - strncat(cmd, argv[i], PATH_MAX); - strncat(cmd, " ", PATH_MAX); + close(fd); + + if (len < 0) { + fprintf(stderr, "read err %d\n", errno); + return -errno; } - strncat(cmd, *rpath ? rpath : ".", PATH_MAX); - strncpy(fname, argv[argc - 1], sizeof(fname)); return 0; } -static int lfs_getfacl(int argc, char **argv) +static int lfs_changelog_clear(int argc, char **argv) { - char fname[PATH_MAX] = "", cmd[PATH_MAX] = ""; + 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 c, 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 ((c = getopt_long(argc, argv, short_opts, + long_opts, NULL)) != -1) { + switch (c) { + 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; + } + } - if (acl_cmd_parse(argc, argv, fname, cmd)) + device = argv[optind++]; + fid = argv[optind++]; + if (optind != argc) return CMD_HELP; - return llapi_getfacl(fname, cmd); + 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 %s\n", rectmp, path); + else + 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_setfacl(int argc, char **argv) +static int lfs_path2fid(int argc, char **argv) { - char fname[PATH_MAX] = "", cmd[PATH_MAX] = ""; + char *path; + lustre_fid fid; + int rc; - if (acl_cmd_parse(argc, argv, fname, cmd)) + if (argc != 2) return CMD_HELP; - return llapi_setfacl(fname, cmd); + 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) @@ -1996,5 +2614,6 @@ int main(int argc, char **argv) } obd_finalize(argc, argv); - return rc; + return rc < 0 ? -rc : rc; } +