int llapi_getname(const char *path, char *buf, size_t size)
{
- struct obd_uuid uuid_buf;
- char *uuid = uuid_buf.uuid;
- int rc, nr;
+ struct obd_uuid uuid_buf;
+ char *uuid = uuid_buf.uuid;
+ char *cfg_instance;
+ int rc, len, fsname_len;
- memset(&uuid_buf, 0, sizeof(uuid_buf));
- rc = llapi_file_get_lov_uuid(path, &uuid_buf);
- if (rc)
- return rc;
+ memset(&uuid_buf, 0, sizeof(uuid_buf));
+ rc = llapi_file_get_lov_uuid(path, &uuid_buf);
+ if (rc)
+ return rc;
- /* We want to turn lustre-clilov-ffff88002738bc00 into
- * lustre-ffff88002738bc00. */
+ /*
+ * We want to turn testfs-clilov-ffff88002738bc00 into
+ * testfs-ffff88002738bc00 in a portable way that doesn't depend
+ * on what is after "-clilov-" as it may change in the future.
+ * Unfortunately, the "fsname" part may contain a dash, so we
+ * can't just skip to the first dash, and the "instance" may be a
+ * UUID in the future, so we can't necessarily go to the last dash.
+ */
+ cfg_instance = strstr(uuid, "-clilov-");
+ if (!cfg_instance)
+ return -EINVAL;
- nr = snprintf(buf, size, "%.*s-%s",
- (int) (strlen(uuid) - 24), uuid,
- uuid + strlen(uuid) - 16);
+ fsname_len = cfg_instance - uuid;
+ cfg_instance += strlen("-clilov-");
+ len = snprintf(buf, size, "%.*s-%s", fsname_len, uuid, cfg_instance);
- if (nr >= size)
- rc = -ENAMETOOLONG;
+ if (len >= size)
+ rc = -ENAMETOOLONG;
- return rc;
+ return rc;
}
/**
static void lov_dump_user_lmm_header(struct lov_user_md *lum, char *path,
struct lov_user_ost_data_v1 *objects,
- int verbose, int depth, char *pool_name,
+ enum llapi_layout_verbose verbose,
+ int depth, char *pool_name,
enum lov_dump_flags flags)
{
bool is_dir = flags & LDF_IS_DIR;
seq, oid, ver);
}
- if (verbose & VERBOSE_COUNT) {
- if (verbose & ~VERBOSE_COUNT)
+ if (verbose & VERBOSE_STRIPE_COUNT) {
+ if (verbose & ~VERBOSE_STRIPE_COUNT)
llapi_printf(LLAPI_MSG_NORMAL, "%s%sstripe_count: ",
space, prefix);
if (is_dir) {
separator = "\n";
}
- if (verbose & VERBOSE_SIZE) {
+ if (verbose & VERBOSE_STRIPE_SIZE) {
llapi_printf(LLAPI_MSG_NORMAL, "%s", separator);
- if (verbose & ~VERBOSE_SIZE)
+ if (verbose & ~VERBOSE_STRIPE_SIZE)
llapi_printf(LLAPI_MSG_NORMAL, "%s%sstripe_size: ",
space, prefix);
if (is_dir && !is_raw && lum->lmm_stripe_size == 0) {
separator = "\n";
}
- if ((verbose & VERBOSE_LAYOUT)) {
+ if ((verbose & VERBOSE_PATTERN)) {
llapi_printf(LLAPI_MSG_NORMAL, "%s", separator);
- if (verbose & ~VERBOSE_LAYOUT)
+ if (verbose & ~VERBOSE_PATTERN)
llapi_printf(LLAPI_MSG_NORMAL, "%s%spattern: ",
space, prefix);
if (lov_pattern_supported(lum->lmm_pattern))
separator = "\n";
}
- if (verbose & VERBOSE_OFFSET) {
+ if (verbose & VERBOSE_STRIPE_OFFSET) {
llapi_printf(LLAPI_MSG_NORMAL, "%s", separator);
- if (verbose & ~VERBOSE_OFFSET)
+ if (verbose & ~VERBOSE_STRIPE_OFFSET)
llapi_printf(LLAPI_MSG_NORMAL, "%s%sstripe_offset: ",
space, prefix);
if (is_dir || skip_objs)
void lov_dump_user_lmm_v1v3(struct lov_user_md *lum, char *pool_name,
struct lov_user_ost_data_v1 *objects,
char *path, int obdindex, int depth,
- int header, enum lov_dump_flags flags)
+ enum llapi_layout_verbose verbose,
+ enum lov_dump_flags flags)
{
bool is_dir = flags & LDF_IS_DIR;
bool indent = flags & LDF_INDENT;
if (!obdstripe)
return;
- lov_dump_user_lmm_header(lum, path, objects, header, depth, pool_name,
+ lov_dump_user_lmm_header(lum, path, objects, verbose, depth, pool_name,
flags);
- if (!is_dir && !skip_objs && (header & VERBOSE_OBJID) &&
+ if (!is_dir && !skip_objs && (verbose & VERBOSE_OBJID) &&
!(lum->lmm_pattern & LOV_PATTERN_F_RELEASED ||
lov_pattern(lum->lmm_pattern) == LOV_PATTERN_MDT)) {
char *space = " - ";
}
void lmv_dump_user_lmm(struct lmv_user_md *lum, char *pool_name,
- char *path, int obdindex, int depth, int verbose,
+ char *path, int obdindex, int depth,
+ enum llapi_layout_verbose verbose,
enum lov_dump_flags flags)
{
struct lmv_user_mds_data *objects = lum->lum_objects;
/* show all information default */
if (!verbose) {
if (lum->lum_magic == LMV_USER_MAGIC)
- verbose = VERBOSE_POOL | VERBOSE_COUNT |
- VERBOSE_OFFSET | VERBOSE_HASH_TYPE;
+ verbose = VERBOSE_POOL | VERBOSE_STRIPE_COUNT |
+ VERBOSE_STRIPE_OFFSET | VERBOSE_HASH_TYPE;
else
verbose = VERBOSE_OBJID;
}
if (depth && path && ((verbose != VERBOSE_OBJID)))
llapi_printf(LLAPI_MSG_NORMAL, "%s%s\n", prefix, path);
- if (verbose & VERBOSE_COUNT) {
+ if (verbose & VERBOSE_STRIPE_COUNT) {
llapi_printf(LLAPI_MSG_NORMAL, "%s", separator);
- if (verbose & ~VERBOSE_COUNT)
+ if (verbose & ~VERBOSE_STRIPE_COUNT)
llapi_printf(LLAPI_MSG_NORMAL, "lmv_stripe_count: ");
llapi_printf(LLAPI_MSG_NORMAL, "%u",
(int)lum->lum_stripe_count);
- if ((verbose & VERBOSE_OFFSET) && !yaml)
+ if ((verbose & VERBOSE_STRIPE_OFFSET) && !yaml)
separator = " ";
else
separator = "\n";
}
- if (verbose & VERBOSE_OFFSET) {
+ if (verbose & VERBOSE_STRIPE_OFFSET) {
llapi_printf(LLAPI_MSG_NORMAL, "%s", separator);
- if (verbose & ~VERBOSE_OFFSET)
+ if (verbose & ~VERBOSE_STRIPE_OFFSET)
llapi_printf(LLAPI_MSG_NORMAL, "lmv_stripe_offset: ");
llapi_printf(LLAPI_MSG_NORMAL, "%d",
(int)lum->lum_stripe_offset);
}
if (verbose & VERBOSE_HASH_TYPE) {
- unsigned int type = lum->lum_hash_type;
+ unsigned int type = lum->lum_hash_type & LMV_HASH_TYPE_MASK;
+ unsigned int flags = lum->lum_hash_type & ~LMV_HASH_TYPE_MASK;
llapi_printf(LLAPI_MSG_NORMAL, "%s", separator);
if (verbose & ~VERBOSE_HASH_TYPE)
llapi_printf(LLAPI_MSG_NORMAL, "%s",
mdt_hash_name[type]);
else
- llapi_printf(LLAPI_MSG_NORMAL, "%d",
- (int)type);
+ llapi_printf(LLAPI_MSG_NORMAL, "%#x", type);
+
+ if (flags & LMV_HASH_FLAG_MIGRATION)
+ llapi_printf(LLAPI_MSG_NORMAL, ",migrating");
+ if (flags & LMV_HASH_FLAG_DEAD)
+ llapi_printf(LLAPI_MSG_NORMAL, ",dead");
+ if (flags & LMV_HASH_FLAG_BAD_TYPE)
+ llapi_printf(LLAPI_MSG_NORMAL, ",bad_type");
+ if (flags & LMV_HASH_FLAG_LOST_LMV)
+ llapi_printf(LLAPI_MSG_NORMAL, ",lost_lmv");
separator = "\n";
+
}
if (verbose & VERBOSE_OBJID && lum->lum_magic != LMV_USER_MAGIC) {
{
struct lov_comp_md_v1 *comp_v1 = (void *)¶m->fp_lmd->lmd_lmm;
int depth = param->fp_max_depth;
- int verbose = param->fp_verbose;
+ enum llapi_layout_verbose verbose = param->fp_verbose;
bool yaml = flags & LDF_YAML;
if (depth && path && ((verbose != VERBOSE_OBJID) ||
struct lov_comp_md_v1 *comp_v1 = (void *)¶m->fp_lmd->lmd_lmm;
struct lov_comp_md_entry_v1 *entry;
char *separator = "";
- int verbose = param->fp_verbose;
+ enum llapi_layout_verbose verbose = param->fp_verbose;
bool yaml = flags & LDF_YAML;
entry = &comp_v1->lcm_entries[index];
static inline bool has_any_comp_options(struct find_param *param)
{
- int verbose = param->fp_verbose;
+ enum llapi_layout_verbose verbose = param->fp_verbose;
if (param->fp_check_comp_id || param->fp_check_comp_count ||
param->fp_check_comp_start || param->fp_check_comp_end ||
int llapi_ping(char *obd_type, char *obd_name)
{
+ int flags = O_RDONLY;
+ char buf[1] = { 0 };
glob_t path;
- char buf[1];
int rc, fd;
rc = cfs_get_param_paths(&path, "%s/%s/ping",
obd_type, obd_name);
if (rc != 0)
return -errno;
-
- fd = open(path.gl_pathv[0], O_WRONLY);
+retry_open:
+ fd = open(path.gl_pathv[0], flags);
if (fd < 0) {
+ if (errno == EACCES && flags == O_RDONLY) {
+ flags = O_WRONLY;
+ goto retry_open;
+ }
rc = -errno;
llapi_error(LLAPI_MSG_ERROR, rc, "error opening %s",
path.gl_pathv[0]);
goto failed;
}
- /* The purpose is to send a byte as a ping, whatever this byte is. */
- /* coverity[uninit_use_in_call] */
- rc = write(fd, buf, 1);
+ if (flags == O_RDONLY)
+ rc = read(fd, buf, sizeof(buf));
+ else
+ rc = write(fd, buf, sizeof(buf));
if (rc < 0)
rc = -errno;
close(fd);