" [--overstripe-count|-C <stripe_count>]\n" \
" [--stripe-index|-i <start_ost_idx>]\n" \
" [--stripe-size|-S <stripe_size>]\n" \
+ " [--extension-size|--ext-size|-z]\n" \
" [--layout|-L <pattern>]\n" \
" [--mirror_count|-N[mirror_count]]\n" \
" [--ost|-o <ost_indices>]\n" \
"\tstripe_size: Number of bytes on each OST (0=fs default)\n" \
"\t Can be specified with K, M or G (for KB, MB, GB\n" \
"\t respectively)\n" \
+ "\textension_size:\n" \
+ "\t Number of bytes the previous component is extended\n" \
+ "\t each time. Can be specified with K, M, G (for KB,\n" \
+ "\t MB, GB respectively)\n" \
"\tpool_name: Name of OST pool to use (default none)\n" \
"\tlayout: stripe pattern type: raid0, mdt (default raid0)\n"\
"\tost_indices: List of OST indices, can be repeated multiple times\n"\
"[SETSTRIPE_OPTIONS] ... <filename|directory> ...\n"
MIRROR_CREATE_HELP },
{ .pc_name = "delete", .pc_func = lfs_mirror_delete,
- .pc_help = "delete a mirror from a file.\n"
- "usage: lfs mirror delete {--comp-id|-I <comp_id>|-p <pool>} <mirrored_file> ...\n"
+ .pc_help = "Delete a mirror from a file.\n"
+ "usage: lfs mirror delete {--mirror-id <mirror_id> |\n"
+ "\t --component-id|--comp-id|-I <comp_id> |\n"
+ "\t -p <pool>} <mirrored_file> ...\n"
},
{ .pc_name = "extend", .pc_func = lfs_mirror_extend,
.pc_help = "Extend a mirrored file.\n"
{ .pc_name = "split", .pc_func = lfs_mirror_split,
.pc_help = "Split a mirrored file.\n"
"usage: lfs mirror split <--mirror-id <mirror_id> |\n"
- "\t
<--component-id|-I <comp_id>|-p <pool>> [--destroy|-d]\n"
+ "\t --component-id|-I <comp_id>|-p <pool>> [--destroy|-d]\n"
"\t [-f <new_file>] <mirrored_file> ...\n"
"\tmirror_id: The numerical unique identifier for a mirror. It\n"
"\t can be fetched by lfs getstripe command.\n"
" [!] --mirror-id=[+-]<id>]\n"
" <directory|filename> ..."},
{"setdirstripe", lfs_setdirstripe, 0,
- "To create a striped directory on a specified MDT. This can only\n"
- "be done on MDT0 with the right of administrator.\n"
+ "Create striped directory on specified MDT, same as mkdir.\n"
+ "May be restricted to root or group users, depending on settings.\n"
"usage: setdirstripe [OPTION] <directory>\n"
SETDIRSTRIPE_USAGE},
{"getdirstripe", lfs_getdirstripe, 0,
" [--recursive|-r] [--yaml|-y]\n"
" [--verbose|-v] [--default|-D] <dir> ..."},
{"mkdir", lfs_setdirstripe, 0,
- "To create a striped directory on a specified MDT. This can only\n"
- "be done on MDT0 with the right of administrator.\n"
+ "Create striped directory on specified MDT, same as setdirstripe.\n"
"usage: mkdir [OPTION] <directory>\n"
SETDIRSTRIPE_USAGE},
{"rm_entry", lfs_rmentry, 0,
"find files matching given attributes recursively in directory tree.\n"
"usage: find <directory|filename> ...\n"
" [[!] --atime|-A [+-]N[smhdwy]] [[!] --ctime|-C [+-]N[smhdwy]]\n"
- " [[!] --mtime|-M [+-]N[smhdwy]] [[!] --blocks|-b N]\n"
- " [[!] --newer[XY] <reference>]\n"
+ " [[!] --mtime|-M [+-]N[smhdwy]]\n"
+ " [[!] --btime|--Btime|-B [+-]N[smhdwy]]\n"
+ " [[!] --newer[XY] <reference>] [[!] --blocks|-b N]\n"
" [--maxdepth|-D N] [[!] --mdt-index|--mdt|-m <uuid|index,...>]\n"
" [[!] --name|-n <pattern>] [[!] --ost|-O <uuid|index,...>]\n"
" [--print|-P] [--print0|-0] [[!] --size|-s [+-]N[bkMGTPE]]\n"
" [[!] --stripe-count|-c [+-]<stripes>]\n"
" [[!] --stripe-index|-i <index,...>]\n"
" [[!] --stripe-size|-S [+-]N[kMGT]] [[!] --type|-t <filetype>]\n"
+ " [[!] --extension-size|--ext-size|-z [+-]N[kMGT]]\n"
" [[!] --gid|-g|--group|-G <gid>|<gname>]\n"
" [[!] --uid|-u|--user|-U <uid>|<uname>] [[!] --pool <pool>]\n"
" [[!] --projid <projid>]\n"
char *ptr;
struct ll_ioc_lease *data;
uint16_t mirror_count;
+ __u32 mirror_id;
int mdt_index;
int fd, fdv;
int rc;
rc = llapi_layout_comp_iterate(layout, find_comp_id_by_pool,
&data);
- id = data.id;
+ mirror_id = data.id;
} else if (mflags & MF_COMP_ID) {
rc = llapi_layout_comp_iterate(layout, find_comp_id, &id);
- id = mirror_id_of(id);
+ mirror_id = mirror_id_of(id);
} else {
rc = llapi_layout_comp_iterate(layout, find_mirror_id, &id);
+ mirror_id = id;
}
if (rc < 0) {
fprintf(stderr, "error %s: failed to iterate layout of '%s'\n",
progname, fname);
goto free_layout;
} else if (rc == LLAPI_LAYOUT_ITER_CONT) {
- fprintf(stderr,
- "error %s: file '%s' does not contain mirror with id %u\n",
- progname, fname, id);
- goto free_layout;
+ if (mflags & MF_COMP_POOL) {
+ fprintf(stderr,
+ "error %s: file '%s' does not contain mirror with pool '%s'\n",
+ progname, fname, pool);
+ goto free_layout;
+ } else if (mflags & MF_COMP_ID) {
+ fprintf(stderr,
+ "error %s: file '%s' does not contain mirror with comp-id %u\n",
+ progname, fname, id);
+ goto free_layout;
+ } else {
+ fprintf(stderr,
+ "error %s: file '%s' does not contain mirror with id %u\n",
+ progname, fname, id);
+ goto free_layout;
+ }
}
fd = open(fname, O_RDWR);
if (victim_file == NULL) {
/* use a temp file to store the splitted layout */
if (mflags & MF_DESTROY) {
- if (last_non_stale_mirror(id, layout)) {
+ if (last_non_stale_mirror(mirror_id, layout)) {
rc = -EUCLEAN;
fprintf(stderr,
"%s: cannot destroy the last non-stale mirror of file '%s'\n",
O_LOV_DELAY_CREATE);
} else {
snprintf(victim, sizeof(victim), "%s.mirror~%u",
- fname, id);
+ fname, mirror_id);
fdv = open(victim, flags, S_IRUSR | S_IWUSR);
}
} else {
data->lil_flags = LL_LEASE_LAYOUT_SPLIT;
data->lil_count = 2;
data->lil_ids[0] = fdv;
- data->lil_ids[1] = id;
+ data->lil_ids[1] = mirror_id;
rc = llapi_lease_set(fd, data);
if (rc <= 0) {
if (rc == 0) /* lost lease lock */
return rc;
}
+static int build_prev_component(struct llapi_layout **layout,
+ struct lfs_setstripe_args *prev,
+ struct lfs_setstripe_args *lsa,
+ bool set_extent)
+{
+ int extension = lsa->lsa_comp_flags & LCME_FL_EXTENSION;
+ int rc;
+
+ if (prev->lsa_stripe_size) {
+ if (extension) {
+ prev->lsa_comp_end = lsa->lsa_comp_end;
+ prev->lsa_extension_size = lsa->lsa_extension_size;
+ prev->lsa_extension_comp = true;
+ }
+
+ rc = build_component(layout, prev, true);
+ if (rc)
+ return rc;
+ }
+
+ /* Copy lsa to previous lsa;
+ * if this is an extension component, make the previous invalid; */
+ if (extension)
+ prev->lsa_stripe_size = 0;
+ else
+ *prev = *lsa;
+
+ return 0;
+}
+
static int build_layout_from_yaml_node(struct cYAML *node,
struct llapi_layout **layout,
struct lfs_setstripe_args *lsa,
- __u32 *osts)
+ struct lfs_setstripe_args *prevp)
{
+ struct lfs_setstripe_args prev = { 0 };
+ __u32 *osts = lsa->lsa_tgts;
char *string;
int rc = 0;
+ if (prevp == NULL)
+ prevp = &prev;
+
while (node) {
+ string = node->cy_string;
+
if (node->cy_type == CYAML_TYPE_OBJECT) {
/* go deep to sub blocks */
+ if (string && !strncmp(string, "component", 9) &&
+ strncmp(string, "component0", 10) &&
+ strncmp(string, "components", 10)) {
+ rc = build_prev_component(layout, prevp, lsa, true);
+ if (rc)
+ return rc;
+
+ /* initialize lsa. */
+ setstripe_args_init(lsa);
+ lsa->lsa_first_comp = false;
+ lsa->lsa_tgts = osts;
+ }
+
rc = build_layout_from_yaml_node(node->cy_child, layout,
- lsa, osts);
+ lsa, prevp);
if (rc)
return rc;
} else {
if (node->cy_string == NULL)
return -EINVAL;
- string = node->cy_string;
/* skip leading lmm_ if present, to simplify parsing */
if (strncmp(string, "lmm_", 4) == 0)
string += 4;
if (!strcmp(string, "lcm_mirror_count")) {
lsa->lsa_mirror_count = node->cy_valueint;
} else if (!strcmp(string, "lcme_extent.e_start")) {
- if (node->cy_valueint != 0 || *layout != NULL) {
- rc = build_component(layout, lsa, true);
- if (rc)
- return rc;
- }
-
if (node->cy_valueint == 0)
lsa->lsa_first_comp = true;
-
- /* initialize lsa */
- setstripe_args_init(lsa);
- lsa->lsa_tgts = osts;
} else if (!strcmp(string, "lcme_extent.e_end")) {
if (node->cy_valueint == -1)
lsa->lsa_comp_end = LUSTRE_EOF;
lsa->lsa_stripe_count = node->cy_valueint;
} else if (!strcmp(string, "stripe_size")) {
lsa->lsa_stripe_size = node->cy_valueint;
+ } else if (!strcmp(string, "extension_size")) {
+ lsa->lsa_extension_size = node->cy_valueint;
+ lsa->lsa_extension_comp = true;
} else if (!strcmp(string, "stripe_offset")) {
lsa->lsa_stripe_off = node->cy_valueint;
} else if (!strcmp(string, "l_ost_idx")) {
node = node->cy_next;
}
+ if (prevp == &prev) {
+ rc = build_prev_component(layout, prevp, lsa, true);
+ if (rc)
+ return rc;
+
+ if (!(lsa->lsa_comp_flags & LCME_FL_EXTENSION))
+ rc = build_component(layout, lsa, *layout != NULL);
+ }
+
return rc;
}
setstripe_args_init(lsa);
lsa->lsa_tgts = osts;
- rc = build_layout_from_yaml_node(tree, layout, lsa, osts);
+ rc = build_layout_from_yaml_node(tree, layout, lsa, NULL);
if (rc) {
fprintf(stderr, "%s: cannot build layout from YAML file %s.\n",
progname, template);
goto err;
- } else {
- rc = build_component(layout, lsa, *layout != NULL);
}
/* clean clean lsa */
setstripe_args_init(lsa);
uint64_t end;
int rc, ret = 0;
- if (layout == NULL)
+ if (layout == NULL || !(comp_add || llapi_layout_is_composite(layout)))
return 0;
errno = 0;
/* find { .val = 'A', .name = "atime", .has_arg = required_argument }*/
/* --block is only valid in migrate mode */
{ .val = 'b', .name = "block", .has_arg = no_argument },
+/* find { .val = 'B', .name = "btime", .has_arg = required_argument }*/
{ .val = LFS_COMP_ADD_OPT,
.name = "comp-add", .has_arg = no_argument },
{ .val = LFS_COMP_ADD_OPT,
}
}
- if (layout != NULL || mirror_list != NULL) {
- if (mirror_list)
- result = mirror_adjust_first_extents(mirror_list);
- else
- result = layout_adjust_first_extent(fname, layout,
- comp_add);
- if (result == -ENODATA)
- comp_add = 0;
- else if (result != 0) {
- fprintf(stderr, "error: %s: invalid layout\n",
- progname);
- goto error;
- }
- }
-
if (from_yaml && from_copy) {
fprintf(stderr,
"%s: can't specify --yaml and --copy together\n",
}
}
+ if (layout != NULL || mirror_list != NULL) {
+ if (mirror_list)
+ result = mirror_adjust_first_extents(mirror_list);
+ else
+ result = layout_adjust_first_extent(fname, layout,
+ comp_add);
+ if (result == -ENODATA)
+ comp_add = 0;
+ else if (result != 0) {
+ fprintf(stderr, "error: %s: invalid layout\n",
+ progname);
+ goto error;
+ }
+ }
+
for (fname = argv[optind]; fname != NULL; fname = argv[++optind]) {
if (from_copy) {
layout = llapi_layout_get_by_path(template ?: fname, 0);
struct option long_opts[] = {
{ .val = 'A', .name = "atime", .has_arg = required_argument },
{ .val = 'b', .name = "blocks", .has_arg = required_argument },
+ { .val = 'B', .name = "btime", .has_arg = required_argument },
+ { .val = 'B', .name = "Btime", .has_arg = required_argument },
{ .val = LFS_COMP_COUNT_OPT,
.name = "comp-count", .has_arg = required_argument },
{ .val = LFS_COMP_COUNT_OPT,
{ .val = LFS_NEWERXY_OPT,
.name = "newerac", .has_arg = required_argument},
{ .val = LFS_NEWERXY_OPT,
+ .name = "newerab", .has_arg = required_argument},
+ { .val = LFS_NEWERXY_OPT,
.name = "newerma", .has_arg = required_argument},
{ .val = LFS_NEWERXY_OPT,
.name = "newermm", .has_arg = required_argument},
{ .val = LFS_NEWERXY_OPT,
.name = "newermc", .has_arg = required_argument},
{ .val = LFS_NEWERXY_OPT,
+ .name = "newermb", .has_arg = required_argument},
+ { .val = LFS_NEWERXY_OPT,
.name = "newerca", .has_arg = required_argument},
{ .val = LFS_NEWERXY_OPT,
.name = "newercm", .has_arg = required_argument},
{ .val = LFS_NEWERXY_OPT,
.name = "newercc", .has_arg = required_argument},
{ .val = LFS_NEWERXY_OPT,
+ .name = "newercb", .has_arg = required_argument},
+ { .val = LFS_NEWERXY_OPT,
+ .name = "newerba", .has_arg = required_argument},
+ { .val = LFS_NEWERXY_OPT,
+ .name = "newerbm", .has_arg = required_argument},
+ { .val = LFS_NEWERXY_OPT,
+ .name = "newerbc", .has_arg = required_argument},
+ { .val = LFS_NEWERXY_OPT,
+ .name = "newerbb", .has_arg = required_argument},
+ { .val = LFS_NEWERXY_OPT,
+ .name = "newerBa", .has_arg = required_argument},
+ { .val = LFS_NEWERXY_OPT,
+ .name = "newerBm", .has_arg = required_argument},
+ { .val = LFS_NEWERXY_OPT,
+ .name = "newerBc", .has_arg = required_argument},
+ { .val = LFS_NEWERXY_OPT,
+ .name = "newerBB", .has_arg = required_argument},
+ { .val = LFS_NEWERXY_OPT,
.name = "newerat", .has_arg = required_argument},
{ .val = LFS_NEWERXY_OPT,
.name = "newermt", .has_arg = required_argument},
{ .val = LFS_NEWERXY_OPT,
.name = "newerct", .has_arg = required_argument},
+ { .val = LFS_NEWERXY_OPT,
+ .name = "newerbt", .has_arg = required_argument},
+ { .val = LFS_NEWERXY_OPT,
+ .name = "newerBt", .has_arg = required_argument},
{ .val = 'c', .name = "stripe-count", .has_arg = required_argument },
{ .val = 'c', .name = "stripe_count", .has_arg = required_argument },
{ .val = 'C', .name = "ctime", .has_arg = required_argument },
/* when getopt_long_only() hits '!' it returns 1, puts "!" in optarg */
while ((c = getopt_long_only(argc, argv,
- "-0A:b:c:C:D:E:g:G:H:i:L:m:M:n:N:O:Ppqrs:S:t:T:u:U:vz:",
- long_opts, &optidx)) >= 0) {
+ "-0A:b:B:c:C:D:E:g:G:H:i:L:m:M:n:N:O:Ppqrs:S:t:T:u:U:vz:",
+ long_opts, &optidx)) >= 0) {
xtime = NULL;
xsign = NULL;
if (neg_opt)
xtime = ¶m.fp_atime;
xsign = ¶m.fp_asign;
param.fp_exclude_atime = !!neg_opt;
+ /* no break, this falls through to 'B' for btime */
+ case 'B':
+ if (c == 'B') {
+ xtime = ¶m.fp_btime;
+ xsign = ¶m.fp_bsign;
+ param.fp_exclude_btime = !!neg_opt;
+ }
/* no break, this falls through to 'C' for ctime */
case 'C':
if (c == 'C') {
}
ref = mktime(&tm);
+ } else if (y == 'b' || y == 'B') {
+ lstatx_t stx;
+
+ rc = llapi_get_lum_file(optarg, NULL, &stx,
+ NULL, 0);
+ if (rc || !(stx.stx_mask & STATX_BTIME)) {
+ if (!(stx.stx_mask & STATX_BTIME))
+ ret = -EOPNOTSUPP;
+ else
+ ret = -errno;
+ fprintf(stderr,
+ "%s: get btime failed '%s': %s\n",
+ progname, optarg,
+ strerror(-ret));
+ goto err;
+ }
+
+ ref = stx.stx_btime.tv_sec;
} else {
struct stat statbuf;
case 'c':
xidx = NEWERXY_CTIME;
break;
+ case 'b':
+ case 'B':
+ xidx = NEWERXY_BTIME;
+ break;
default:
fprintf(stderr,
"%s: invalid X argument: '%c'\n",
struct option long_opts[] = {
/* find { .val = 'A', .name = "atime", .has_arg = required_argument }*/
/* find { .val = 'b', .name = "blocks", .has_arg = required_argument }*/
+/* find { .val = 'B', .name = "btime", .has_arg = required_argument }*/
+/* find { .val = 'B', .name = "Btime", .has_arg = required_argument }*/
{ .val = LFS_COMP_COUNT_OPT,
.name = "comp-count", .has_arg = no_argument },
{ .val = LFS_COMP_COUNT_OPT,
const char osn_name;
bool osn_err;
} oss_names[] = {
- { .osn_state = OS_STATE_DEGRADED, .osn_name = 'D', .osn_err = true },
- { .osn_state = OS_STATE_READONLY, .osn_name = 'R', .osn_err = true },
- { .osn_state = OS_STATE_NOPRECREATE, .osn_name = 'N', .osn_err = true },
- { .osn_state = OS_STATE_UNUSED1, .osn_name = '?', .osn_err = true },
- { .osn_state = OS_STATE_UNUSED2, .osn_name = '?', .osn_err = true },
- { .osn_state = OS_STATE_ENOSPC, .osn_name = 'S', .osn_err = true },
- { .osn_state = OS_STATE_ENOINO, .osn_name = 'I', .osn_err = true },
- { .osn_state = OS_STATE_SUM, .osn_name = 'a', /* aggregate */ },
- { .osn_state = OS_STATE_NONROT, .osn_name = 'f', /* flash */ },
+ { .osn_state = OS_STATFS_DEGRADED, .osn_name = 'D', .osn_err = true },
+ { .osn_state = OS_STATFS_READONLY, .osn_name = 'R', .osn_err = true },
+ { .osn_state = OS_STATFS_NOPRECREATE,.osn_name = 'N', .osn_err = true },
+ { .osn_state = OS_STATFS_UNUSED1, .osn_name = '?', .osn_err = true },
+ { .osn_state = OS_STATFS_UNUSED2, .osn_name = '?', .osn_err = true },
+ { .osn_state = OS_STATFS_ENOSPC, .osn_name = 'S', .osn_err = true },
+ { .osn_state = OS_STATFS_ENOINO, .osn_name = 'I', .osn_err = true },
+ { .osn_state = OS_STATFS_SUM, .osn_name = 'a', /* aggregate */ },
+ { .osn_state = OS_STATFS_NONROT, .osn_name = 'f', /* flash */ },
};
static int showdf(char *mntdir, struct obd_statfs *stat,
return CMD_HELP;
}
+ /* if "lfs setdirstripe -D -i -1" is used, assume 1-stripe directory */
+ if (default_stripe && lsa.lsa_stripe_off == -1 &&
+ (lsa.lsa_stripe_count == LLAPI_LAYOUT_DEFAULT ||
+ lsa.lsa_stripe_count == 0))
+ lsa.lsa_stripe_count = 1;
if (lsa.lsa_stripe_count != LLAPI_LAYOUT_DEFAULT)
param->lsp_stripe_count = lsa.lsa_stripe_count;
if (lsa.lsa_stripe_off == LLAPI_LAYOUT_DEFAULT)
return 0;
}
-int lfs_setquota_times(int argc, char **argv)
+static inline int lfs_verify_poolarg(char *pool)
{
- int c, rc;
- struct if_quotactl qctl;
- 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[] = {
+ if (strnlen(optarg, LOV_MAXPOOLNAME + 1) > LOV_MAXPOOLNAME) {
+ fprintf(stderr,
+ "Pool name '%.*s' is longer than %d\n",
+ LOV_MAXPOOLNAME, pool, LOV_MAXPOOLNAME);
+ return 1;
+ }
+ return 0;
+}
+
+int lfs_setquota_times(int argc, char **argv, struct if_quotactl *qctl)
+{
+ int c, 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[] = {
{ .val = 'b', .name = "block-grace", .has_arg = required_argument },
{ .val = 'g', .name = "group", .has_arg = no_argument },
{ .val = 'i', .name = "inode-grace", .has_arg = required_argument },
{ .val = 'p', .name = "projid", .has_arg = no_argument },
{ .val = 't', .name = "times", .has_arg = no_argument },
{ .val = 'u', .name = "user", .has_arg = no_argument },
+ { .val = 'o', .name = "pool", .has_arg = required_argument },
{ .name = NULL } };
int qtype;
- memset(&qctl, 0, sizeof(qctl));
- qctl.qc_cmd = LUSTRE_Q_SETINFO;
- qctl.qc_type = ALLQUOTA;
+ qctl->qc_cmd = LUSTRE_Q_SETINFO;
+ qctl->qc_type = ALLQUOTA;
- while ((c = getopt_long(argc, argv, "b:gi:ptu",
+ while ((c = getopt_long(argc, argv, "b:gi:ptuo:",
long_opts, NULL)) != -1) {
switch (c) {
case 'u':
case 'p':
qtype = PRJQUOTA;
quota_type:
- if (qctl.qc_type != ALLQUOTA) {
+ if (qctl->qc_type != ALLQUOTA) {
fprintf(stderr, "error: -u/g/p can't be used "
"more than once\n");
return CMD_HELP;
}
- qctl.qc_type = qtype;
+ qctl->qc_type = qtype;
break;
case 'b':
if (strncmp(optarg, NOTIFY_GRACE,
break;
case 't': /* Yes, of course! */
break;
+ case 'o':
+ if (lfs_verify_poolarg(optarg))
+ return -1;
+ fprintf(stdout,
+ "Trying to set grace for pool %s\n", optarg);
+ strncpy(qctl->qc_poolname, optarg, LOV_MAXPOOLNAME);
+ qctl->qc_cmd = LUSTRE_Q_SETINFOPOOL;
+ break;
/* getopt prints error message for us when opterr != 0 */
default:
return CMD_HELP;
}
}
- if (qctl.qc_type == ALLQUOTA) {
+ if (qctl->qc_type == ALLQUOTA) {
fprintf(stderr, "error: neither -u, -g nor -p specified\n");
- return CMD_HELP;
- }
+ return CMD_HELP;
+ }
- if (optind != argc - 1) {
- fprintf(stderr, "error: unexpected parameters encountered\n");
- return CMD_HELP;
- }
+ if (optind != argc - 1) {
+ fprintf(stderr, "error: unexpected parameters encountered\n");
+ 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(-rc));
- return rc;
- }
+ 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(-rc));
+ return rc;
+ }
- return 0;
+ return 0;
}
#define BSLIMIT (1 << 0)
int lfs_setquota(int argc, char **argv)
{
int c, rc = 0;
- struct if_quotactl qctl;
- char *mnt, *obd_type = (char *)qctl.obd_type;
- struct obd_dqblk *dqb = &qctl.qc_dqblk;
+ struct if_quotactl *qctl;
+ char *mnt, *obd_type;
+ struct obd_dqblk *dqb;
struct option long_opts[] = {
{ .val = 'b', .name = "block-softlimit",
.has_arg = required_argument },
{ .val = 'P', .name = "default-prj", .has_arg = no_argument },
{ .val = 'u', .name = "user", .has_arg = required_argument },
{ .val = 'U', .name = "default-usr", .has_arg = no_argument },
+ { .val = 'o', .name = "pool", .has_arg = required_argument },
{ .name = NULL } };
unsigned limit_mask = 0;
char *endptr;
bool use_default = false;
- int qtype;
+ int qtype, qctl_len;
- if (has_times_option(argc, argv))
- return lfs_setquota_times(argc, argv);
+ qctl_len = sizeof(*qctl) + LOV_MAXPOOLNAME + 1;
+ qctl = malloc(qctl_len);
+ if (!qctl)
+ return -ENOMEM;
+
+ memset(qctl, 0, qctl_len);
+ obd_type = (char *)qctl->obd_type;
+ dqb = &qctl->qc_dqblk;
+
+ if (has_times_option(argc, argv)) {
+ rc = lfs_setquota_times(argc, argv, qctl);
+ goto out;
+ }
- memset(&qctl, 0, sizeof(qctl));
- qctl.qc_cmd = LUSTRE_Q_SETQUOTA;
- qctl.qc_type = ALLQUOTA; /* ALLQUOTA makes no sense for setquota,
+ qctl->qc_cmd = LUSTRE_Q_SETQUOTA;
+ qctl->qc_type = ALLQUOTA; /* ALLQUOTA makes no sense for setquota,
* so it can be used as a marker that qc_type
* isn't reinitialized from command line */
- while ((c = getopt_long(argc, argv, "b:B:dg:Gi:I:p:Pu:U",
+ while ((c = getopt_long(argc, argv, "b:B:dg:Gi:I:p:Pu:Uo:",
long_opts, NULL)) != -1) {
switch (c) {
case 'U':
- qctl.qc_cmd = LUSTRE_Q_SETDEFAULT;
+ qctl->qc_cmd = LUSTRE_Q_SETDEFAULT;
qtype = USRQUOTA;
- qctl.qc_id = 0;
+ qctl->qc_id = 0;
goto quota_type_def;
case 'u':
qtype = USRQUOTA;
- rc = name2uid(&qctl.qc_id, optarg);
+ rc = name2uid(&qctl->qc_id, optarg);
goto quota_type;
case 'G':
- qctl.qc_cmd = LUSTRE_Q_SETDEFAULT;
+ qctl->qc_cmd = LUSTRE_Q_SETDEFAULT;
qtype = GRPQUOTA;
- qctl.qc_id = 0;
+ qctl->qc_id = 0;
goto quota_type_def;
case 'g':
qtype = GRPQUOTA;
- rc = name2gid(&qctl.qc_id, optarg);
+ rc = name2gid(&qctl->qc_id, optarg);
goto quota_type;
case 'P':
- qctl.qc_cmd = LUSTRE_Q_SETDEFAULT;
+ qctl->qc_cmd = LUSTRE_Q_SETDEFAULT;
qtype = PRJQUOTA;
- qctl.qc_id = 0;
+ qctl->qc_id = 0;
goto quota_type_def;
case 'p':
qtype = PRJQUOTA;
- rc = name2projid(&qctl.qc_id, optarg);
+ rc = name2projid(&qctl->qc_id, optarg);
quota_type:
if (rc) {
- qctl.qc_id = strtoul(optarg, &endptr, 10);
+ qctl->qc_id = strtoul(optarg, &endptr, 10);
if (*endptr != '\0') {
fprintf(stderr, "%s setquota: invalid"
" id '%s'\n", progname, optarg);
- return -1;
+ rc = -1;
+ goto out;
}
}
- if (qctl.qc_id == 0) {
+ if (qctl->qc_id == 0) {
fprintf(stderr, "%s setquota: can't set quota"
" for root usr/group/project.\n",
progname);
- return -1;
+ rc = -1;
+ goto out;
}
quota_type_def:
- if (qctl.qc_type != ALLQUOTA) {
+ if (qctl->qc_type != ALLQUOTA) {
fprintf(stderr,
"%s setquota: only one of -u, -U, -g,"
" -G, -p or -P may be specified\n",
progname);
- return CMD_HELP;
+ rc = CMD_HELP;
+ goto out;
}
- qctl.qc_type = qtype;
+ qctl->qc_type = qtype;
break;
case 'd':
- qctl.qc_cmd = LUSTRE_Q_SETDEFAULT;
+ qctl->qc_cmd = LUSTRE_Q_SETDEFAULT;
use_default = true;
break;
case 'b':
(unsigned long long)dqb->dqb_ihardlimit,
progname);
break;
+ case 'o':
+ if (lfs_verify_poolarg(optarg)) {
+ rc = -1;
+ goto out;
+ }
+ fprintf(stdout,
+ "Trying to set quota for pool %s\n", optarg);
+ strncpy(qctl->qc_poolname, optarg, LOV_MAXPOOLNAME);
+ qctl->qc_cmd = LUSTRE_Q_SETQUOTAPOOL;
+ break;
default:
fprintf(stderr,
"%s setquota: unrecognized option '%s'\n",
progname, argv[optind - 1]);
- return CMD_HELP;
+ rc = CMD_HELP;
+ goto out;
}
}
- if (qctl.qc_type == ALLQUOTA) {
+ if (qctl->qc_type == ALLQUOTA) {
fprintf(stderr,
"%s setquota: either -u or -g must be specified\n",
progname);
- return CMD_HELP;
+ rc = CMD_HELP;
+ goto out;
}
if (!use_default && limit_mask == 0) {
fprintf(stderr,
"%s setquota: at least one limit must be specified\n",
progname);
- return CMD_HELP;
+ rc = CMD_HELP;
+ goto out;
}
if (use_default && limit_mask != 0) {
"%s setquota: limits should not be specified when"
" using default quota\n",
progname);
- return CMD_HELP;
+ rc = CMD_HELP;
+ goto out;
}
- if (use_default && qctl.qc_id == 0) {
+ if (use_default && qctl->qc_id == 0) {
fprintf(stderr,
"%s setquota: can not set default quota for root"
" user/group/project\n",
progname);
- return CMD_HELP;
+ rc = CMD_HELP;
+ goto out;
}
if (optind != argc - 1) {
fprintf(stderr,
"%s setquota: filesystem not specified or unexpected argument '%s'\n",
progname, argv[optind]);
- return CMD_HELP;
+ rc = CMD_HELP;
+ goto out;
}
mnt = argv[optind];
(!(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};
+ .qc_type = qctl->qc_type,
+ .qc_id = qctl->qc_id};
rc = llapi_quotactl(mnt, &tmp_qctl);
if (rc < 0)
- return rc;
+ goto out;
if (!(limit_mask & BHLIMIT))
dqb->dqb_bhardlimit = tmp_qctl.qc_dqblk.dqb_bhardlimit;
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);
+ rc = llapi_quotactl(mnt, qctl);
if (rc) {
if (*obd_type)
fprintf(stderr,
"%s setquota: cannot quotactl '%s' '%s': %s",
progname, obd_type,
- obd_uuid2str(&qctl.obd_uuid), strerror(-rc));
- return rc;
+ obd_uuid2str(&qctl->obd_uuid), strerror(-rc));
}
-
- return 0;
+out:
+ free(qctl);
+ return rc;
}
/* Converts seconds value into format string
time(&now);
if (qctl->qc_cmd == LUSTRE_Q_GETQUOTA || qctl->qc_cmd == Q_GETOQUOTA ||
+ qctl->qc_cmd == LUSTRE_Q_GETQUOTAPOOL ||
qctl->qc_cmd == LUSTRE_Q_GETDEFAULT) {
int bover = 0, iover = 0;
struct obd_dqblk *dqb = &qctl->qc_dqblk;
else
printf(" %7s %7s %7s %7s", "-", "-", "-", "-");
printf("\n");
- } else if (qctl->qc_cmd == LUSTRE_Q_GETINFO ||
+ } else if (qctl->qc_cmd == LUSTRE_Q_GETINFO || LUSTRE_Q_GETINFOPOOL ||
qctl->qc_cmd == Q_GETOINFO) {
char bgtimebuf[40];
char igtimebuf[40];
int rc = 0, rc1 = 0, count = 0;
__u32 valid = qctl->qc_valid;
+ /* TODO: for commands LUSTRE_Q_"S\|G"ETQUOTAPOOL we need
+ * to go only through OSTs that belong to requested pool. */
rc = llapi_get_obd_count(mnt, &count, is_mdt);
if (rc) {
fprintf(stderr, "can not get %s count: %s\n",
}
if ((qctl->qc_cmd == LUSTRE_Q_GETQUOTA ||
+ qctl->qc_cmd == LUSTRE_Q_GETQUOTAPOOL ||
qctl->qc_cmd == LUSTRE_Q_GETDEFAULT) && !quiet)
print_quota_title(name, qctl, human_readable, show_default);
if (qctl->qc_valid != QC_GENERAL)
mnt = "";
- inacc = (qctl->qc_cmd == LUSTRE_Q_GETQUOTA) &&
+ inacc = (qctl->qc_cmd == LUSTRE_Q_GETQUOTA ||
+ qctl->qc_cmd == LUSTRE_Q_GETQUOTAPOOL) &&
((qctl->qc_dqblk.dqb_valid & (QIF_LIMITS|QIF_USAGE)) !=
(QIF_LIMITS|QIF_USAGE));
print_quota(mnt, qctl, QC_GENERAL, rc1, human_readable, show_default);
if (!show_default && verbose &&
- qctl->qc_valid == QC_GENERAL && qctl->qc_cmd != LUSTRE_Q_GETINFO) {
+ qctl->qc_valid == QC_GENERAL && qctl->qc_cmd != LUSTRE_Q_GETINFO &&
+ qctl->qc_cmd != LUSTRE_Q_GETINFOPOOL) {
char strbuf[STRBUF_LEN];
rc2 = print_obd_quota(mnt, qctl, 1, human_readable,
{
int c;
char *mnt, *name = NULL;
- struct if_quotactl qctl = { .qc_cmd = LUSTRE_Q_GETQUOTA,
- .qc_type = ALLQUOTA };
- char *obd_uuid = (char *)qctl.obd_uuid.uuid;
+ struct if_quotactl *qctl;
+ char *obd_uuid;
int rc = 0, rc1 = 0, verbose = 0, quiet = 0;
char *endptr;
__u32 valid = QC_GENERAL, idx = 0;
bool human_readable = false;
bool show_default = false;
int qtype;
+ struct option long_opts[] = {
+ { .val = 1, .name = "pool", .has_arg = required_argument },
+ { .name = NULL } };
+
+ qctl = calloc(1, sizeof(*qctl) + LOV_MAXPOOLNAME + 1);
+ if (!qctl)
+ return -ENOMEM;
+
+ qctl->qc_cmd = LUSTRE_Q_GETQUOTA;
+ qctl->qc_type = ALLQUOTA;
+ obd_uuid = (char *)qctl->obd_uuid.uuid;
- while ((c = getopt(argc, argv, "gGi:I:o:pPqtuUvh")) != -1) {
+ while ((c = getopt_long(argc, argv, "gGi:I:o:pPqtuUvh",
+ long_opts, NULL)) != -1) {
switch (c) {
case 'U':
show_default = true;
case 'p':
qtype = PRJQUOTA;
quota_type:
- if (qctl.qc_type != ALLQUOTA) {
+ if (qctl->qc_type != ALLQUOTA) {
fprintf(stderr,
"%s quota: only one of -u, -g, or -p may be specified\n",
progname);
- return CMD_HELP;
+ rc = CMD_HELP;
+ goto out;
}
- qctl.qc_type = qtype;
+ qctl->qc_type = qtype;
break;
case 't':
- qctl.qc_cmd = LUSTRE_Q_GETINFO;
+ qctl->qc_cmd = LUSTRE_Q_GETINFO;
break;
case 'o':
- valid = qctl.qc_valid = QC_UUID;
- snprintf(obd_uuid, sizeof(qctl.obd_uuid), "%s", optarg);
+ valid = qctl->qc_valid = QC_UUID;
+ snprintf(obd_uuid, sizeof(*obd_uuid), "%s", optarg);
break;
case 'i':
- valid = qctl.qc_valid = QC_MDTIDX;
- idx = qctl.qc_idx = atoi(optarg);
+ valid = qctl->qc_valid = QC_MDTIDX;
+ idx = qctl->qc_idx = atoi(optarg);
if (idx == 0 && *optarg != '0') {
fprintf(stderr,
"%s quota: invalid MDT index '%s'\n",
progname, optarg);
- return CMD_HELP;
+ rc = CMD_HELP;
+ goto out;
}
break;
case 'I':
- valid = qctl.qc_valid = QC_OSTIDX;
- idx = qctl.qc_idx = atoi(optarg);
+ valid = qctl->qc_valid = QC_OSTIDX;
+ idx = qctl->qc_idx = atoi(optarg);
if (idx == 0 && *optarg != '0') {
fprintf(stderr,
"%s quota: invalid OST index '%s'\n",
progname, optarg);
- return CMD_HELP;
+ rc = CMD_HELP;
+ goto out;
}
break;
case 'v':
case 'h':
human_readable = true;
break;
+ case 1:
+ if (lfs_verify_poolarg(optarg)) {
+ rc = -1;
+ goto out;
+ }
+ strncpy(qctl->qc_poolname, optarg, LOV_MAXPOOLNAME);
+ qctl->qc_cmd = qctl->qc_cmd == LUSTRE_Q_GETINFO ?
+ LUSTRE_Q_GETINFOPOOL :
+ LUSTRE_Q_GETQUOTAPOOL;
+ break;
default:
fprintf(stderr, "%s quota: unrecognized option '%s'\n",
progname, argv[optind - 1]);
- return CMD_HELP;
+ rc = CMD_HELP;
+ goto out;
}
}
/* current uid/gid info for "lfs quota /path/to/lustre/mount" */
- if (qctl.qc_cmd == LUSTRE_Q_GETQUOTA && qctl.qc_type == ALLQUOTA &&
- optind == argc - 1 && !show_default) {
+ if ((qctl->qc_cmd == LUSTRE_Q_GETQUOTA ||
+ qctl->qc_cmd == LUSTRE_Q_GETQUOTAPOOL) &&
+ qctl->qc_type == ALLQUOTA &&
+ optind == argc - 1 && !show_default) {
- qctl.qc_cmd = LUSTRE_Q_GETQUOTA;
- qctl.qc_idx = idx;
+ qctl->qc_idx = idx;
for (qtype = USRQUOTA; qtype <= GRPQUOTA; qtype++) {
- qctl.qc_type = qtype;
- qctl.qc_valid = valid;
+ qctl->qc_type = qtype;
+ qctl->qc_valid = valid;
if (qtype == USRQUOTA) {
- qctl.qc_id = geteuid();
- rc = uid2name(&name, qctl.qc_id);
+ qctl->qc_id = geteuid();
+ rc = uid2name(&name, qctl->qc_id);
} else {
- qctl.qc_id = getegid();
- rc = gid2name(&name, qctl.qc_id);
- memset(&qctl.qc_dqblk, 0,
- sizeof(qctl.qc_dqblk));
+ qctl->qc_id = getegid();
+ rc = gid2name(&name, qctl->qc_id);
+ memset(&qctl->qc_dqblk, 0,
+ sizeof(qctl->qc_dqblk));
}
if (rc)
name = "<unknown>";
mnt = argv[optind];
- rc1 = get_print_quota(mnt, name, &qctl, verbose, quiet,
+ rc1 = get_print_quota(mnt, name, qctl, verbose, quiet,
human_readable, show_default);
if (rc1 && !rc)
rc = rc1;
}
- return rc;
+ goto out;
/* lfs quota -u username /path/to/lustre/mount */
- } else if (qctl.qc_cmd == LUSTRE_Q_GETQUOTA) {
+ } else if (qctl->qc_cmd == LUSTRE_Q_GETQUOTA ||
+ qctl->qc_cmd == LUSTRE_Q_GETQUOTAPOOL) {
/* options should be followed by u/g-name and mntpoint */
if ((!show_default && optind + 2 != argc) ||
(show_default && optind + 1 != argc) ||
- qctl.qc_type == ALLQUOTA) {
+ qctl->qc_type == ALLQUOTA) {
fprintf(stderr,
"%s quota: name and mount point must be specified\n",
progname);
- return CMD_HELP;
+ rc = CMD_HELP;
+ goto out;
}
if (!show_default) {
name = argv[optind++];
- switch (qctl.qc_type) {
+ switch (qctl->qc_type) {
case USRQUOTA:
- rc = name2uid(&qctl.qc_id, name);
+ rc = name2uid(&qctl->qc_id, name);
break;
case GRPQUOTA:
- rc = name2gid(&qctl.qc_id, name);
+ rc = name2gid(&qctl->qc_id, name);
break;
case PRJQUOTA:
- rc = name2projid(&qctl.qc_id, name);
+ rc = name2projid(&qctl->qc_id, name);
break;
default:
rc = -ENOTSUP;
break;
}
} else {
- qctl.qc_valid = QC_GENERAL;
- qctl.qc_cmd = LUSTRE_Q_GETDEFAULT;
- qctl.qc_id = 0;
+ qctl->qc_valid = QC_GENERAL;
+ qctl->qc_cmd = LUSTRE_Q_GETDEFAULT;
+ qctl->qc_id = 0;
}
if (rc) {
- qctl.qc_id = strtoul(name, &endptr, 10);
+ qctl->qc_id = strtoul(name, &endptr, 10);
if (*endptr != '\0') {
fprintf(stderr, "%s quota: invalid id '%s'\n",
progname, name);
- return CMD_HELP;
+ rc = CMD_HELP;
+ goto out;
}
}
- } else if (optind + 1 != argc || qctl.qc_type == ALLQUOTA) {
+ } else if (optind + 1 != argc || qctl->qc_type == ALLQUOTA) {
fprintf(stderr, "%s quota: missing quota info argument(s)\n",
progname);
- return CMD_HELP;
+ rc = CMD_HELP;
+ goto out;
}
mnt = argv[optind];
- rc = get_print_quota(mnt, name, &qctl, verbose, quiet,
+ rc = get_print_quota(mnt, name, qctl, verbose, quiet,
human_readable, show_default);
+out:
+ free(qctl);
return rc;
}
#endif /* HAVE_SYS_QUOTA_H! */
git://git.whamcloud.com / fs / lustre-release.git / blobdiff