X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;ds=sidebyside;f=lustre%2Futils%2Flfs.c;h=1f0f905da1c680264b1df34cdea9a3e2b06212f8;hb=62ef9c949753;hp=130f41c71e2142587b78fc26560982d53b21169e;hpb=cefa8cda2ba2d288ccaa4ec077a6c627592503ea;p=fs%2Flustre-release.git diff --git a/lustre/utils/lfs.c b/lustre/utils/lfs.c index 130f41c..1f0f905 100644 --- a/lustre/utils/lfs.c +++ b/lustre/utils/lfs.c @@ -73,6 +73,7 @@ #include #include #include +#include #include #include "obdctl.h" @@ -105,6 +106,9 @@ 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 */ @@ -114,7 +118,7 @@ command_t cmdlist[] = { "set the default striping pattern on an existing directory or\n" "delete the default striping pattern from an existing directory\n" "usage: setstripe [--size|-s stripe_size] [--offset|-o start_ost]\n" - " [--count|-c stripe_count] [--pool|-p pool_name]\n" + " [--count|-c stripe_count] [--pool|-p ]\n" " \n" " or \n" " setstripe -d (to delete default striping)\n" @@ -123,24 +127,26 @@ command_t cmdlist[] = { "\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"}, + "\tpool: Name of OST pool"}, {"getstripe", lfs_getstripe, 0, "To list the striping info for a given file or files in a\n" "directory or recursively for all files in a directory tree.\n" "usage: getstripe [--obd|-O ] [--quiet | -q] [--verbose | -v]\n" + " [--count | -c ] [--size | -s ] [--index | -i ]\n" + " [--offset | -o ] [--pool | -p ]\n" " [--recursive | -r] ..."}, - {"poollist", lfs_poollist, 0, + {"pool_list", lfs_poollist, 0, "List pools or pool OSTs\n" - "usage: poollist [.] | \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" " [[!] --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" - " [[!] --pool ]\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"}, @@ -159,8 +165,8 @@ command_t cmdlist[] = { {"osts", lfs_osts, 0, "osts"}, {"df", lfs_df, 0, "report filesystem disk space usage or inodes usage" - "of each MDS/OSD.\n" - "Usage: df [-i] [-h] [path]"}, + "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" @@ -175,14 +181,16 @@ 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 ] -b -B -i -I \n" - " setquota -t [ -u | -g ] \n" - " setquota [ -u | --user | -g | --group ] \n" + "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" + " setquota [-t] <-u|--user|-g|--group>\n" " [--block-grace ]\n" " [--inode-grace ] \n" " -b can be used instead of --block-softlimit/--block-grace\n" @@ -190,7 +198,9 @@ command_t cmdlist[] = { " -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 [-v] [-o obd_uuid|-i mdt_idx|-I ost_idx] [{-u|-g }|-t] "}, + "usage: quota [-v] [-o obd_uuid|-i mdt_idx|-I ost_idx]\n" + " [<-u|-g> |||] \n" + " quota [-o obd_uuid|-i mdt_idx|-I ost_idx] -t <-u|-g> "}, {"quotainv", lfs_quotainv, 0, "Invalidate quota data.\n" "usage: quotainv [-u|-g] "}, #endif @@ -214,6 +224,20 @@ 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"}, @@ -513,8 +537,8 @@ static int lfs_find(int argc, char **argv) time(&t); optind = 0; - /* when getopt_long_only() hits '!' it returns 1 and puts "!" in optarg */ - 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; @@ -591,45 +615,27 @@ 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; - param.gid = strtol(optarg, &endptr, 10); - if (optarg == endptr) { - ret = name2id(¶m.gid, optarg, GROUP); - if (ret != 0) { + 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': - 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) { + 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; @@ -812,10 +818,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 }; @@ -834,15 +845,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: @@ -869,64 +892,26 @@ static int lfs_getstripe(int argc, char **argv) static int lfs_osts(int argc, char **argv) { - FILE *fp; - struct mntent *mnt = NULL; + char mntdir[PATH_MAX] = {'\0'}; struct find_param param; - int rc=0; + int index = 0, rc=0; if (argc != 1) return CMD_HELP; - fp = setmntent(MOUNTED, "r"); - - if (fp == NULL) { - fprintf(stderr, "%s: setmntent(%s): %s:", argv[0], MOUNTED, - strerror (errno)); - } else { - mnt = getmntent(fp); - 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) - fprintf(stderr, - "error: %s: failed on %s\n", - argv[0], mnt->mnt_dir); - } - mnt = getmntent(fp); + while (llapi_search_mounts(NULL, index++, mntdir, NULL) == 0) { + memset(¶m, 0, sizeof(param)); + rc = llapi_getstripe(mntdir, ¶m); + if (rc) { + fprintf(stderr, "error: %s: failed on %s\n", + argv[0], mntdir); } - endmntent(fp); + memset(mntdir, 0, PATH_MAX); } return rc; } -static int lfs_path2fid(int argc, char **argv) -{ - char *path; - unsigned long long seq; - unsigned long oid, ver; - int rc; - - if (argc != 2) - return CMD_HELP; - - path = argv[1]; - rc = llapi_path2fid(path, &seq, &oid, &ver); - if (rc) { - fprintf(stderr, "error: can't get fid for %s\n", path); - return rc; - } - - printf("%llu:%lu", seq, oid); - if (ver) - printf(":%lu", ver); - - printf("\n"); - - return 0; -} - #define COOK(value) \ ({ \ int radix = 0; \ @@ -944,41 +929,6 @@ static int lfs_path2fid(int argc, char **argv) #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; -} - static int showdf(char *mntdir, struct obd_statfs *stat, char *uuid, int ishow, int cooked, char *type, int index, int rc) @@ -1060,13 +1010,26 @@ static int showdf(char *mntdir, struct obd_statfs *stat, return 0; } -static int mntdf(char *mntdir, int ishow, int cooked) +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; __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", @@ -1114,6 +1077,10 @@ static int mntdf(char *mntdir, int ishow, int cooked) if (rc == -EAGAIN) continue; + if (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, obd_uuid2str(&uuid_buf), @@ -1139,15 +1106,18 @@ static int mntdf(char *mntdir, int ishow, int cooked) static int lfs_df(int argc, char **argv) { - FILE *fp; char *path = NULL; - struct mntent *mnt = NULL; char *mntdir = NULL; int ishow = 0, cooked = 0; int c, rc = 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, "ihp:", long_opts, NULL)) != -1) { switch (c) { case 'i': ishow = 1; @@ -1155,6 +1125,9 @@ static int lfs_df(int argc, char **argv) case 'h': cooked = 1; break; + case 'p': + pool_name = optarg; + break; default: return CMD_HELP; } @@ -1162,14 +1135,6 @@ static int lfs_df(int argc, char **argv) if (optind < argc ) path = argv[optind]; - fp = setmntent(MOUNTED, "r"); - if (fp == NULL) { - rc = -errno; - fprintf(stderr, "error: %s: open %s failed( %s )\n", - argv[0], MOUNTED, strerror(errno)); - return rc; - } - if ((mntdir = malloc(PATH_MAX)) == NULL) { fprintf(stderr, "error: cannot allocate %d bytes\n", PATH_MAX); @@ -1178,28 +1143,30 @@ static int lfs_df(int argc, char **argv) memset(mntdir, 0, PATH_MAX); if (path) { - rc = path2mnt(path, fp, mntdir, PATH_MAX); - if (rc) { - endmntent(fp); - free(mntdir); - return rc; - } + char rpath[PATH_MAX] = {'\0'}; - 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; + if (!realpath(path, rpath)) { + rc = -errno; + fprintf(stderr, "error: invalid path '%s': %s\n", + path, strerror(-rc)); + } else { + rc = llapi_search_mounts(rpath, 0, mntdir, fsname); + if (rc == 0 && mntdir[0] != '\0') { + rc = mntdf(mntdir, fsname, pool_name, + ishow, cooked); printf("\n"); } - mnt = getmntent(fp); } - endmntent(fp); + } else { + int index = 0; + + while (llapi_search_mounts(NULL, index++, mntdir, fsname)==0) { + rc = mntdf(mntdir, fsname, pool_name, + ishow, cooked); + if (rc) + break; + printf("\n"); + } } free(mntdir); @@ -1209,8 +1176,7 @@ static int lfs_df(int argc, char **argv) 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]; @@ -1236,26 +1202,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", @@ -1267,8 +1221,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)) @@ -1277,25 +1230,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; @@ -1401,15 +1341,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_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)); @@ -1429,7 +1360,7 @@ static int lfs_quotacheck(int argc, char **argv) qctl.qc_cmd = LUSTRE_Q_QUOTAON; qctl.qc_type = check_type; rc = llapi_quotactl(mnt, &qctl); - if (rc) { + if (rc && errno != EALREADY) { if (*obd_type) fprintf(stderr, "%s %s ", (char *)qctl.obd_type, obd_uuid2str(&qctl.obd_uuid)); @@ -1483,14 +1414,24 @@ 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_uuid2str(&qctl.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 (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) @@ -1531,20 +1472,22 @@ static int lfs_quotaoff(int argc, char **argv) mnt = argv[optind]; rc = llapi_quotactl(mnt, &qctl); - if (rc == -1 && errno == ESRCH) { - fprintf(stderr, "\n%s quotas are not enabled.\n", - qctl.qc_type == 0x00 ? "user" : "group"); - return 0; - } if (rc) { - if (*obd_type) - fprintf(stderr, "%s %s ", obd_type, - obd_uuid2str(&qctl.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 lfs_quotainv(int argc, char **argv) @@ -1787,6 +1730,7 @@ int lfs_setquota(int argc, char **argv) {0, 0, 0, 0} }; unsigned limit_mask = 0; + char *endptr; if (has_times_option(argc, argv)) return lfs_setquota_times(argc, argv); @@ -1811,9 +1755,12 @@ int lfs_setquota(int argc, char **argv) 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; + 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': @@ -1840,7 +1787,12 @@ int lfs_setquota(int argc, char **argv) } if (qctl.qc_type == UGQUOTA) { - fprintf(stderr, "error: neither -u nor -g are specified\n"); + fprintf(stderr, "error: neither -u nor -g was specified\n"); + return CMD_HELP; + } + + if (limit_mask == 0) { + fprintf(stderr, "error: at least one limit must be specified\n"); return CMD_HELP; } @@ -1860,8 +1812,10 @@ int lfs_setquota(int argc, char **argv) rc = llapi_quotactl(mnt, &tmp_qctl); if (rc < 0) { - fprintf(stderr, "error: getquota failed\n"); - return CMD_HELP; + fprintf(stderr, "error: setquota failed while retrieving" + " current quota settings (%s)\n", + strerror(errno)); + return rc; } if (!(limit_mask & BHLIMIT)) @@ -1872,6 +1826,17 @@ int lfs_setquota(int argc, char **argv) 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; + } } dqb->dqb_valid |= (limit_mask & (BHLIMIT | BSLIMIT)) ? QIF_BLIMITS : 0; @@ -1950,7 +1915,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) +static void print_quota(char *mnt, struct if_quotactl *qctl, int type, int rc) { time_t now; @@ -1998,9 +1963,15 @@ static void print_quota(char *mnt, struct if_quotactl *qctl) if (bover) diff2str(dqb->dqb_btime, timebuf, now); - sprintf(numbuf[0], (dqb->dqb_valid & QIF_SPACE) ? - LPU64 : "["LPU64"]", toqb(dqb->dqb_curspace)); - if (qctl->qc_valid == QC_GENERAL) + 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); @@ -2017,7 +1988,7 @@ static void print_quota(char *mnt, struct if_quotactl *qctl) sprintf(numbuf[0], (dqb->dqb_valid & QIF_INODES) ? LPU64 : "["LPU64"]", dqb->dqb_curinodes); - if (qctl->qc_valid == QC_GENERAL) + if (type == QC_GENERAL) sprintf(numbuf[1], (dqb->dqb_valid & QIF_ILIMITS) ? LPU64 : "["LPU64"]", dqb->dqb_isoftlimit); @@ -2025,7 +1996,7 @@ static void print_quota(char *mnt, struct if_quotactl *qctl) sprintf(numbuf[1], "%s", ""); sprintf(numbuf[2], (dqb->dqb_valid & QIF_ILIMITS) ? LPU64 : "["LPU64"]", dqb->dqb_ihardlimit); - if (qctl->qc_valid != QC_OSTIDX) + if (type != QC_OSTIDX) printf(" %7s%c %6s %7s %7s", numbuf[0], iover ? '*' : ' ', numbuf[1], numbuf[2], iover > 1 ? timebuf : ""); @@ -2072,7 +2043,7 @@ static int print_obd_quota(char *mnt, struct if_quotactl *qctl, int is_mdt) continue; } - print_quota(obd_uuid2str(&qctl->obd_uuid), qctl); + print_quota(obd_uuid2str(&qctl->obd_uuid), qctl, qctl->qc_valid, 0); } out: @@ -2089,6 +2060,7 @@ static int lfs_quota(int argc, char **argv) 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; + char *endptr; __u32 valid = QC_GENERAL, idx = 0; optind = 0; @@ -2152,8 +2124,10 @@ ug_output: (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) { - if (optind + 2 != argc) { + /* 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; } @@ -2162,11 +2136,14 @@ ug_output: 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; + } } - } 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; } @@ -2177,8 +2154,8 @@ ug_output: mnt = argv[optind]; rc1 = llapi_quotactl(mnt, &qctl); - if (rc1 == -1 && errno == ESRCH) { - fprintf(stderr, "\n%s quotas are not enabled.\n", + if (rc1 == -1 && errno == EALREADY) { + fprintf(stderr, "\n%s quotas are not enabled.\n", qctl.qc_type == USRQUOTA ? "user" : "group"); goto out; } @@ -2186,9 +2163,9 @@ ug_output: fprintf(stderr, "%s %s ", obd_type, obd_uuid); if (qctl.qc_valid != QC_GENERAL) - mnt = obd_uuid2str(&qctl.obd_uuid); + mnt = ""; - print_quota(mnt, &qctl); + print_quota(mnt, &qctl, QC_GENERAL, rc1); if (qctl.qc_valid == QC_GENERAL && qctl.qc_cmd != LUSTRE_Q_GETINFO && verbose) { rc2 = print_obd_quota(mnt, &qctl, 1); @@ -2248,8 +2225,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. */ @@ -2328,6 +2310,202 @@ 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) + break; + if (rec->cr_index < startrec) + 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 %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_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; @@ -2349,5 +2527,6 @@ int main(int argc, char **argv) } obd_finalize(argc, argv); - return rc; + return rc < 0 ? -rc : rc; } +