#include <lnet/lnetctl.h>
-#include <liblustre.h>
+#include <libcfs/libcfs.h>
+#include <lustre/lustre_idl.h>
#include <lustre/lustreapi.h>
#include <libcfs/libcfsutil.h>
-#include <obd.h>
-#include <obd_lov.h>
#include "obdctl.h"
/* all functions */
static int lfs_hsm_remove(int argc, char **argv);
static int lfs_hsm_cancel(int argc, char **argv);
static int lfs_swap_layouts(int argc, char **argv);
+static int lfs_mv(int argc, char **argv);
#define SETSTRIPE_USAGE(_cmd, _tgt) \
"usage: "_cmd" [--stripe-count|-c <stripe_count>]\n"\
" <directory|filename> ..."},
{"setdirstripe", lfs_setdirstripe, 0,
"To create a remote directory on a specified MDT.\n"
- "usage: setdirstripe <--index|-i mdt_index> <dir>\n"
- "\tmdt_index: MDT index of first stripe\n"},
+ "usage: setdirstripe <--count|-c stripe_count>\n"
+ "[--index|-i mdt_index] [--hash-type|-t hash_type]\n"
+ "[--default_stripe|-D ] <dir>\n"
+ "\tstripe_count: stripe count of the striped directory\n"
+ "\tmdt_index: MDT index of first stripe\n"
+ "\thash_type: hash type of the striped directory\n"
+ "\tdefault_stripe: set default dirstripe of the directory\n"},
{"getdirstripe", lfs_getdirstripe, 0,
"To list the striping info for a given directory\n"
"or recursively for all directories in a directory tree.\n"
"usage: getdirstripe [--obd|-O <uuid>] [--quiet|-q] [--verbose|-v]\n"
" [--count|-c ] [--index|-i ] [--raw|-R]\n"
- " [--recursive | -r] <dir> ..."},
+ " [--recursive | -r] [ --default_stripe | -D ] <dir> "},
{"mkdir", lfs_setdirstripe, 0,
"To create a remote directory on a specified MDT. And this can only\n"
"be done on MDT0 by administrator.\n"
"usage: hsm_cancel [--filelist FILELIST] [--data DATA] <file> ..."},
{"swap_layouts", lfs_swap_layouts, 0, "Swap layouts between 2 files.\n"
"usage: swap_layouts <path1> <path2>"},
- {"migrate", lfs_setstripe, 0, "migrate file from one layout to "
+ {"migrate", lfs_setstripe, 0, "migrate file from one OST layout to "
"another (may be not safe with concurent writes).\n"
SETSTRIPE_USAGE("migrate ", "<filename>")},
- {"help", Parser_help, 0, "help"},
- {"exit", Parser_quit, 0, "quit"},
- {"quit", Parser_quit, 0, "quit"},
- { 0, 0, 0, NULL }
+ {"mv", lfs_mv, 0,
+ "To move directories between MDTs.\n"
+ "usage: mv <directory|filename> [--mdt-index|-M] <mdt_index> "
+ "[--verbose|-v]\n"},
+ {"help", Parser_help, 0, "help"},
+ {"exit", Parser_quit, 0, "quit"},
+ {"quit", Parser_quit, 0, "quit"},
+ { 0, 0, 0, NULL }
};
#define MIGRATION_BLOCKS 1
__u64 rpos, wpos, bufoff;
int gid = 0, sz;
int have_gl = 0;
+ struct stat st, stv;
/* find the right size for the IO and allocate the buffer */
lumsz = lov_user_md_size(LOV_MAX_STRIPE_COUNT, LOV_USER_MAGIC_V3);
goto free;
}
+ /* Not-owner (root?) special case.
+ * Need to set owner/group of volatile file like original.
+ * This will allow to pass related check during layout_swap.
+ */
+ rc = fstat(fd, &st);
+ if (rc != 0) {
+ rc = -errno;
+ fprintf(stderr, "cannot stat %s (%s)\n", name,
+ strerror(errno));
+ goto error;
+ }
+ rc = fstat(fdv, &stv);
+ if (rc != 0) {
+ rc = -errno;
+ fprintf(stderr, "cannot stat %s (%s)\n", volatile_file,
+ strerror(errno));
+ goto error;
+ }
+ if (st.st_uid != stv.st_uid || st.st_gid != stv.st_gid) {
+ rc = fchown(fdv, st.st_uid, st.st_gid);
+ if (rc != 0) {
+ rc = -errno;
+ fprintf(stderr, "cannot chown %s (%s)\n", name,
+ strerror(errno));
+ goto error;
+ }
+ }
+
/* get file data version */
rc = llapi_get_data_version(fd, &dv1, LL_DV_RD_FLUSH);
if (rc != 0) {
{
int c, ret;
time_t t;
- struct find_param param = { .maxdepth = -1, .quiet = 1 };
+ struct find_param param = {
+ .fp_max_depth = -1,
+ .quiet = 1,
+ };
struct option long_opts[] = {
{"atime", required_argument, 0, 'A'},
{"stripe-count", required_argument, 0, 'c'},
if (strcmp(optarg, "!") == 0)
neg_opt = 2;
break;
- case 'A':
- xtime = ¶m.atime;
- xsign = ¶m.asign;
- param.exclude_atime = !!neg_opt;
- /* no break, this falls through to 'C' for ctime */
- case 'C':
- if (c == 'C') {
- xtime = ¶m.ctime;
- xsign = ¶m.csign;
- param.exclude_ctime = !!neg_opt;
- }
- /* no break, this falls through to 'M' for mtime */
- case 'M':
- if (c == 'M') {
- xtime = ¶m.mtime;
- xsign = ¶m.msign;
- param.exclude_mtime = !!neg_opt;
- }
+ case 'A':
+ xtime = ¶m.fp_atime;
+ xsign = ¶m.fp_asign;
+ param.fp_exclude_atime = !!neg_opt;
+ /* no break, this falls through to 'C' for ctime */
+ case 'C':
+ if (c == 'C') {
+ xtime = ¶m.fp_ctime;
+ xsign = ¶m.fp_csign;
+ param.fp_exclude_ctime = !!neg_opt;
+ }
+ /* no break, this falls through to 'M' for mtime */
+ case 'M':
+ if (c == 'M') {
+ xtime = ¶m.fp_mtime;
+ xsign = ¶m.fp_msign;
+ param.fp_exclude_mtime = !!neg_opt;
+ }
ret = set_time(&t, xtime, optarg);
if (ret == INT_MAX) {
ret = -1;
param.check_stripecount = 1;
param.exclude_stripecount = !!neg_opt;
break;
- case 'D':
- param.maxdepth = strtol(optarg, 0, 0);
- break;
- case 'g':
- case 'G':
- ret = name2id(¶m.gid, optarg, GROUP);
- if (ret) {
- param.gid = strtoul(optarg, &endptr, 10);
+ case 'D':
+ param.fp_max_depth = strtol(optarg, 0, 0);
+ break;
+ case 'g':
+ case 'G':
+ ret = name2id(¶m.fp_gid, optarg, GROUP);
+ if (ret) {
+ param.fp_gid = strtoul(optarg, &endptr, 10);
if (*endptr != '\0') {
fprintf(stderr, "Group/GID: %s cannot "
"be found.\n", optarg);
goto err;
}
}
- param.exclude_gid = !!neg_opt;
- param.check_gid = 1;
+ param.fp_exclude_gid = !!neg_opt;
+ param.fp_check_gid = 1;
break;
case 'L':
ret = name2layout(¶m.layout, optarg);
break;
case 'u':
case 'U':
- ret = name2id(¶m.uid, optarg, USER);
- if (ret) {
- param.uid = strtoul(optarg, &endptr, 10);
+ ret = name2id(¶m.fp_uid, optarg, USER);
+ if (ret) {
+ param.fp_uid = strtoul(optarg, &endptr, 10);
if (*endptr != '\0') {
fprintf(stderr, "User/UID: %s cannot "
"be found.\n", optarg);
goto err;
}
}
- param.exclude_uid = !!neg_opt;
- param.check_uid = 1;
+ param.fp_exclude_uid = !!neg_opt;
+ param.fp_check_uid = 1;
break;
case FIND_POOL_OPT:
if (strlen(optarg) > LOV_MAXPOOLNAME) {
param.check_stripesize = 1;
param.exclude_stripesize = !!neg_opt;
break;
- case 't':
- param.exclude_type = !!neg_opt;
- switch(optarg[0]) {
- case 'b': param.type = S_IFBLK; break;
- case 'c': param.type = S_IFCHR; break;
- case 'd': param.type = S_IFDIR; break;
- case 'f': param.type = S_IFREG; break;
- case 'l': param.type = S_IFLNK; break;
- case 'p': param.type = S_IFIFO; break;
- case 's': param.type = S_IFSOCK; break;
-#ifdef S_IFDOOR /* Solaris only */
- case 'D': param.type = S_IFDOOR; break;
-#endif
- default: fprintf(stderr, "error: %s: bad type '%s'\n",
- argv[0], optarg);
- ret = CMD_HELP;
- goto err;
- };
- break;
+ case 't':
+ param.fp_exclude_type = !!neg_opt;
+ switch (optarg[0]) {
+ case 'b':
+ param.fp_type = S_IFBLK;
+ break;
+ case 'c':
+ param.fp_type = S_IFCHR;
+ break;
+ case 'd':
+ param.fp_type = S_IFDIR;
+ break;
+ case 'f':
+ param.fp_type = S_IFREG;
+ break;
+ case 'l':
+ param.fp_type = S_IFLNK;
+ break;
+ case 'p':
+ param.fp_type = S_IFIFO;
+ break;
+ case 's':
+ param.fp_type = S_IFSOCK;
+ break;
+ default:
+ fprintf(stderr, "error: %s: bad type '%s'\n",
+ argv[0], optarg);
+ ret = CMD_HELP;
+ goto err;
+ };
+ break;
default:
ret = CMD_HELP;
goto err;
{"stripe-count", no_argument, 0, 'c'},
{"stripe_count", no_argument, 0, 'c'},
{"directory", no_argument, 0, 'd'},
+ {"default", no_argument, 0, 'D'},
{"generation", no_argument, 0, 'g'},
#if LUSTRE_VERSION_CODE < OBD_OCD_VERSION(2, 9, 53, 0)
/* This formerly implied "stripe-index", but was explicitly
};
int c, rc;
- param->maxdepth = 1;
+ param->fp_max_depth = 1;
optind = 0;
- while ((c = getopt_long(argc, argv, "cdghiLMoO:pqrRsSv",
+ while ((c = getopt_long(argc, argv, "cdDghiLMoO:pqrRsSv",
long_opts, NULL)) != -1) {
switch (c) {
case 'O':
param->quiet++;
break;
case 'd':
- param->maxdepth = 0;
+ param->fp_max_depth = 0;
+ break;
+ case 'D':
+ param->get_default_lmv = 1;
break;
case 'r':
param->recursive = 1;
#endif
if (!(param->verbose & VERBOSE_DETAIL)) {
param->verbose |= VERBOSE_COUNT;
- param->maxdepth = 0;
+ param->fp_max_depth = 0;
}
break;
#if LUSTRE_VERSION_CODE < OBD_OCD_VERSION(2, 9, 53, 0)
case 'S':
if (!(param->verbose & VERBOSE_DETAIL)) {
param->verbose |= VERBOSE_SIZE;
- param->maxdepth = 0;
+ param->fp_max_depth = 0;
}
break;
#if LUSTRE_VERSION_CODE < OBD_OCD_VERSION(2, 9, 53, 0)
#endif
if (!(param->verbose & VERBOSE_DETAIL)) {
param->verbose |= VERBOSE_OFFSET;
- param->maxdepth = 0;
+ param->fp_max_depth = 0;
}
break;
case 'p':
if (!(param->verbose & VERBOSE_DETAIL)) {
param->verbose |= VERBOSE_POOL;
- param->maxdepth = 0;
+ param->fp_max_depth = 0;
}
break;
case 'g':
if (!(param->verbose & VERBOSE_DETAIL)) {
param->verbose |= VERBOSE_GENERATION;
- param->maxdepth = 0;
+ param->fp_max_depth = 0;
}
break;
case 'L':
if (!(param->verbose & VERBOSE_DETAIL)) {
param->verbose |= VERBOSE_LAYOUT;
- param->maxdepth = 0;
+ param->fp_max_depth = 0;
}
break;
case 'M':
if (!(param->verbose & VERBOSE_DETAIL))
- param->maxdepth = 0;
+ param->fp_max_depth = 0;
param->verbose |= VERBOSE_MDTINDEX;
break;
case 'R':
return CMD_HELP;
if (param->recursive)
- param->maxdepth = -1;
+ param->fp_max_depth = -1;
if (!param->verbose)
param->verbose = VERBOSE_ALL;
/* functions */
static int lfs_setdirstripe(int argc, char **argv)
{
- char *dname;
- int result;
- int st_offset, st_count;
- char *end;
- int c;
- char *stripe_off_arg = NULL;
- int flags = 0;
+ char *dname;
+ int result;
+ unsigned int stripe_offset = -1;
+ unsigned int stripe_count = 1;
+ enum lmv_hash_type hash_type;
+ char *end;
+ int c;
+ char *stripe_offset_opt = NULL;
+ char *stripe_count_opt = NULL;
+ char *stripe_hash_opt = NULL;
+ int default_stripe = 0;
struct option long_opts[] = {
- {"index", required_argument, 0, 'i'},
+ {"count", required_argument, 0, 'c'},
+ {"index", required_argument, 0, 'i'},
+ {"hash-type", required_argument, 0, 't'},
+ {"default_stripe", required_argument, 0, 'D'},
{0, 0, 0, 0}
};
- st_offset = -1;
- st_count = 1;
optind = 0;
- while ((c = getopt_long(argc, argv, "i:o",
- long_opts, NULL)) >= 0) {
+
+ while ((c = getopt_long(argc, argv, "c:Di:t:", long_opts, NULL)) >= 0) {
switch (c) {
case 0:
/* Long options. */
break;
+ case 'c':
+ stripe_count_opt = optarg;
+ break;
+ case 'D':
+ default_stripe = 1;
+ break;
case 'i':
- stripe_off_arg = optarg;
+ stripe_offset_opt = optarg;
+ break;
+ case 't':
+ stripe_hash_opt = optarg;
break;
default:
fprintf(stderr, "error: %s: option '%s' "
return CMD_HELP;
}
- dname = argv[optind];
- if (stripe_off_arg == NULL) {
- fprintf(stderr, "error: %s: missing stripe_off.\n",
+ if (stripe_offset_opt == NULL && stripe_count_opt == NULL) {
+ fprintf(stderr, "error: %s: missing stripe offset and count.\n",
argv[0]);
return CMD_HELP;
}
- /* get the stripe offset */
- st_offset = strtoul(stripe_off_arg, &end, 0);
- if (*end != '\0') {
- fprintf(stderr, "error: %s: bad stripe offset '%s'\n",
- argv[0], stripe_off_arg);
+
+ if (stripe_offset_opt != NULL) {
+ /* get the stripe offset */
+ stripe_offset = strtoul(stripe_offset_opt, &end, 0);
+ if (*end != '\0') {
+ fprintf(stderr, "error: %s: bad stripe offset '%s'\n",
+ argv[0], stripe_offset_opt);
+ return CMD_HELP;
+ }
+ }
+
+ if (stripe_hash_opt == NULL ||
+ strcmp(stripe_hash_opt, LMV_HASH_NAME_FNV_1A_64) == 0) {
+ hash_type = LMV_HASH_TYPE_FNV_1A_64;
+ } else if (strcmp(stripe_hash_opt, LMV_HASH_NAME_ALL_CHARS) == 0) {
+ hash_type = LMV_HASH_TYPE_ALL_CHARS;
+ } else {
+ fprintf(stderr, "error: %s: bad stripe hash type '%s'\n",
+ argv[0], stripe_hash_opt);
return CMD_HELP;
}
+
+ /* get the stripe count */
+ if (stripe_count_opt != NULL) {
+ stripe_count = strtoul(stripe_count_opt, &end, 0);
+ if (*end != '\0') {
+ fprintf(stderr, "error: %s: bad stripe count '%s'\n",
+ argv[0], stripe_count_opt);
+ return CMD_HELP;
+ }
+ }
+
+ dname = argv[optind];
do {
- result = llapi_dir_create_pool(dname, flags, st_offset,
- st_count, 0, NULL);
+ if (default_stripe == 1) {
+ result = llapi_dir_set_default_lmv_stripe(dname,
+ stripe_offset, stripe_count,
+ hash_type, NULL);
+ } else {
+ result = llapi_dir_create_pool(dname, 0, stripe_offset,
+ stripe_count, hash_type,
+ NULL);
+ }
+
if (result) {
fprintf(stderr, "error: %s: create stripe dir '%s' "
"failed\n", argv[0], dname);
return result;
}
+static int lfs_mv(int argc, char **argv)
+{
+ struct find_param param = {
+ .fp_max_depth = -1,
+ .mdtindex = -1,
+ };
+ char *end;
+ int c;
+ int rc = 0;
+ struct option long_opts[] = {
+ {"--mdt-index", required_argument, 0, 'M'},
+ {"verbose", no_argument, 0, 'v'},
+ {0, 0, 0, 0}
+ };
+
+ while ((c = getopt_long(argc, argv, "M:v", long_opts, NULL)) != -1) {
+ switch (c) {
+ case 'M': {
+ param.mdtindex = strtoul(optarg, &end, 0);
+ if (*end != '\0') {
+ fprintf(stderr, "%s: invalid MDT index'%s'\n",
+ argv[0], optarg);
+ return CMD_HELP;
+ }
+ break;
+ }
+ case 'v': {
+ param.verbose = VERBOSE_DETAIL;
+ break;
+ }
+ default:
+ fprintf(stderr, "error: %s: unrecognized option '%s'\n",
+ argv[0], argv[optind - 1]);
+ return CMD_HELP;
+ }
+ }
+
+ if (param.mdtindex == -1) {
+ fprintf(stderr, "%s MDT index must be indicated\n", argv[0]);
+ return CMD_HELP;
+ }
+
+ if (optind >= argc) {
+ fprintf(stderr, "%s missing operand path\n", argv[0]);
+ return CMD_HELP;
+ }
+
+ param.migrate = 1;
+ rc = llapi_mv(argv[optind], ¶m);
+ if (rc != 0)
+ fprintf(stderr, "cannot migrate '%s' to MDT%04x: %s\n",
+ argv[optind], param.mdtindex, strerror(-rc));
+ return rc;
+}
+
static int lfs_osts(int argc, char **argv)
{
return lfs_tgts(argc, argv);
static int mntdf(char *mntdir, char *fsname, char *pool, int ishow,
int cooked, int lazy)
{
- struct obd_statfs stat_buf, sum = { .os_bsize = 1 };
- struct obd_uuid uuid_buf;
- char *poolname = NULL;
- struct ll_stat_type types[] = { { LL_STATFS_LMV, "MDT" },
- { LL_STATFS_LOV, "OST" },
- { 0, NULL } };
- struct ll_stat_type *tp;
- __u32 index;
- __u32 type;
- int rc;
+ struct obd_statfs stat_buf, sum = { .os_bsize = 1 };
+ struct obd_uuid uuid_buf;
+ char *poolname = NULL;
+ struct ll_stat_type types[] = { { LL_STATFS_LMV, "MDT" },
+ { LL_STATFS_LOV, "OST" },
+ { 0, NULL } };
+ struct ll_stat_type *tp;
+ __u64 ost_ffree = 0;
+ __u32 index;
+ __u32 type;
+ int rc;
if (pool) {
poolname = strchr(pool, '.');
sum.os_ffree += stat_buf.os_ffree;
sum.os_files += stat_buf.os_files;
} else /* if (tp->st_op == LL_STATFS_LOV) */ {
- sum.os_blocks += stat_buf.os_blocks *
- stat_buf.os_bsize;
- sum.os_bfree += stat_buf.os_bfree *
- stat_buf.os_bsize;
- sum.os_bavail += stat_buf.os_bavail *
- stat_buf.os_bsize;
- }
- } else if (rc == -EINVAL || rc == -EFAULT) {
- break;
- }
- }
- }
+ sum.os_blocks += stat_buf.os_blocks *
+ stat_buf.os_bsize;
+ sum.os_bfree += stat_buf.os_bfree *
+ stat_buf.os_bsize;
+ sum.os_bavail += stat_buf.os_bavail *
+ stat_buf.os_bsize;
+ ost_ffree += stat_buf.os_ffree;
+ }
+ } else if (rc == -EINVAL || rc == -EFAULT) {
+ break;
+ }
+ }
+ }
- printf("\n");
- showdf(mntdir, &sum, "filesystem summary:", ishow, cooked, NULL, 0,0);
- printf("\n");
- return 0;
+ /* If we don't have as many objects free on the OST as inodes
+ * on the MDS, we reduce the total number of inodes to
+ * compensate, so that the "inodes in use" number is correct.
+ * Matches ll_statfs_internal() so the results are consistent. */
+ if (ost_ffree < sum.os_ffree) {
+ sum.os_files = (sum.os_files - sum.os_ffree) + ost_ffree;
+ sum.os_ffree = ost_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)
sprintf(buf, LPU64, num);
} else {
if (num >> 30)
- sprintf(buf, LPU64"%s", num >> 30, "T");
+ sprintf(buf, "%5.4gT", (double)num / (1 << 30));
else if (num >> 20)
- sprintf(buf, LPU64"%s", num >> 20, "G");
+ sprintf(buf, "%5.4gG", (double)num / (1 << 20));
else if (num >> 10)
- sprintf(buf, LPU64"%s", num >> 10, "M");
+ sprintf(buf, "%5.4gM", (double)num / (1 << 10));
else
- sprintf(buf, LPU64"%s", num, "K");
+ sprintf(buf, LPU64"%s", num, "k");
}
}
verbose) {
char strbuf[32];
- kbytes2str(total_balloc, strbuf, human_readable);
rc2 = print_obd_quota(mnt, &qctl, 1, human_readable,
&total_ialloc);
rc3 = print_obd_quota(mnt, &qctl, 0, human_readable,
&total_balloc);
+ kbytes2str(total_balloc, strbuf, human_readable);
printf("Total allocated inode limit: "LPU64", total "
"allocated block limit: %s\n", total_ialloc, strbuf);
}
strerror(errno));
hur = oldhur;
rc = -errno;
+ fclose(fp);
goto out_free;
}
memcpy(hur, oldhur, hur_len(oldhur));
rc = lfs_hsm_prepare_file(line, &hui->hui_fid,
&last_dev);
hur->hur_request.hr_itemcount++;
- if (rc)
+ if (rc) {
+ fclose(fp);
goto out_free;
+ }
if ((some_file[0] == '\0') &&
(strlen(line) < sizeof(some_file)))