"delete the default striping pattern from an existing directory\n"
"usage: setstripe [--size|-s stripe_size] [--count|-c stripe_count]\n"
" [--index|-i|--offset|-o start_ost_index]\n"
- " [--pool|-p <pool>] <dir|filename>\n"
+ " [--pool|-p <pool>] <directory|filename>\n"
" or \n"
- " setstripe -d <dir> (to delete default striping)\n"
+ " setstripe -d <directory> (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\n"
"\t respectively)\n"
- "\tstart_ost_index: OST index of first stripe (-1 filesystem default)\n"
+ "\tstart_ost_index: OST index of first stripe (-1 default)\n"
"\tstripe_count: Number of OSTs to stripe over (0 default, -1 all)\n"
- "\tpool: Name of OST pool"},
+ "\tpool: Name of OST pool to use (default none)"},
{"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 <uuid>] [--quiet | -q] [--verbose | -v]\n"
- " [--count | -c ] [--index | -i | --offset | -o ]\n"
+ " [--count | -c ] [--index | -i | --offset | -o]\n"
" [--size | -s ] [--pool | -p ] [--directory | -d]\n"
- " [--mdt | -M] [--recursive | -r] <dir|file> ..."},
+ " [--mdt | -M] [--recursive | -r] <directory|filename> ..."},
{"pool_list", lfs_poollist, 0,
"List pools or pool OSTs\n"
"usage: pool_list <fsname>[.<pool>] | <pathname>\n"},
{"join", lfs_join, 0,
"join two lustre files into one.\n"
"obsolete, HEAD does not support it anymore.\n"},
- {"osts", lfs_osts, 0, "osts"},
+ {"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 and all OSDs or a batch belonging to a specific pool .\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 [-q] [-v] [-o obd_uuid|-i mdt_idx|-I ost_idx]\n"
+ "usage: quota [-q] [-v] [-o <obd_uuid>|-i <mdt_idx>|-I <ost_idx>]\n"
" [<-u|-g> <uname>|<uid>|<gname>|<gid>] <filesystem>\n"
- " quota [-o obd_uuid|-i mdt_idx|-I ost_idx] -t <-u|-g> <filesystem>"},
+ " quota [-o <obd_uuid>|-i <mdt_idx>|-I <ost_idx>] -t <-u|-g> <filesystem>"},
{"quotainv", lfs_quotainv, 0, "Invalidate quota data.\n"
"usage: quotainv [-u|-g] <filesystem>"},
#endif
unsigned long long size_units;
struct option long_opts[] = {
- {"size", required_argument, 0, 's'},
{"count", required_argument, 0, 'c'},
+ {"delete", no_argument, 0, 'd'},
{"index", required_argument, 0, 'i'},
{"offset", required_argument, 0, 'o'},
{"pool", required_argument, 0, 'p'},
- {"delete", no_argument, 0, 'd'},
+ {"size", required_argument, 0, 's'},
{0, 0, 0, 0}
};
st_offset = -1;
st_count = 0;
-#if LUSTRE_VERSION < OBD_OCD_VERSION(2,1,0,0)
+#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, "warning: deprecated usage of setstripe "
+ fprintf(stderr, "error: obsolete usage of setstripe "
"positional parameters. Use -c, -i, -s instead.\n");
- /* 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;
+ return CMD_HELP;
} else
#else
#warning "remove obsolete positional parameter code"
#endif
{
optind = 0;
- while ((c = getopt_long(argc, argv, "c:di:o:s:p:",
+ while ((c = getopt_long(argc, argv, "c:di:o:p:s:",
long_opts, NULL)) >= 0) {
switch (c) {
case 0:
}
/* 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);
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'},
{"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'},
+ {"mtime", required_argument, 0, 'M'},
{"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'},
- {"print", no_argument, 0, 'P'},
+ /* no short option for pool, p/P already used */
+ {"pool", required_argument, 0, FIND_POOL_OPT},
{"print0", no_argument, 0, 'p'},
- /* Old find options. */
+ {"print", no_argument, 0, 'P'},
{"quiet", no_argument, 0, 'q'},
{"recursive", no_argument, 0, 'r'},
{"size", required_argument, 0, 's'},
{"type", required_argument, 0, 't'},
+ {"uid", required_argument, 0, 'u'},
+ {"user", required_argument, 0, 'U'},
{"verbose", no_argument, 0, 'v'},
{0, 0, 0, 0}
};
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",
+ while ((c = getopt_long_only(argc,argv,"-A:C:D:g:G:M:n:O:Ppqrs:t:u:U:v",
long_opts, NULL)) >= 0) {
xtime = NULL;
xsign = NULL;
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;
};
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] == '-')
optarg);
return ret;
}
+ param.check_size = 1;
+ param.exclude_size = !!neg_opt;
break;
case 'v':
new_fashion = 0;
static int lfs_getstripe(int argc, char **argv)
{
struct option long_opts[] = {
- {"obd", 1, 0, 'O'},
- {"quiet", 0, 0, 'q'},
- {"recursive", 0, 0, 'r'},
{"count", 0, 0, 'c'},
- {"size", 0, 0, 's'},
+ {"directory", 0, 0, 'd'},
{"index", 0, 0, 'i'},
+ {"mdt", 0, 0, 'M'},
{"offset", 0, 0, 'o'},
+ {"obd", 1, 0, 'O'},
{"pool", 0, 0, 'p'},
+ {"quiet", 0, 0, 'q'},
+ {"recursive", 0, 0, 'r'},
+ {"raw", 0, 0, 'R'},
+ {"size", 0, 0, 's'},
{"verbose", 0, 0, 'v'},
- {"directory", 0, 0, 'd'},
- {"mdt", 0, 0, 'M'},
{0, 0, 0, 0}
};
int c, rc;
}
break;
case 'p':
- param.verbose |= VERBOSE_POOL;
+ if (!(param.verbose & VERBOSE_DETAIL)) {
+ param.verbose |= VERBOSE_POOL;
+ param.maxdepth = 0;
+ }
break;
case 'M':
param.get_mdt_index = 1;
static int lfs_osts(int argc, char **argv)
{
- char mntdir[PATH_MAX] = {'\0'};
+ char mntdir[PATH_MAX] = {'\0'}, path[PATH_MAX] = {'\0'};
struct find_param param;
int index = 0, rc=0;
- if (argc != 1)
+ if (argc > 2)
return CMD_HELP;
- while (llapi_search_mounts(NULL, index++, mntdir, NULL) == 0) {
+ 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;
+
memset(¶m, 0, sizeof(param));
rc = llapi_ostlist(mntdir, ¶m);
if (rc) {
fprintf(stderr, "error: %s: failed on %s\n",
argv[0], mntdir);
}
+ if (path[0] != '\0')
+ break;
memset(mntdir, 0, PATH_MAX);
}
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;
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)
/* 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 even fill in uuid_buf something is
- * definitely incorrect and no point in continuing. */
- if (uuid_buf.uuid[0] != '\0') {
- showdf(mntdir,&stat_buf,obd_uuid2str(&uuid_buf),
- ishow, cooked, tp->st_name, index, rc);
- } else {
- char tmp_uuid[12];
+ * 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);
- sprintf(tmp_uuid, "%s%04x", tp->st_name, index);
- showdf(mntdir, &stat_buf, tmp_uuid,
- ishow, cooked, tp->st_name, index, rc);
- }
if (rc == 0) {
if (tp->st_op == LL_STATFS_MDC) {
sum.os_ffree += stat_buf.os_ffree;
printf("\n");
showdf(mntdir, &sum, "filesystem summary:", ishow, cooked, NULL, 0,0);
-
+ printf("\n");
return 0;
}
static int lfs_df(int argc, char **argv)
{
- char *path = 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'},
return CMD_HELP;
}
}
- if (optind < argc )
- path = argv[optind];
-
- if ((mntdir = malloc(PATH_MAX)) == NULL) {
- fprintf(stderr, "error: cannot allocate %d bytes\n",
- PATH_MAX);
- return -ENOMEM;
+ if (optind < argc && !realpath(argv[optind], path)) {
+ rc = -errno;
+ fprintf(stderr, "error: invalid path '%s': %s\n",
+ argv[optind], strerror(-rc));
+ return rc;
}
- memset(mntdir, 0, PATH_MAX);
- if (path) {
- char rpath[PATH_MAX] = {'\0'};
-
- 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");
- }
- }
- } else {
- int index = 0;
+ while (!llapi_search_mounts(path, index++, mntdir, fsname)) {
+ /* Check if we have a mount point */
+ if (mntdir[0] == '\0')
+ continue;
- while (llapi_search_mounts(NULL, index++, mntdir, fsname)==0) {
- rc = mntdf(mntdir, fsname, pool_name,
- ishow, cooked);
- if (rc)
- break;
- printf("\n");
- fsname[0] = '\0'; /* avoid matching in next loop */
- mntdir[0] = '\0'; /* avoid matching in next loop */
- }
+ 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;
}
memset(&qchk, 0, sizeof(qchk));
optind = 0;
- while ((c = getopt(argc, argv, "ug")) != -1) {
+ while ((c = getopt(argc, argv, "gu")) != -1) {
switch (c) {
case 'u':
check_type |= 0x01;
qctl.qc_cmd = LUSTRE_Q_QUOTAON;
optind = 0;
- while ((c = getopt(argc, argv, "ugf")) != -1) {
+ while ((c = getopt(argc, argv, "fgu")) != -1) {
switch (c) {
case 'u':
qctl.qc_type |= 0x01;
qctl.qc_cmd = LUSTRE_Q_QUOTAOFF;
optind = 0;
- while ((c = getopt(argc, argv, "ug")) != -1) {
+ while ((c = getopt(argc, argv, "gu")) != -1) {
switch (c) {
case 'u':
qctl.qc_type |= 0x01;
qctl.qc_cmd = LUSTRE_Q_INVALIDATE;
optind = 0;
- while ((c = getopt(argc, argv, "ugf")) != -1) {
+ while ((c = getopt(argc, argv, "fgu")) != -1) {
switch (c) {
case 'u':
qctl.qc_type |= 0x01;
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'},
+ {"group", no_argument, 0, 'g'},
{"inode-grace", required_argument, 0, 'i'},
{"times", no_argument, 0, 't'},
+ {"user", no_argument, 0, 'u'},
{0, 0, 0, 0}
};
qctl.qc_type = UGQUOTA;
optind = 0;
- while ((c = getopt_long(argc, argv, "b:i:gtu", long_opts, NULL)) != -1) {
+ while ((c = getopt_long(argc, argv, "b:gi:tu", long_opts, NULL)) != -1) {
switch (c) {
case 'u':
case 'g':
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'},
+ {"group", required_argument, 0, 'g'},
{"inode-softlimit", required_argument, 0, 'i'},
{"inode-hardlimit", required_argument, 0, 'I'},
+ {"user", required_argument, 0, 'u'},
{0, 0, 0, 0}
};
unsigned limit_mask = 0;
* isn't reinitialized from command line */
optind = 0;
- while ((c = getopt_long(argc, argv, "b:B:i:I:g:u:", long_opts, NULL)) != -1) {
+ while ((c = getopt_long(argc, argv, "b:B:g:i:I:u:", long_opts, NULL)) != -1) {
switch (c) {
case 'u':
case 'g':
return "unknown";
}
-
/* Converts seconds value into format string
* result is returned in buf
* Notes:
* 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--) {
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)
{
strcpy(buf, "none");
return;
}
- sec2str(seconds - now, buf);
+ __sec2str(seconds - now, buf);
}
static void print_quota_title(char *name, struct if_quotactl *qctl)
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);
}
__u32 valid = QC_GENERAL, idx = 0;
optind = 0;
- while ((c = getopt(argc, argv, "ugto:i:I:qv")) != -1) {
+ while ((c = getopt(argc, argv, "gi:I:o:qtuv")) != -1) {
switch (c) {
case 'u':
if (qctl.qc_type != UGQUOTA) {
time_t secs;
struct tm ts;
- if (endrec && rec->cr_index > endrec)
+ if (endrec && rec->cr_index > endrec) {
+ llapi_changelog_free(&rec);
break;
- if (rec->cr_index < startrec)
+ }
+ if (rec->cr_index < startrec) {
+ llapi_changelog_free(&rec);
continue;
+ }
secs = rec->cr_time >> 30;
gmtime_r(&secs, &ts);
git://git.whamcloud.com / fs / lustre-release.git / blobdiff