static int lfs_list_commands(int argc, char **argv);
static inline int lfs_mirror_resync(int argc, char **argv);
static inline int lfs_mirror_verify(int argc, char **argv);
+static inline int lfs_mirror_read(int argc, char **argv);
+static inline int lfs_mirror_write(int argc, char **argv);
enum setstripe_origin {
SO_SETSTRIPE,
SO_MIGRATE,
+ SO_MIGRATE_MDT,
SO_MIRROR_CREATE,
SO_MIRROR_EXTEND,
SO_MIRROR_SPLIT,
#define MIGRATE_USAGE \
SSM_CMD_COMMON("migrate ") \
- " [--block|-b]\n" \
- " [--non-block|-n]\n" \
- " [--non-direct|-D]\n" \
+ " [--block|-b] [--non-block|-n]\n" \
+ " [--non-direct|-D] [--verbose|-v]\n" \
" <filename>\n" \
SSM_HELP_COMMON \
"\n" \
"\tblock: Block file access during data migration (default)\n" \
"\tnon-block: Abort migrations if concurrent access is detected\n" \
- "\tnon-direct: Do not use direct I/O to copy file contents\n" \
+ "\tnon-direct: Do not use direct I/O to copy file contents\n" \
+ "\tverbose: Print each filename as it is migrated\n" \
-#define SETDIRSTRIPE_USAGE \
- " [--mdt-count|-c stripe_count>\n" \
- " [--mdt-index|-i mdt_index]\n" \
- " [--mdt-hash|-H mdt_hash]\n" \
+#define SETDIRSTRIPE_USAGE \
+ " [--mdt-count|-c stripe_count>\n" \
+ " [--mdt-index|-i mdt_index[,mdt_index,...]\n" \
+ " [--mdt-hash|-H mdt_hash]\n" \
" [--default|-D] [--mode|-m mode] <dir>\n" \
"\tstripe_count: stripe count of the striped directory\n" \
"\tmdt_index: MDT index of first stripe\n" \
"\t mirror will be stored into. If not specified,\n"
"\t a new file named <mirrored_file>.mirror~<mirror_id>\n"
"\t will be used.\n" },
+ { .pc_name = "read", .pc_func = lfs_mirror_read,
+ .pc_help = "Read the content of a specified mirror of a file.\n"
+ "usage: lfs mirror read <--mirror-id|-N <mirror_id> "
+ "[--outfile|-o <output_file>] <mirrored_file>\n" },
+ { .pc_name = "write", .pc_func = lfs_mirror_write,
+ .pc_help = "Write to a specified mirror of a file.\n"
+ "usage: lfs mirror write <--mirror-id|-N <mirror_id> "
+ "[--inputfile|-i <input_file>] <mirrored_file>\n" },
{ .pc_name = "resync", .pc_func = lfs_mirror_resync,
.pc_help = "Resynchronizes out-of-sync mirrored file(s).\n"
"usage: lfs mirror resync [--only <mirror_id[,...]>] "
"usage: lfs mirror verify "
"[--only <mirror_id,mirror_id2[,...]>] "
"[--verbose|-v] <mirrored_file> [<mirrored_file2> ...]\n"},
- { .pc_name = "--list-commands", .pc_func = lfs_mirror_list_commands,
+ { .pc_name = "list-commands", .pc_func = lfs_mirror_list_commands,
.pc_help = "list commands supported by lfs mirror"},
{ .pc_name = "help", .pc_func = Parser_help, .pc_help = "help" },
{ .pc_name = "exit", .pc_func = Parser_quit, .pc_help = "quit" },
"\t fnv_1a_64 FNV-1a hash algorithm\n"
"\t all_char sum of characters % MDT_COUNT\n"},
{"check", lfs_check, 0,
- "Display the status of MDS or OSTs (as specified in the command)\n"
- "or all the servers (MDS and OSTs).\n"
- "usage: check <osts|mds|servers>"},
+ "Display the status of MGTs, MDTs or OSTs (as specified in the command)\n"
+ "or all the servers (MGTs, MDTs and OSTs).\n"
+ "usage: check <mgts|osts|mdts|all>"},
{"osts", lfs_osts, 0, "list OSTs connected to client "
"[for specified path only]\n" "usage: osts [path]"},
{"mdts", lfs_mdts, 0, "list MDTs connected to client "
"usage: swap_layouts <path1> <path2>"},
{"migrate", lfs_setstripe_migrate, 0,
"migrate a directory between MDTs.\n"
- "usage: migrate --mdt-index <mdt_idx> [--verbose|-v] "
- "<directory>\n"
- "\tmdt_idx: index of the destination MDT\n"
+ "usage: migrate [--mdt|-m] <start_mdt_index>\n"
+ " [--mdt-count|-c] <stripe_count>\n"
+ " [--mdt-hash|-H] <hash_type>\n"
+ " [--verbose|-v]\n"
+ " <directory>\n"
+ "\tmdt: MDTs to stripe over, if only one MDT is specified\n"
+ " it's the MDT index of first stripe\n"
+ "\tmdt_count: number of MDTs to stripe a directory over\n"
+ "\tmdt_hash: hash type of the striped directory. mdt types:\n"
+ " fnv_1a_64 FNV-1a hash algorithm (default)\n"
+ " all_char sum of characters % MDT_COUNT\n"
"\n"
"migrate file objects from one OST "
"layout\nto another (may be not safe with concurent writes).\n"
"lfs mirror extend - add mirror(s) to an existing file\n"
"lfs mirror split - split a mirror from an existing mirrored file\n"
"lfs mirror resync - resynchronize out-of-sync mirrored file(s)\n"
+ "lfs mirror read - read a mirror content of a mirrored file\n"
+ "lfs mirror write - write to a mirror of a mirrored file\n"
"lfs mirror verify - verify mirrored file(s)\n"},
{"getsom", lfs_getsom, 0, "To list the SOM info for a given file.\n"
"usage: getsom [-s] [-b] [-f] <path>\n"
static const char *error_loc = "syserror";
enum {
- MIGRATION_NONBLOCK = 1 << 0,
- MIGRATION_MIRROR = 1 << 1,
- MIGRATION_NONDIRECT = 1 << 2,
+ MIGRATION_NONBLOCK = 0x0001,
+ MIGRATION_MIRROR = 0x0002,
+ MIGRATION_NONDIRECT = 0x0004,
+ MIGRATION_VERBOSE = 0x0008,
};
static int lfs_component_create(char *fname, int open_flags, mode_t open_mode,
if (rc < 0)
fprintf(stderr, "error: %s: %s: %s: %s\n",
progname, name, error_loc, strerror(-rc));
+ else if (migration_flags & MIGRATION_VERBOSE)
+ printf("%s\n", name);
+
return rc;
}
int rc = 0;
while (node) {
- string = node->cy_string;
- /* skip leading lmm_ if present, to simplify parsing */
- if (string != NULL && strncmp(string, "lmm_", 4) == 0)
- string += 4;
-
- if (node->cy_type == CYAML_TYPE_STRING) {
- if (!strcmp(string, "lcme_extent.e_end")) {
- if (!strcmp(node->cy_valuestring, "EOF") ||
- !strcmp(node->cy_valuestring, "eof"))
- lsa->lsa_comp_end = LUSTRE_EOF;
- } else if (!strcmp(string, "pool")) {
- lsa->lsa_pool_name = node->cy_valuestring;
- } else if (!strcmp(string, "pattern")) {
- if (!strcmp(node->cy_valuestring, "mdt"))
- lsa->lsa_pattern = LLAPI_LAYOUT_MDT;
- }
- } else if (node->cy_type == CYAML_TYPE_NUMBER) {
- 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;
- else
- lsa->lsa_comp_end = node->cy_valueint;
- } else if (!strcmp(string, "stripe_count")) {
- lsa->lsa_stripe_count = node->cy_valueint;
- } else if (!strcmp(string, "stripe_size")) {
- lsa->lsa_stripe_size = node->cy_valueint;
- } else if (!strcmp(string, "stripe_offset")) {
- lsa->lsa_stripe_off = node->cy_valueint;
- } else if (!strcmp(string, "l_ost_idx")) {
- osts[lsa->lsa_nr_tgts] = node->cy_valueint;
- lsa->lsa_nr_tgts++;
- }
- } else if (node->cy_type == CYAML_TYPE_OBJECT) {
+ if (node->cy_type == CYAML_TYPE_OBJECT) {
/* go deep to sub blocks */
rc = build_layout_from_yaml_node(node->cy_child, layout,
lsa, osts);
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 (node->cy_type == CYAML_TYPE_STRING) {
+ if (!strcmp(string, "lcme_extent.e_end")) {
+ if (!strcmp(node->cy_valuestring, "EOF") ||
+ !strcmp(node->cy_valuestring, "eof"))
+ lsa->lsa_comp_end = LUSTRE_EOF;
+ } else if (!strcmp(string, "pool")) {
+ lsa->lsa_pool_name = node->cy_valuestring;
+ } else if (!strcmp(string, "pattern")) {
+ if (!strcmp(node->cy_valuestring, "mdt"))
+ lsa->lsa_pattern = LLAPI_LAYOUT_MDT;
+ }
+ } else if (node->cy_type == CYAML_TYPE_NUMBER) {
+ 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;
+ else
+ lsa->lsa_comp_end = node->cy_valueint;
+ } else if (!strcmp(string, "stripe_count")) {
+ lsa->lsa_stripe_count = node->cy_valueint;
+ } else if (!strcmp(string, "stripe_size")) {
+ lsa->lsa_stripe_size = node->cy_valueint;
+ } else if (!strcmp(string, "stripe_offset")) {
+ lsa->lsa_stripe_off = node->cy_valueint;
+ } else if (!strcmp(string, "l_ost_idx")) {
+ osts[lsa->lsa_nr_tgts] = node->cy_valueint;
+ lsa->lsa_nr_tgts++;
+ }
+ }
}
node = node->cy_next;
}
char *end;
int c;
int delete = 0;
- char *mdt_idx_arg = NULL;
unsigned long long size_units = 1;
bool migrate_mode = false;
+ bool migrate_mdt_mode = false;
bool migration_block = false;
__u64 migration_flags = 0;
- __u32 osts[LOV_MAX_STRIPE_COUNT] = { 0 };
+ __u32 tgts[LOV_MAX_STRIPE_COUNT] = { 0 };
int comp_del = 0, comp_set = 0;
int comp_add = 0;
__u32 comp_id = 0;
char *template = NULL;
struct option long_opts[] = {
+/* find { .val = '0', .name = "null", .has_arg = no_argument }, */
/* find { .val = 'A', .name = "atime", .has_arg = required_argument }*/
/* --block is only valid in migrate mode */
{ .val = 'b', .name = "block", .has_arg = no_argument },
.name = "copy", .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 = "mdt-count", .has_arg = required_argument},
/* find { .val = 'C', .name = "ctime", .has_arg = required_argument }*/
{ .val = 'd', .name = "delete", .has_arg = no_argument},
{ .val = 'd', .name = "destroy", .has_arg = no_argument},
/* find { .val = 'F', .name = "fid", .has_arg = no_argument }, */
/* find { .val = 'g', .name = "gid", .has_arg = no_argument }, */
/* find { .val = 'G', .name = "group", .has_arg = required_argument }*/
-/* dirstripe { .val = 'H', .name = "mdt-hash", .has_arg = required_argument }*/
+/* find { .val = 'h', .name = "help", .has_arg = no_argument }, */
+ { .val = 'H', .name = "mdt-hash", .has_arg = required_argument},
{ .val = 'i', .name = "stripe-index", .has_arg = required_argument},
{ .val = 'i', .name = "stripe_index", .has_arg = required_argument},
{ .val = 'I', .name = "comp-id", .has_arg = required_argument},
snprintf(cmd, sizeof(cmd), "%s %s", progname, argv[0]);
progname = cmd;
- while ((c = getopt_long(argc, argv, "bc:dDE:f:i:I:m:N::no:p:L:s:S:vy:",
- long_opts, NULL)) >= 0) {
+ while ((c = getopt_long(argc, argv,
+ "bc:dDE:f:H:i:I:m:N::no:p:L:s:S:vy:", long_opts,
+ NULL)) >= 0) {
switch (c) {
case 0:
/* Long options. */
}
}
break;
+ case 'H':
+ if (!migrate_mode) {
+ fprintf(stderr, "--mdt-hash is valid only for migrate command\n");
+ return CMD_HELP;
+ }
+
+ lsa.lsa_pattern = check_hashtype(optarg);
+ if (lsa.lsa_pattern == 0) {
+ fprintf(stderr,
+ "%s %s: bad stripe hash type '%s'\n",
+ progname, argv[0], optarg);
+ return CMD_HELP;
+ }
+ break;
case 'i':
lsa.lsa_stripe_off = strtol(optarg, &end, 0);
if (*end != '\0') {
case 'm':
if (!migrate_mode) {
fprintf(stderr,
- "%s %s: -m|--mdt-index valid only for migrate command\n",
+ "%s %s: -m|--mdt is valid only for migrate command\n",
progname, argv[0]);
goto usage_error;
}
- mdt_idx_arg = optarg;
+ migrate_mdt_mode = true;
+ lsa.lsa_nr_tgts = parse_targets(tgts,
+ sizeof(tgts) / sizeof(__u32),
+ lsa.lsa_nr_tgts, optarg);
+ if (lsa.lsa_nr_tgts < 0) {
+ fprintf(stderr,
+ "%s %s: invalid MDT target(s) '%s'\n",
+ progname, argv[0], optarg);
+ return CMD_HELP;
+ }
+
+ lsa.lsa_tgts = tgts;
+ if (lsa.lsa_stripe_off == LLAPI_LAYOUT_DEFAULT)
+ lsa.lsa_stripe_off = tgts[0];
break;
case 'n':
if (!migrate_mode) {
fprintf(stderr, "warning: '--ost-list' is "
"deprecated, use '--ost' instead\n");
#endif
- lsa.lsa_nr_tgts = parse_targets(osts,
- sizeof(osts) / sizeof(__u32),
+ lsa.lsa_nr_tgts = parse_targets(tgts,
+ sizeof(tgts) / sizeof(__u32),
lsa.lsa_nr_tgts, optarg);
if (lsa.lsa_nr_tgts < 0) {
fprintf(stderr,
goto usage_error;
}
- lsa.lsa_tgts = osts;
+ lsa.lsa_tgts = tgts;
if (lsa.lsa_stripe_off == LLAPI_LAYOUT_DEFAULT)
- lsa.lsa_stripe_off = osts[0];
+ lsa.lsa_stripe_off = tgts[0];
break;
case 'p':
if (optarg == NULL)
goto usage_error;
}
migrate_mdt_param.fp_verbose = VERBOSE_DETAIL;
+ migration_flags = MIGRATION_VERBOSE;
break;
case 'y':
from_yaml = true;
goto error;
}
- if (mdt_idx_arg != NULL && optind > 3) {
- fprintf(stderr,
- "%s %s: option -m cannot be used with other options\n",
- progname, argv[0]);
- goto usage_error;
- }
-
if ((migration_flags & MIGRATION_NONBLOCK) && migration_block) {
fprintf(stderr,
"%s %s: options --non-block and --block are mutually exclusive\n",
goto usage_error;
}
- if (mdt_idx_arg != NULL) {
+ if (migrate_mdt_mode) {
+ struct lmv_user_md *lmu;
+
/* initialize migrate mdt parameters */
- migrate_mdt_param.fp_mdt_index = strtoul(mdt_idx_arg, &end, 0);
- if (*end != '\0') {
- fprintf(stderr, "%s %s: invalid MDT index '%s'\n",
- progname, argv[0], mdt_idx_arg);
+ lmu = calloc(1, lmv_user_md_size(lsa.lsa_nr_tgts,
+ LMV_USER_MAGIC_SPECIFIC));
+ if (!lmu) {
+ fprintf(stderr,
+ "%s %s: cannot allocate memory for lmv_user_md: %s\n",
+ progname, argv[0], strerror(ENOMEM));
+ result = -ENOMEM;
+ goto error;
+ }
+ if (lsa.lsa_stripe_count != LLAPI_LAYOUT_DEFAULT)
+ lmu->lum_stripe_count = lsa.lsa_stripe_count;
+ if (lsa.lsa_stripe_off == LLAPI_LAYOUT_DEFAULT) {
+ fprintf(stderr,
+ "%s %s: migrate should specify MDT index\n",
+ progname, argv[0]);
+ free(lmu);
goto usage_error;
}
+ lmu->lum_stripe_offset = lsa.lsa_stripe_off;
+ if (lsa.lsa_pattern != LLAPI_LAYOUT_RAID0)
+ lmu->lum_hash_type = lsa.lsa_pattern;
+ else
+ lmu->lum_hash_type = LMV_HASH_TYPE_FNV_1A_64;
+ if (lsa.lsa_pool_name)
+ strncpy(lmu->lum_pool_name, lsa.lsa_pool_name,
+ sizeof(lmu->lum_pool_name));
+ if (lsa.lsa_nr_tgts > 1) {
+ int i;
+
+ if (lsa.lsa_stripe_count > 0 &&
+ lsa.lsa_stripe_count != LLAPI_LAYOUT_DEFAULT &&
+ lsa.lsa_stripe_count != lsa.lsa_nr_tgts) {
+ fprintf(stderr,
+ "error: %s: stripe count %lld doesn't match the number of MDTs: %d\n",
+ progname, lsa.lsa_stripe_count,
+ lsa.lsa_nr_tgts);
+ free(lmu);
+ goto usage_error;
+ }
+
+ lmu->lum_magic = LMV_USER_MAGIC_SPECIFIC;
+ lmu->lum_stripe_count = lsa.lsa_nr_tgts;
+ for (i = 0; i < lsa.lsa_nr_tgts; i++)
+ lmu->lum_objects[i].lum_mds = lsa.lsa_tgts[i];
+ } else {
+ lmu->lum_magic = LMV_USER_MAGIC;
+ }
+
+ migrate_mdt_param.fp_lmv_md = lmu;
migrate_mdt_param.fp_migrate = 1;
} else if (layout == NULL) {
/* initialize stripe parameters */
param->lsp_is_specific = true;
param->lsp_stripe_count = lsa.lsa_nr_tgts;
- memcpy(param->lsp_osts, osts,
- sizeof(*osts) * lsa.lsa_nr_tgts);
+ memcpy(param->lsp_osts, tgts,
+ sizeof(*tgts) * lsa.lsa_nr_tgts);
}
}
if (from_yaml) {
/* generate a layout from a YAML template */
result = lfs_comp_create_from_yaml(template, &layout,
- &lsa, osts);
+ &lsa, tgts);
if (result) {
fprintf(stderr, "error: %s: can't create composite "
"layout from template file %s\n",
}
for (fname = argv[optind]; fname != NULL; fname = argv[++optind]) {
- if (mdt_idx_arg != NULL) {
+ if (migrate_mdt_mode) {
result = llapi_migrate_mdt(fname, &migrate_mdt_param);
} else if (migrate_mode) {
result = lfs_migrate(fname, migration_flags, param,
}
free(param);
+ free(migrate_mdt_param.fp_lmv_md);
llapi_layout_free(layout);
lfs_mirror_list_free(mirror_list);
return result2;
{ .val = 'm', .name = "mdt_index", .has_arg = no_argument },
/* find { .val = 'M', .name = "mtime", .has_arg = required_argument }*/
/* find { .val = 'n', .name = "name", .has_arg = required_argument }*/
+ { .val = 'N', .name = "mirror-count", .has_arg = no_argument },
{ .val = 'O', .name = "obd", .has_arg = required_argument },
{ .val = 'O', .name = "ost", .has_arg = required_argument },
{ .val = 'p', .name = "pool", .has_arg = no_argument },
char *end, *tmp;
while ((c = getopt_long(argc, argv,
- "-cdDE::FghiI::LmMoO:pqrRsSvy",
+ "-cdDE::FghiI::LmMNoO:pqrRsSvy",
long_opts, NULL)) != -1) {
if (neg_opt)
--neg_opt;
break;
case 'i':
if (!(param->fp_verbose & VERBOSE_DETAIL)) {
- param->fp_verbose |= VERBOSE_OFFSET;
+ param->fp_verbose |= VERBOSE_STRIPE_OFFSET;
param->fp_max_depth = 0;
}
break;
break;
case 'L':
if (!(param->fp_verbose & VERBOSE_DETAIL)) {
- param->fp_verbose |= VERBOSE_LAYOUT;
+ param->fp_verbose |= VERBOSE_PATTERN;
param->fp_max_depth = 0;
}
break;
param->fp_max_depth = 0;
param->fp_verbose |= VERBOSE_MDTINDEX;
break;
+ case 'N':
+ if (!(param->fp_verbose & VERBOSE_DETAIL)) {
+ param->fp_verbose |= VERBOSE_MIRROR_COUNT;
+ param->fp_max_depth = 0;
+ }
+ break;
case 'O':
if (param->fp_obd_uuid) {
fprintf(stderr,
break;
case 'S':
if (!(param->fp_verbose & VERBOSE_DETAIL)) {
- param->fp_verbose |= VERBOSE_SIZE;
+ param->fp_verbose |= VERBOSE_STRIPE_SIZE;
param->fp_max_depth = 0;
}
break;
break;
case 'i':
case 'm':
- param.fp_verbose |= VERBOSE_OFFSET;
+ param.fp_verbose |= VERBOSE_STRIPE_OFFSET;
break;
#if LUSTRE_VERSION_CODE < OBD_OCD_VERSION(3, 0, 53, 0)
case 't':
#define RSF "%4s"
#define RDF "%3d%%"
-static inline int obd_statfs_ratio(const struct obd_statfs *st)
+static inline int obd_statfs_ratio(const struct obd_statfs *st, bool inodes)
{
double avail, used, ratio = 0;
- avail = st->os_bavail;
- used = st->os_blocks - st->os_bfree;
+ if (inodes) {
+ avail = st->os_ffree;
+ used = st->os_files - st->os_ffree;
+ } else {
+ avail = st->os_bavail;
+ used = st->os_blocks - st->os_bfree;
+ }
if (avail + used > 0)
- ratio = used / (used + avail) * 100 + 0.5;
+ ratio = used / (used + avail) * 100;
- return (int)ratio;
+ /* Round up to match df(1) usage percentage */
+ return (ratio - (int)ratio) > 0 ? (int)(ratio + 1) : (int)ratio;
}
static int showdf(char *mntdir, struct obd_statfs *stat,
total = (stat->os_blocks * stat->os_bsize) >> shift;
}
- ratio = obd_statfs_ratio(stat);
+ ratio = obd_statfs_ratio(stat, flags & MNTDF_INODES);
if (flags & MNTDF_COOKED) {
int i;
}
for (tp = types; tp->st_name != NULL; tp++) {
+ bool have_ost = false;
+
if (!(tp->st_op & ops))
continue;
rc = rc2;
}
+ /* If we have OSTs then don't report MDT block counts.
+ * For MDT-only filesystems the expectation is that all
+ * layouts have a DoM component. For filesystems with
+ * OSTs, files are not necessarily going to store data
+ * on MDTs, and MDT space is limited to a fraction of
+ * OST space, so don't include it in the summary.
+ */
+ if (tp->st_op == LL_STATFS_LOV && !have_ost) {
+ have_ost = true;
+ sum.os_blocks = 0;
+ sum.os_bfree = 0;
+ sum.os_bavail = 0;
+ }
+
if (poolname && tp->st_op == LL_STATFS_LOV &&
llapi_search_ost(fsname, poolname,
obd_uuid2str(&uuid_buf)) != 1)
obd_uuid2str(&uuid_buf), flags,
tp->st_name, index, rc2);
- if (rc2 == 0) {
- if (tp->st_op == LL_STATFS_LMV) {
- 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;
- ost_ffree += stat_buf.os_ffree;
- }
- }
+ if (rc2)
+ continue;
+
+ if (tp->st_op == LL_STATFS_LMV) {
+ sum.os_ffree += stat_buf.os_ffree;
+ sum.os_files += stat_buf.os_files;
+ } else /* if (tp->st_op == LL_STATFS_LOV) */ {
+ ost_ffree += stat_buf.os_ffree;
+ }
+ 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;
}
}
sd_st;
const struct obd_statfs *st2 = &((const struct ll_statfs_data *)sd2)->
sd_st;
- int r1 = obd_statfs_ratio(st1);
- int r2 = obd_statfs_ratio(st2);
+ int r1 = obd_statfs_ratio(st1, false);
+ int r2 = obd_statfs_ratio(st2, false);
int64_t result = r1 - r2;
/* if both space usage are above 90, compare free inodes */
/* don't use server whose usage is above 90% */
while (nr != param->lsp_stripe_count &&
- obd_statfs_ratio(&lsb->sb_buf[nr].sd_st)
- > 90)
+ obd_statfs_ratio(&lsb->sb_buf[nr].sd_st,
+ false) > 90)
nr = MAX(param->lsp_stripe_count,
nr / 2);
static int lfs_mv(int argc, char **argv)
{
- struct find_param param = {
+ struct lmv_user_md lmu = { LMV_USER_MAGIC };
+ struct find_param param = {
.fp_max_depth = -1,
.fp_mdt_index = -1,
};
- char *end;
- int c;
- int rc = 0;
+ char *end;
+ int c;
+ int rc = 0;
struct option long_opts[] = {
{ .val = 'm', .name = "mdt-index", .has_arg = required_argument },
{ .val = 'v', .name = "verbose", .has_arg = no_argument },
", use '--mdt-index' or '-m' instead\n");
#endif
case 'm':
- param.fp_mdt_index = strtoul(optarg, &end, 0);
+ lmu.lum_stripe_offset = strtoul(optarg, &end, 0);
if (*end != '\0') {
fprintf(stderr, "%s mv: bad MDT index '%s'\n",
progname, optarg);
}
}
- if (param.fp_mdt_index == -1) {
+ if (lmu.lum_stripe_offset == -1) {
fprintf(stderr, "%s mv: MDT index must be specified\n",
progname);
return CMD_HELP;
return CMD_HELP;
}
+
+ /* initialize migrate mdt parameters */
+ param.fp_lmv_md = &lmu;
param.fp_migrate = 1;
rc = llapi_migrate_mdt(argv[optind], ¶m);
if (rc != 0)
static int lfs_check(int argc, char **argv)
{
- int rc;
- char mntdir[PATH_MAX] = {'\0'};
- int num_types = 1;
- char *obd_types[2];
- char obd_type1[4];
- char obd_type2[4];
+ char mntdir[PATH_MAX] = {'\0'};
+ int num_types = 1;
+ char *obd_types[3];
+ char obd_type1[4];
+ char obd_type2[4];
+ char obd_type3[4];
+ int rc;
if (argc != 2) {
fprintf(stderr, "%s check: server type must be specified\n",
return CMD_HELP;
}
- obd_types[0] = obd_type1;
- obd_types[1] = obd_type2;
-
- if (strcmp(argv[1], "osts") == 0) {
- strcpy(obd_types[0], "osc");
- } else if (strcmp(argv[1], "mds") == 0) {
- strcpy(obd_types[0], "mdc");
- } else if (strcmp(argv[1], "servers") == 0) {
- num_types = 2;
- strcpy(obd_types[0], "osc");
- strcpy(obd_types[1], "mdc");
+ obd_types[0] = obd_type1;
+ obd_types[1] = obd_type2;
+ obd_types[2] = obd_type3;
+
+ if (strcmp(argv[1], "osts") == 0) {
+ strcpy(obd_types[0], "osc");
+ } else if (strcmp(argv[1], "mdts") == 0 ||
+ strcmp(argv[1], "mds") == 0) {
+ strcpy(obd_types[0], "mdc");
+ } else if (strcmp(argv[1], "mgts") == 0) {
+ strcpy(obd_types[0], "mgc");
+ } else if (strcmp(argv[1], "all") == 0 ||
+ strcmp(argv[1], "servers") == 0) {
+ num_types = 3;
+ strcpy(obd_types[0], "osc");
+ strcpy(obd_types[1], "mdc");
+ strcpy(obd_types[2], "mgc");
} else {
fprintf(stderr, "%s check: unrecognized option '%s'\n",
progname, argv[1]);
/* ignore previous file's error, continue with next file */
/* reset ioc */
- memset(ioc, 0, sizeof(__u32) * 4096);
+ memset(ioc, 0, sizeof(*ioc) + sizeof(__u32) * 4096);
}
free(ioc);
return rc;
}
+static inline int verify_mirror_id_by_fd(int fd, __u16 mirror_id)
+{
+ struct llapi_layout *layout;
+ int rc;
+
+ layout = llapi_layout_get_by_fd(fd, 0);
+ if (layout == NULL) {
+ fprintf(stderr, "could not get layout.\n");
+ return -EINVAL;
+ }
+
+ rc = llapi_layout_comp_iterate(layout, find_mirror_id, &mirror_id);
+ if (rc < 0) {
+ fprintf(stderr, "failed to iterate layout\n");
+ llapi_layout_free(layout);
+
+ return rc;
+ } else if (rc == LLAPI_LAYOUT_ITER_CONT) {
+ fprintf(stderr, "does not find mirror with ID %u\n", mirror_id);
+ llapi_layout_free(layout);
+
+ return -EINVAL;
+ }
+ llapi_layout_free(layout);
+
+ return 0;
+}
+
+/**
+ * Check whether two files are the same file
+ * \retval 0 same file
+ * \retval 1 not the same file
+ * \retval <0 error code
+ */
+static inline int check_same_file(const char *f1, const char *f2)
+{
+ struct stat stbuf1;
+ struct stat stbuf2;
+
+ if (stat(f1, &stbuf1) < 0) {
+ fprintf(stderr, "%s: cannot stat file '%s': %s\n",
+ progname, f1, strerror(errno));
+ return -errno;
+ }
+
+ if (stat(f2, &stbuf2) < 0) {
+ fprintf(stderr, "%s: cannot stat file '%s': %s\n",
+ progname, f2, strerror(errno));
+ return -errno;
+ }
+
+ if (stbuf1.st_rdev == stbuf2.st_rdev &&
+ stbuf1.st_ino == stbuf2.st_ino)
+ return 0;
+
+ return 1;
+}
+
+static inline int lfs_mirror_read(int argc, char **argv)
+{
+ int rc = CMD_HELP;
+ __u16 mirror_id = 0;
+ const char *outfile = NULL;
+ char *fname;
+ int fd = 0;
+ int outfd;
+ int c;
+ void *buf;
+ const size_t buflen = 4 << 20;
+ off_t pos;
+ struct option long_opts[] = {
+ { .val = 'N', .name = "mirror-id", .has_arg = required_argument },
+ { .val = 'o', .name = "outfile", .has_arg = required_argument },
+ { .name = NULL } };
+
+ while ((c = getopt_long(argc, argv, "N:o:", long_opts, NULL)) >= 0) {
+ char *end;
+
+ switch (c) {
+ case 'N':
+ mirror_id = strtoul(optarg, &end, 0);
+ if (*end != '\0' || mirror_id == 0) {
+ fprintf(stderr,
+ "%s %s: invalid mirror ID '%s'\n",
+ progname, argv[0], optarg);
+ return rc;
+ }
+ break;
+ case 'o':
+ outfile = optarg;
+ break;
+ default:
+ fprintf(stderr, "%s: option '%s' unrecognized.\n",
+ progname, argv[optind - 1]);
+ return -EINVAL;
+ }
+ }
+
+ if (argc == optind) {
+ fprintf(stderr, "%s %s: no mirrored file provided\n",
+ progname, argv[0]);
+ return rc;
+ } else if (argc > optind + 1) {
+ fprintf(stderr, "%s %s: too many files\n", progname, argv[0]);
+ return rc;
+ }
+
+ if (mirror_id == 0) {
+ fprintf(stderr, "%s %s: no valid mirror ID is provided\n",
+ progname, argv[0]);
+ return rc;
+ }
+
+ /* open mirror file */
+ fname = argv[optind];
+
+ if (outfile) {
+ rc = check_same_file(fname, outfile);
+ if (rc == 0) {
+ fprintf(stderr,
+ "%s %s: output file cannot be the mirrored file\n",
+ progname, argv[0]);
+ return -EINVAL;
+ }
+ if (rc < 0)
+ return rc;
+ }
+
+ fd = open(fname, O_DIRECT | O_RDONLY);
+ if (fd < 0) {
+ fprintf(stderr, "%s %s: cannot open '%s': %s\n",
+ progname, argv[0], fname, strerror(errno));
+ return rc;
+ }
+
+ /* verify mirror id */
+ rc = verify_mirror_id_by_fd(fd, mirror_id);
+ if (rc) {
+ fprintf(stderr,
+ "%s %s: cannot find mirror with ID %u in '%s'\n",
+ progname, argv[0], mirror_id, fname);
+ goto close_fd;
+ }
+
+ /* open output file */
+ if (outfile) {
+ outfd = open(outfile, O_EXCL | O_WRONLY | O_CREAT, 0644);
+ if (outfd < 0) {
+ fprintf(stderr, "%s %s: cannot create file '%s': %s\n",
+ progname, argv[0], outfile, strerror(errno));
+ rc = -errno;
+ goto close_fd;
+ }
+ } else {
+ outfd = STDOUT_FILENO;
+ }
+
+ /* allocate buffer */
+ rc = posix_memalign(&buf, sysconf(_SC_PAGESIZE), buflen);
+ if (rc) {
+ fprintf(stderr, "%s %s: posix_memalign returns %d\n",
+ progname, argv[0], rc);
+ goto close_outfd;
+ }
+
+ pos = 0;
+ while (1) {
+ ssize_t bytes_read;
+ ssize_t written = 0;
+
+ bytes_read = llapi_mirror_read(fd, mirror_id, buf, buflen, pos);
+ if (bytes_read < 0) {
+ rc = bytes_read;
+ fprintf(stderr,
+ "%s %s: fail to read data from mirror %u: %s\n",
+ progname, argv[0], mirror_id, strerror(-rc));
+ goto free_buf;
+ }
+
+ /* EOF reached */
+ if (bytes_read == 0)
+ break;
+
+ while (written < bytes_read) {
+ ssize_t written2;
+
+ written2 = write(outfd, buf + written,
+ bytes_read - written);
+ if (written2 < 0) {
+ fprintf(stderr,
+ "%s %s: fail to write %s: %s\n",
+ progname, argv[0], outfile ? : "STDOUT",
+ strerror(errno));
+ rc = -errno;
+ goto free_buf;
+ }
+ written += written2;
+ }
+
+ if (written != bytes_read) {
+ fprintf(stderr,
+ "%s %s: written %ld bytes does not match with %ld read.\n",
+ progname, argv[0], written, bytes_read);
+ rc = -EIO;
+ goto free_buf;
+ }
+
+ pos += bytes_read;
+ }
+
+ fsync(outfd);
+ rc = 0;
+
+free_buf:
+ free(buf);
+close_outfd:
+ if (outfile)
+ close(outfd);
+close_fd:
+ close(fd);
+
+ return rc;
+}
+
+static inline int lfs_mirror_write(int argc, char **argv)
+{
+ int rc = CMD_HELP;
+ __u16 mirror_id = 0;
+ const char *inputfile = NULL;
+ char *fname;
+ int fd = 0;
+ int inputfd;
+ int c;
+ void *buf;
+ const size_t buflen = 4 << 20;
+ off_t pos;
+ size_t page_size = sysconf(_SC_PAGESIZE);
+ struct ll_ioc_lease_id ioc;
+
+ struct option long_opts[] = {
+ { .val = 'N', .name = "mirror-id", .has_arg = required_argument },
+ { .val = 'i', .name = "inputfile", .has_arg = required_argument },
+ { .name = NULL } };
+
+ while ((c = getopt_long(argc, argv, "N:i:", long_opts, NULL)) >= 0) {
+ char *end;
+
+ switch (c) {
+ case 'N':
+ mirror_id = strtoul(optarg, &end, 0);
+ if (*end != '\0' || mirror_id == 0) {
+ fprintf(stderr,
+ "%s %s: invalid mirror ID '%s'\n",
+ progname, argv[0], optarg);
+ return rc;
+ }
+ break;
+ case 'i':
+ inputfile = optarg;
+ break;
+ default:
+ fprintf(stderr, "%s: option '%s' unrecognized\n",
+ progname, argv[optind - 1]);
+ return -EINVAL;
+ }
+ }
+
+ if (argc == optind) {
+ fprintf(stderr, "%s %s: no mirrored file provided\n",
+ progname, argv[0]);
+ return rc;
+ } else if (argc > optind + 1) {
+ fprintf(stderr, "%s %s: too many files\n", progname, argv[0]);
+ return rc;
+ }
+
+ if (mirror_id == 0) {
+ fprintf(stderr, "%s %s: no valid mirror ID is provided\n",
+ progname, argv[0]);
+ return rc;
+ }
+
+ /* open mirror file */
+ fname = argv[optind];
+
+ if (inputfile) {
+ rc = check_same_file(fname, inputfile);
+ if (rc == 0) {
+ fprintf(stderr,
+ "%s %s: input file cannot be the mirrored file\n",
+ progname, argv[0]);
+ return -EINVAL;
+ }
+ if (rc < 0)
+ return rc;
+ }
+
+ fd = open(fname, O_DIRECT | O_WRONLY);
+ if (fd < 0) {
+ fprintf(stderr, "%s %s: cannot open '%s': %s\n",
+ progname, argv[0], fname, strerror(errno));
+ return rc;
+ }
+
+ /* verify mirror id */
+ rc = verify_mirror_id_by_fd(fd, mirror_id);
+ if (rc) {
+ fprintf(stderr,
+ "%s %s: cannot find mirror with ID %u in '%s'\n",
+ progname, argv[0], mirror_id, fname);
+ goto close_fd;
+ }
+
+ /* open input file */
+ if (inputfile) {
+ inputfd = open(inputfile, O_RDONLY, 0644);
+ if (inputfd < 0) {
+ fprintf(stderr, "%s %s: cannot open file '%s': %s\n",
+ progname, argv[0], inputfile, strerror(errno));
+ rc = -errno;
+ goto close_fd;
+ }
+ } else {
+ inputfd = STDIN_FILENO;
+ }
+
+ /* allocate buffer */
+ rc = posix_memalign(&buf, page_size, buflen);
+ if (rc) {
+ fprintf(stderr, "%s %s: posix_memalign returns %d\n",
+ progname, argv[0], rc);
+ goto close_inputfd;
+ }
+
+ /* prepare target mirror components instantiation */
+ ioc.lil_mode = LL_LEASE_WRLCK;
+ ioc.lil_flags = LL_LEASE_RESYNC;
+ ioc.lil_mirror_id = mirror_id;
+ rc = llapi_lease_set(fd, (struct ll_ioc_lease *)&ioc);
+ if (rc < 0) {
+ fprintf(stderr,
+ "%s %s: '%s' llapi_lease_get_ext failed: %s\n",
+ progname, argv[0], fname, strerror(errno));
+ goto free_buf;
+ }
+
+ pos = 0;
+ while (1) {
+ ssize_t bytes_read;
+ ssize_t written;
+ size_t to_write;
+
+ rc = llapi_lease_check(fd);
+ if (rc != LL_LEASE_WRLCK) {
+ fprintf(stderr, "%s %s: '%s' lost lease lock\n",
+ progname, argv[0], fname);
+ goto free_buf;
+ }
+
+ bytes_read = read(inputfd, buf, buflen);
+ if (bytes_read < 0) {
+ rc = bytes_read;
+ fprintf(stderr,
+ "%s %s: fail to read data from '%s': %s\n",
+ progname, argv[0], inputfile ? : "STDIN",
+ strerror(errno));
+ rc = -errno;
+ goto free_buf;
+ }
+
+ /* EOF reached */
+ if (bytes_read == 0)
+ break;
+
+ /* round up to page align to make direct IO happy. */
+ to_write = (bytes_read + page_size - 1) & ~(page_size - 1);
+
+ written = llapi_mirror_write(fd, mirror_id, buf, to_write,
+ pos);
+ if (written < 0) {
+ rc = written;
+ fprintf(stderr,
+ "%s %s: fail to write to mirror %u: %s\n",
+ progname, argv[0], mirror_id,
+ strerror(-rc));
+ goto free_buf;
+ }
+
+ pos += bytes_read;
+ }
+
+ if (pos & (page_size - 1)) {
+ rc = llapi_mirror_truncate(fd, mirror_id, pos);
+ if (rc < 0)
+ goto free_buf;
+ }
+
+ ioc.lil_mode = LL_LEASE_UNLCK;
+ ioc.lil_flags = LL_LEASE_RESYNC_DONE;
+ ioc.lil_count = 0;
+ rc = llapi_lease_set(fd, (struct ll_ioc_lease *)&ioc);
+ if (rc <= 0) {
+ if (rc == 0)
+ rc = -EBUSY;
+ fprintf(stderr,
+ "%s %s: release lease lock of '%s' failed: %s\n",
+ progname, argv[0], fname, strerror(errno));
+ goto free_buf;
+ }
+
+ rc = 0;
+
+free_buf:
+ free(buf);
+close_inputfd:
+ if (inputfile)
+ close(inputfd);
+close_fd:
+ close(fd);
+
+ return rc;
+}
+
/**
* struct verify_chunk - Mirror chunk to be verified.
* @chunk: [start, end) of the chunk.
verbose++;
break;
default:
- fprintf(stderr, "%s: options '%s' unrecognized.\n",
+ fprintf(stderr, "%s: option '%s' unrecognized.\n",
progname, argv[optind - 1]);
rc = -EINVAL;
goto error;
attrs = (void *)buf;
rc = lgetxattr(path, "trusted.som", attrs, sizeof(buf));
if (rc < 0) {
- fprintf(stderr, "%s failed to get som xattr: %s\n", argv[0],
- strerror(-rc));
+ rc = -errno;
+ fprintf(stderr, "%s failed to get som xattr: %s (%d)\n",
+ argv[0], strerror(errno), errno);
return rc;
}
return CMD_HELP;
}
- return rc;
+ return 0;
}
/**
git://git.whamcloud.com / fs / lustre-release.git / blobdiff