Whamcloud - gitweb
git://git.whamcloud.com
/
fs
/
lustre-release.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
LU-819 utils: Fix lfs getstripe -M
[fs/lustre-release.git]
/
lustre
/
utils
/
liblustreapi.c
diff --git
a/lustre/utils/liblustreapi.c
b/lustre/utils/liblustreapi.c
index
88a0cd2
..
719ab51
100644
(file)
--- a/
lustre/utils/liblustreapi.c
+++ b/
lustre/utils/liblustreapi.c
@@
-177,6
+177,9
@@
int parse_size(char *optarg, unsigned long long *size,
{
char *end;
+ if (strncmp(optarg, "-", 1) == 0)
+ return -1;
+
if (*size_units == 0)
*size_units = 1;
@@
-268,6
+271,25
@@
int llapi_stripe_limit_check(unsigned long long stripe_size, int stripe_offset,
return 0;
}
+/* return the first file matching this pattern */
+static int first_match(char *pattern, char *buffer)
+{
+ glob_t glob_info;
+
+ if (glob(pattern, GLOB_BRACE, NULL, &glob_info))
+ return -ENOENT;
+
+ if (glob_info.gl_pathc < 1) {
+ globfree(&glob_info);
+ return -ENOENT;
+ }
+
+ strcpy(buffer, glob_info.gl_pathv[0]);
+
+ globfree(&glob_info);
+ return 0;
+}
+
static int find_target_obdpath(char *fsname, char *path)
{
glob_t glob_info;
@@
-310,6
+332,135
@@
static int find_poolpath(char *fsname, char *poolname, char *poolpath)
return 0;
}
+/**
+ * return a parameter string for a specific device type or mountpoint
+ *
+ * \param param_path the path to the file containing parameter data
+ * \param result buffer for parameter value string
+ * \param result_size size of buffer for return value
+ *
+ * The \param param_path is appended to /proc/{fs,sys}/{lnet,lustre} to
+ * complete the absolute path to the file containing the parameter data
+ * the user is requesting. If that file exist then the data is read from
+ * the file and placed into the \param result buffer that is passed by
+ * the user. Data is only copied up to the \param result_size to prevent
+ * overflow of the array.
+ *
+ * Return 0 for success, with a NUL-terminated string in \param result.
+ * Return -ve value for error.
+ */
+static int get_param(const char *param_path, char *result,
+ unsigned int result_size)
+{
+ char file[PATH_MAX + 1], pattern[PATH_MAX + 1], buf[result_size];
+ FILE *fp = NULL;
+ int rc = 0;
+
+ snprintf(pattern, PATH_MAX, "/proc/{fs,sys}/{lnet,lustre}/%s",
+ param_path);
+ rc = first_match(pattern, file);
+ if (rc)
+ return rc;
+
+ fp = fopen(file, "r");
+ if (fp != NULL) {
+ while (fgets(buf, result_size, fp) != NULL)
+ strcpy(result, buf);
+ fclose(fp);
+ } else {
+ rc = -errno;
+ }
+ return rc;
+}
+
+#define DEVICES_LIST "/proc/fs/lustre/devices"
+
+/**
+ * return a parameter string for a specific device type or mountpoint
+ *
+ * \param fsname Lustre filesystem name (optional)
+ * \param file_path path to file in filesystem (optional, if fsname unset)
+ * \param obd_type Lustre OBD device type
+ * \param param_name parameter name to fetch
+ * \param value return buffer for parameter value string
+ * \param val_len size of buffer for return value
+ *
+ * If fsname is specified then the parameter will be from that filesystem
+ * (if it exists). If file_path is given and it is in a mounted Lustre
+ * filesystem, then the parameter will be otherwise the value may be
+ * from any mounted filesystem (if there is more than one).
+ *
+ * If "obd_type" matches a Lustre device then the first matching device
+ * (as with "lctl dl", constrained by \param fsname or \param mount_path)
+ * will be used to provide the return value, otherwise the first such
+ * device found will be used.
+ *
+ * Return 0 for success, with a NUL-terminated string in \param buffer.
+ * Return -ve value for error.
+ */
+static int get_param_obdvar(const char *fsname, const char *file_path,
+ const char *obd_type, const char *param_name,
+ char *value, unsigned int val_len)
+{
+ char devices[PATH_MAX + 1], dev[PATH_MAX + 1] = "*", fs[PATH_MAX + 1];
+ FILE *fp = fopen(DEVICES_LIST, "r");
+ int rc = 0;
+
+ if (!fsname && file_path) {
+ rc = llapi_search_fsname(file_path, fs);
+ if (rc) {
+ llapi_error(LLAPI_MSG_ERROR, rc,
+ "'%s' is not on a Lustre filesystem",
+ file_path);
+ return rc;
+ }
+ } else if (fsname) {
+ strcpy(fs, fsname);
+ }
+
+ if (fp == NULL) {
+ rc = -errno;
+ llapi_error(LLAPI_MSG_ERROR, rc, "error: opening "DEVICES_LIST);
+ return rc;
+ }
+
+ while (fgets(devices, sizeof(devices), fp) != NULL) {
+ char *bufp = devices, *tmp;
+
+ while (bufp[0] == ' ')
+ ++bufp;
+
+ tmp = strstr(bufp, obd_type);
+ if (tmp) {
+ tmp += strlen(obd_type) + 1;
+ if (strcmp(tmp, fs))
+ continue;
+ strcpy(dev, tmp);
+ tmp = strchr(dev, ' ');
+ *tmp = '\0';
+ break;
+ }
+ }
+
+ if (dev[0] == '*' && strlen(fs))
+ snprintf(dev, PATH_MAX, "%s-*", fs);
+ snprintf(devices, PATH_MAX, "%s/%s/%s", obd_type, dev, param_name);
+ fclose(fp);
+ return get_param(devices, value, val_len);
+}
+
+static int get_mds_md_size(char *path)
+{
+ int lumlen = lov_mds_md_size(LOV_MAX_STRIPE_COUNT, LOV_MAGIC_V3);
+ char buf[16];
+
+ /* Now get the maxea from llite proc */
+ if (!get_param_obdvar(NULL, path, "llite", "max_easize",
+ buf, sizeof(buf)))
+ lumlen = atoi(buf);
+ return lumlen;
+}
+
/*
* if pool is NULL, search ostname in target_obd
* if pool is not NULL:
@@
-682,25
+833,6
@@
int llapi_getname(const char *path, char *buf, size_t size)
}
-/* return the first file matching this pattern */
-static int first_match(char *pattern, char *buffer)
-{
- glob_t glob_info;
-
- if (glob(pattern, GLOB_BRACE, NULL, &glob_info))
- return -ENOENT;
-
- if (glob_info.gl_pathc < 1) {
- globfree(&glob_info);
- return -ENOENT;
- }
-
- strcpy(buffer, glob_info.gl_pathv[0]);
-
- globfree(&glob_info);
- return 0;
-}
-
/*
* find the pool directory path under /proc
* (can be also used to test if a fsname is known)
@@
-920,42
+1052,72
@@
int llapi_poollist(const char *name)
{
/* list of pool names (assume that pool count is smaller
than OST count) */
- char *list[FIND_MAX_OSTS];
- char *buffer;
- /* fsname-OST0000_UUID < 32 char, 1 per OST */
- int bufsize = FIND_MAX_OSTS * 32;
- int i, nb;
-
- buffer = malloc(bufsize);
- if (buffer == NULL)
- return -ENOMEM;
+ char **list, *buffer = NULL, *path = NULL, *fsname = NULL;
+ int obdcount, bufsize, rc, nb, i;
+ char *poolname = NULL, *tmp = NULL, data[16];
+
+ if (name[0] != '/') {
+ fsname = strdup(name);
+ poolname = strchr(fsname, '.');
+ if (poolname)
+ *poolname = '\0';
+ } else {
+ path = (char *) name;
+ }
+
+ rc = get_param_obdvar(fsname, path, "lov", "numobd",
+ data, sizeof(data));
+ if (rc < 0)
+ goto err;
+ obdcount = atoi(data);
+
+ /* Allocate space for each fsname-OST0000_UUID, 1 per OST,
+ * and also an array to store the pointers for all that
+ * allocated space. */
+retry_get_pools:
+ bufsize = sizeof(struct obd_uuid) * obdcount;
+ buffer = realloc(tmp, bufsize + sizeof(*list) * obdcount);
+ if (buffer == NULL) {
+ rc = -ENOMEM;
+ goto err;
+ }
+ list = (char **) (buffer + bufsize);
- if (
(name[0] == '/') || (strchr(name, '.') == NULL))
+ if (
!poolname) {
/* name is a path or fsname */
- nb = llapi_get_poollist(name, list,
FIND_MAX_OSTS, buffer
,
- bufsize);
- else
+ nb = llapi_get_poollist(name, list,
obdcount
,
+ buf
fer, buf
size);
+ } else {
/* name is a pool name (<fsname>.<poolname>) */
- nb = llapi_get_poolmembers(name, list, FIND_MAX_OSTS, buffer,
- bufsize);
+ nb = llapi_get_poolmembers(name, list, obdcount,
+ buffer, bufsize);
+ }
+
+ if (nb == -EOVERFLOW) {
+ obdcount *= 2;
+ tmp = buffer;
+ goto retry_get_pools;
+ }
for (i = 0; i < nb; i++)
llapi_printf(LLAPI_MSG_NORMAL, "%s\n", list[i]);
-
- free(buffer);
- return (nb < 0 ? nb : 0);
+ rc = (nb < 0 ? nb : 0);
+err:
+ if (buffer)
+ free(buffer);
+ if (fsname)
+ free(fsname);
+ return rc;
}
-
typedef int (semantic_func_t)(char *path, DIR *parent, DIR *d,
void *data, cfs_dirent_t *de);
-#define MAX_LOV_UUID_COUNT max(LOV_MAX_STRIPE_COUNT, 1000)
#define OBD_NOT_FOUND (-1)
-static int common_param_init(struct find_param *param)
+static int common_param_init(struct find_param *param
, char *path
)
{
- param->lumlen =
lov_mds_md_size(MAX_LOV_UUID_COUNT, LOV_MAGIC_V3
);
+ param->lumlen =
get_mds_md_size(path
);
param->lmd = malloc(sizeof(lstat_t) + param->lumlen);
if (param->lmd == NULL) {
llapi_error(LLAPI_MSG_ERROR, -ENOMEM,
@@
-1005,21
+1167,27
@@
static DIR *opendir_parent(char *path)
return parent;
}
-
int llapi_mds_getfileinfo(char *path, DIR *parent
,
-
struct lov_user_mds_data *lmd
)
+
static int get_lmd_info(char *path, DIR *parent, DIR *dir
,
+
struct lov_user_mds_data *lmd, int lumlen
)
{
lstat_t *st = &lmd->lmd_st;
- char *fname = strrchr(path, '/');
int ret = 0;
- if (parent == NULL)
+ if (parent == NULL
&& dir == NULL
)
return -EINVAL;
- fname = (fname == NULL ? path : fname + 1);
- /* retrieve needed file info */
- strncpy((char *)lmd, fname,
- lov_mds_md_size(MAX_LOV_UUID_COUNT, LOV_MAGIC));
- ret = ioctl(dirfd(parent), IOC_MDC_GETFILEINFO, (void *)lmd);
+ if (dir) {
+ ret = ioctl(dirfd(dir), LL_IOC_MDC_GETINFO, (void *)lmd);
+ } else if (parent) {
+ char *fname = strrchr(path, '/');
+
+ fname = (fname == NULL ? path : fname + 1);
+ /* retrieve needed file info */
+ strncpy((char *)lmd, fname, lumlen);
+ ret = ioctl(dirfd(parent), IOC_MDC_GETFILEINFO, (void *)lmd);
+ } else {
+ return ret;
+ }
if (ret) {
if (errno == ENOTTY) {
@@
-1031,24
+1199,34
@@
int llapi_mds_getfileinfo(char *path, DIR *parent,
llapi_error(LLAPI_MSG_ERROR, ret,
"error: %s: lstat failed for %s",
__func__, path);
- return ret;
}
} else if (errno == ENOENT) {
ret = -errno;
llapi_error(LLAPI_MSG_WARN, ret,
"warning: %s: %s does not exist",
__func__, path);
- return ret;
+ } else if (errno != EISDIR) {
+ ret = -errno;
+ llapi_error(LLAPI_MSG_ERROR, ret,
+ "%s ioctl failed for %s.",
+ dir ? "LL_IOC_MDC_GETINFO" :
+ "IOC_MDC_GETFILEINFO", path);
} else {
ret = -errno;
llapi_error(LLAPI_MSG_ERROR, ret,
"error: %s: IOC_MDC_GETFILEINFO failed for %s",
__func__, path);
- return ret;
}
}
+ return ret;
+}
- return 0;
+int llapi_mds_getfileinfo(char *path, DIR *parent,
+ struct lov_user_mds_data *lmd)
+{
+ int lumlen = get_mds_md_size(path);
+
+ return get_lmd_info(path, parent, NULL, lmd, lumlen);
}
static int llapi_semantic_traverse(char *path, int size, DIR *parent,
@@
-1171,12
+1349,12
@@
static int param_callback(char *path, semantic_func_t sem_init,
if (!buf)
return -ENOMEM;
- ret = common_param_init(param);
+ strncpy(buf, path, PATH_MAX + 1);
+ ret = common_param_init(param, buf);
if (ret)
goto out;
param->depth = 0;
- strncpy(buf, path, PATH_MAX + 1);
ret = llapi_semantic_traverse(buf, PATH_MAX + 1, NULL, sem_init,
sem_fini, param, NULL);
out:
@@
-1195,6
+1373,16
@@
int llapi_file_fget_lov_uuid(int fd, struct obd_uuid *lov_name)
return rc;
}
+int llapi_file_fget_lmv_uuid(int fd, struct obd_uuid *lov_name)
+{
+ int rc = ioctl(fd, OBD_IOC_GETMDNAME, lov_name);
+ if (rc) {
+ rc = -errno;
+ llapi_error(LLAPI_MSG_ERROR, rc, "error: can't get lmv name.");
+ }
+ return rc;
+}
+
int llapi_file_get_lov_uuid(const char *path, struct obd_uuid *lov_uuid)
{
int fd, rc;
@@
-1212,27
+1400,38
@@
int llapi_file_get_lov_uuid(const char *path, struct obd_uuid *lov_uuid)
return rc;
}
+enum tgt_type {
+ LOV_TYPE = 1,
+ LMV_TYPE
+};
/*
* If uuidp is NULL, return the number of available obd uuids.
* If uuidp is non-NULL, then it will return the uuids of the obds. If
* there are more OSTs then allocated to uuidp, then an error is returned with
* the ost_count set to number of available obd uuids.
*/
-int llapi_lov_get_uuids(int fd, struct obd_uuid *uuidp, int *ost_count)
+static int llapi_get_target_uuids(int fd, struct obd_uuid *uuidp,
+ int *ost_count, enum tgt_type type)
{
- struct obd_uuid
lov_
name;
+ struct obd_uuid name;
char buf[1024];
FILE *fp;
int rc = 0, index = 0;
/* Get the lov name */
- rc = llapi_file_fget_lov_uuid(fd, &lov_name);
- if (rc)
- return rc;
+ if (type == LOV_TYPE) {
+ rc = llapi_file_fget_lov_uuid(fd, &name);
+ if (rc)
+ return rc;
+ } else {
+ rc = llapi_file_fget_lmv_uuid(fd, &name);
+ if (rc)
+ return rc;
+ }
/* Now get the ost uuids from /proc */
- snprintf(buf, sizeof(buf), "/proc/fs/lustre/
lov
/%s/target_obd",
-
lov_
name.uuid);
+ snprintf(buf, sizeof(buf), "/proc/fs/lustre/
%s
/%s/target_obd",
+
type == LOV_TYPE ? "lov" : "lmv",
name.uuid);
fp = fopen(buf, "r");
if (fp == NULL) {
rc = -errno;
@@
-1250,11
+1449,16
@@
int llapi_lov_get_uuids(int fd, struct obd_uuid *uuidp, int *ost_count)
fclose(fp);
- if (uuidp && (index >
=
*ost_count))
- r
eturn
-EOVERFLOW;
+ if (uuidp && (index > *ost_count))
+ r
c =
-EOVERFLOW;
*ost_count = index;
- return 0;
+ return rc;
+}
+
+int llapi_lov_get_uuids(int fd, struct obd_uuid *uuidp, int *ost_count)
+{
+ return llapi_get_target_uuids(fd, uuidp, ost_count, LOV_TYPE);
}
int llapi_get_obd_count(char *mnt, int *count, int is_mdt)
@@
-1305,7
+1509,7
@@
int llapi_uuid_match(char *real_uuid, char *search_uuid)
* returned in param->obdindex */
static int setup_obd_uuid(DIR *dir, char *dname, struct find_param *param)
{
- struct obd_uuid
lov
_uuid;
+ struct obd_uuid
obd
_uuid;
char uuid[sizeof(struct obd_uuid)];
char buf[1024];
FILE *fp;
@@
-1314,8
+1518,11
@@
static int setup_obd_uuid(DIR *dir, char *dname, struct find_param *param)
if (param->got_uuids)
return rc;
- /* Get the lov name */
- rc = llapi_file_fget_lov_uuid(dirfd(dir), &lov_uuid);
+ /* Get the lov/lmv name */
+ if (param->get_lmv)
+ rc = llapi_file_fget_lmv_uuid(dirfd(dir), &obd_uuid);
+ else
+ rc = llapi_file_fget_lov_uuid(dirfd(dir), &obd_uuid);
if (rc) {
if (rc != -ENOTTY) {
llapi_error(LLAPI_MSG_ERROR, rc,
@@
-1329,8
+1536,8
@@
static int setup_obd_uuid(DIR *dir, char *dname, struct find_param *param)
param->got_uuids = 1;
/* Now get the ost uuids from /proc */
- snprintf(buf, sizeof(buf), "/proc/fs/lustre/
lov
/%s/target_obd",
-
lov
_uuid.uuid);
+ snprintf(buf, sizeof(buf), "/proc/fs/lustre/
%s
/%s/target_obd",
+
param->get_lmv ? "lmv" : "lov", obd
_uuid.uuid);
fp = fopen(buf, "r");
if (fp == NULL) {
rc = -errno;
@@
-1339,7
+1546,8
@@
static int setup_obd_uuid(DIR *dir, char *dname, struct find_param *param)
}
if (!param->obduuid && !param->quiet && !param->obds_printed)
- llapi_printf(LLAPI_MSG_NORMAL, "OBDS:\n");
+ llapi_printf(LLAPI_MSG_NORMAL, "%s:\n",
+ param->get_lmv ? "MDTS" : "OBDS:");
while (fgets(buf, sizeof(buf), fp) != NULL) {
if (sscanf(buf, "%d: %s", &index, uuid) < 2)
@@
-1372,20
+1580,28
@@
static int setup_obd_uuid(DIR *dir, char *dname, struct find_param *param)
/* In this case, param->obduuid will be an array of obduuids and
* obd index for all these obduuids will be returned in
* param->obdindexes */
-static int setup_obd_indexes(DIR *dir, struct find_param *param)
+static int setup_indexes(DIR *dir, char *path, struct obd_uuid *obduuids,
+ int num_obds, int **obdindexes, int *obdindex,
+ enum tgt_type type)
{
+ int ret, obdcount, obd_valid = 0, obdnum, i;
struct obd_uuid *uuids = NULL;
- int obdcount = INIT_ALLOC_NUM_OSTS;
- int ret, obd_valid = 0, obdnum, i;
+ char buf[16];
+ int *indexes;
+
+ ret = get_param_obdvar(NULL, path, type == LOV_TYPE ? "lov" : "lmv",
+ "numobd", buf, sizeof(buf));
+ if (ret)
+ return ret;
- uuids = (struct obd_uuid *)malloc(INIT_ALLOC_NUM_OSTS *
+ obdcount = atoi(buf);
+ uuids = (struct obd_uuid *)malloc(obdcount *
sizeof(struct obd_uuid));
if (uuids == NULL)
return -ENOMEM;
retry_get_uuids:
- ret = llapi_lov_get_uuids(dirfd(dir), uuids,
- &obdcount);
+ ret = llapi_get_target_uuids(dirfd(dir), uuids, &obdcount, type);
if (ret) {
struct obd_uuid *uuids_temp;
@@
-1399,42
+1615,66
@@
retry_get_uuids:
}
llapi_error(LLAPI_MSG_ERROR, ret, "get ost uuid failed");
-
return ret
;
+
goto out_free
;
}
- param->obdindexes = malloc(param->num_obds * sizeof(param->obdindex));
- if (param->obdindexes == NULL)
- return -ENOMEM;
+ indexes = malloc(num_obds * sizeof(*obdindex));
+ if (indexes == NULL) {
+ ret = -ENOMEM;
+ goto out_free;
+ }
- for (obdnum = 0; obdnum <
param->
num_obds; obdnum++) {
+ for (obdnum = 0; obdnum < num_obds; obdnum++) {
for (i = 0; i < obdcount; i++) {
if (llapi_uuid_match(uuids[i].uuid,
-
param->obduuid
[obdnum].uuid)) {
-
param->obd
indexes[obdnum] = i;
+
obduuids
[obdnum].uuid)) {
+ indexes[obdnum] = i;
obd_valid++;
break;
}
}
if (i >= obdcount) {
-
param->obd
indexes[obdnum] = OBD_NOT_FOUND;
+ indexes[obdnum] = OBD_NOT_FOUND;
llapi_err_noerrno(LLAPI_MSG_ERROR,
"error: %s: unknown obduuid: %s",
- __func__,
- param->obduuid[obdnum].uuid);
+ __func__, obduuids[obdnum].uuid);
ret = -EINVAL;
}
}
if (obd_valid == 0)
-
param->
obdindex = OBD_NOT_FOUND;
+
*
obdindex = OBD_NOT_FOUND;
else
-
param->
obdindex = obd_valid;
+
*
obdindex = obd_valid;
- param->got_uuids = 1;
+ *obdindexes = indexes;
+out_free:
+ if (uuids)
+ free(uuids);
return ret;
}
+static int setup_target_indexes(DIR *dir, char *path, struct find_param *param)
+{
+ int ret = 0;
+
+ if (param->mdtuuid) {
+ ret = setup_indexes(dir, path, param->mdtuuid, param->num_mdts,
+ ¶m->mdtindexes, ¶m->mdtindex, LMV_TYPE);
+ if (ret)
+ return ret;
+ }
+ if (param->obduuid) {
+ ret = setup_indexes(dir, path, param->obduuid, param->num_obds,
+ ¶m->obdindexes, ¶m->obdindex, LOV_TYPE);
+ if (ret)
+ return ret;
+ }
+ param->got_uuids = 1;
+ return ret;
+}
+
int llapi_ostlist(char *path, struct find_param *param)
{
DIR *dir;
@@
-1654,7
+1894,7
@@
static void lov_dump_user_lmm_header(struct lov_user_md *lum, char *path,
&scount, NULL,
NULL);
if (rc == 0)
- llapi_printf(LLAPI_MSG_NORMAL, "%
u
%c",
+ llapi_printf(LLAPI_MSG_NORMAL, "%
d
%c",
scount, nl);
else
llapi_error(LLAPI_MSG_ERROR, rc,
@@
-1698,6
+1938,14
@@
static void lov_dump_user_lmm_header(struct lov_user_md *lum, char *path,
lum->lmm_pattern, nl);
}
+ if ((verbose & VERBOSE_GENERATION) && !is_dir) {
+ if (verbose & ~VERBOSE_GENERATION)
+ llapi_printf(LLAPI_MSG_NORMAL, "%slayout_gen: ",
+ prefix);
+ llapi_printf(LLAPI_MSG_NORMAL, "%u%c",
+ (int)lum->u.lum_layout_gen, nl);
+ }
+
if (verbose & VERBOSE_OFFSET) {
if (verbose & ~VERBOSE_OFFSET)
llapi_printf(LLAPI_MSG_NORMAL, "%sstripe_offset: ",
@@
-1926,7
+2174,7
@@
static int find_time_check(lstat_t *st, struct find_param *param, int mds)
/* Check if file is accepted. */
if (param->atime) {
ret = find_value_cmp(st->st_atime, param->atime,
- param->asign, param->exclude_atime,
+ param->asign, param->exclude_atime,
24 * 60 * 60, mds);
if (ret < 0)
return ret;
@@
-1935,7
+2183,7
@@
static int find_time_check(lstat_t *st, struct find_param *param, int mds)
if (param->mtime) {
ret = find_value_cmp(st->st_mtime, param->mtime,
- param->msign, param->exclude_mtime,
+ param->msign, param->exclude_mtime,
24 * 60 * 60, mds);
if (ret < 0)
return ret;
@@
-1962,6
+2210,104
@@
static int find_time_check(lstat_t *st, struct find_param *param, int mds)
return rc;
}
+/**
+ * Check whether the stripes matches the indexes user provided
+ * 1 : matched
+ * 0 : Unmatched
+ */
+static int check_obd_match(struct find_param *param)
+{
+ lstat_t *st = ¶m->lmd->lmd_st;
+ struct lov_user_ost_data_v1 *lmm_objects;
+ int i, j;
+
+ if (param->obduuid && param->obdindex == OBD_NOT_FOUND)
+ return 0;
+
+ if (!S_ISREG(st->st_mode))
+ return 0;
+
+ /* Only those files should be accepted, which have a
+ * stripe on the specified OST. */
+ if (!param->lmd->lmd_lmm.lmm_stripe_count)
+ return 0;
+
+ if (param->lmd->lmd_lmm.lmm_magic ==
+ LOV_USER_MAGIC_V3) {
+ struct lov_user_md_v3 *lmmv3 = (void *)¶m->lmd->lmd_lmm;
+
+ lmm_objects = lmmv3->lmm_objects;
+ } else if (param->lmd->lmd_lmm.lmm_magic == LOV_USER_MAGIC_V1) {
+ lmm_objects = param->lmd->lmd_lmm.lmm_objects;
+ } else {
+ llapi_err_noerrno(LLAPI_MSG_ERROR, "%s:Unknown magic: 0x%08X\n",
+ __func__, param->lmd->lmd_lmm.lmm_magic);
+ return -EINVAL;
+ }
+
+ for (i = 0; i < param->lmd->lmd_lmm.lmm_stripe_count; i++) {
+ for (j = 0; j < param->num_obds; j++) {
+ if (param->obdindexes[j] ==
+ lmm_objects[i].l_ost_idx) {
+ if (param->exclude_obd)
+ return 0;
+ return 1;
+ }
+ }
+ }
+
+ if (param->exclude_obd)
+ return 1;
+ return 0;
+}
+
+static int check_mdt_match(struct find_param *param)
+{
+ int i;
+
+ if (param->mdtuuid && param->mdtindex == OBD_NOT_FOUND)
+ return 0;
+
+ /* FIXME: For striped dir, we should get stripe information and check */
+ for (i = 0; i < param->num_mdts; i++) {
+ if (param->mdtindexes[i] == param->file_mdtindex)
+ if (param->exclude_mdt)
+ return 0;
+ return 1;
+ }
+
+ if (param->exclude_mdt)
+ return 1;
+ return 0;
+}
+
+/**
+ * Check whether the obd is active or not, if it is
+ * not active, just print the object affected by this
+ * failed target
+ **/
+static int print_failed_tgt(struct find_param *param, char *path, int type)
+{
+ struct obd_statfs stat_buf;
+ struct obd_uuid uuid_buf;
+ int ret;
+
+ LASSERT(type == LL_STATFS_LOV || type == LL_STATFS_LMV);
+
+ memset(&stat_buf, 0, sizeof(struct obd_statfs));
+ memset(&uuid_buf, 0, sizeof(struct obd_uuid));
+ ret = llapi_obd_statfs(path, type,
+ param->obdindex, &stat_buf,
+ &uuid_buf);
+ if (ret) {
+ llapi_printf(LLAPI_MSG_NORMAL,
+ "obd_uuid: %s failed %s ",
+ param->obduuid->uuid,
+ strerror(errno));
+ }
+ return ret;
+}
+
static int cb_find_init(char *path, DIR *parent, DIR *dir,
void *data, cfs_dirent_t *de)
{
@@
-2000,58
+2346,61
@@
static int cb_find_init(char *path, DIR *parent, DIR *dir,
}
}
-
ret = 0;
/* Request MDS for the stat info if some of these parameters need
* to be compared. */
- if (param->obduuid || param->
check_uid || param->check_g
id ||
- param->check_
pool || param->atime || param->ctime
||
- param->
mtime
|| param->check_size)
+ if (param->obduuid || param->
mdtuuid || param->check_u
id ||
+ param->check_
gid || param->check_pool || param->atime
||
+ param->
ctime || param->mtime
|| param->check_size)
decision = 0;
+
if (param->type && checked_type == 0)
decision = 0;
if (param->have_fileinfo == 0 && decision == 0) {
- if (dir) {
- /* retrieve needed file info */
- ret = ioctl(dirfd(dir), LL_IOC_MDC_GETINFO,
- (void *)param->lmd);
- } else {
- char *fname = strrchr(path, '/');
- fname = (fname == NULL ? path : fname + 1);
-
- /* retrieve needed file info */
- strncpy((char *)param->lmd, fname, param->lumlen);
- ret = ioctl(dirfd(parent), IOC_MDC_GETFILEINFO,
- (void *)param->lmd);
- }
- }
-
- if (ret) {
- if (errno == ENOTTY) {
- /* ioctl is not supported, it is not a lustre fs.
- * Do the regular lstat(2) instead. */
- lustre_fs = 0;
- ret = lstat_f(path, st);
- if (ret) {
- ret = -errno;
- llapi_error(LLAPI_MSG_ERROR, ret,
- "error: %s: lstat failed for %s",
- __func__, path);
- return ret;
+ ret = get_lmd_info(path, parent, dir, param->lmd,
+ param->lumlen);
+ if (ret == 0) {
+ if (dir) {
+ ret = llapi_file_fget_mdtidx(dirfd(dir),
+ ¶m->file_mdtindex);
+ } else {
+ int fd;
+ lstat_t tmp_st;
+
+ ret = lstat_f(path, &tmp_st);
+ if (ret) {
+ ret = -errno;
+ llapi_error(LLAPI_MSG_ERROR, ret,
+ "error: %s: lstat failed"
+ "for %s", __func__, path);
+ return ret;
+ }
+ if (S_ISREG(tmp_st.st_mode)) {
+ fd = open(path, O_RDONLY);
+ if (fd > 0) {
+ ret = llapi_file_fget_mdtidx(fd,
+ ¶m->file_mdtindex);
+ close(fd);
+ } else {
+ ret = fd;
+ }
+ } else {
+ /* For special inode, it assumes to
+ * reside on the same MDT with the
+ * parent */
+ fd = dirfd(parent);
+ ret = llapi_file_fget_mdtidx(fd,
+ ¶m->file_mdtindex);
+ }
}
- } else if (errno == ENOENT) {
- llapi_error(LLAPI_MSG_WARN, -ENOENT,
- "warning: %s: %s does not exist",
- __func__, path);
- goto decided;
- } else {
- ret = -errno;
- llapi_error(LLAPI_MSG_ERROR, ret,
- "error: %s: %s failed for %s",
- __func__, dir ? "LL_IOC_MDC_GETINFO" :
- "IOC_MDC_GETFILEINFO", path);
+ }
+ if (ret) {
+ if (ret == -ENOTTY)
+ lustre_fs = 0;
+ if (ret == -ENOENT)
+ goto decided;
return ret;
}
}
@@
-2067,17
+2416,18
@@
static int cb_find_init(char *path, DIR *parent, DIR *dir,
}
/* Prepare odb. */
- if (param->obduuid) {
+ if (param->obduuid
|| param->mdtuuid
) {
if (lustre_fs && param->got_uuids &&
param->st_dev != st->st_dev) {
/* A lustre/lustre mount point is crossed. */
param->got_uuids = 0;
param->obds_printed = 0;
- param->obdindex = OBD_NOT_FOUND;
+ param->obdindex =
param->mdtindex =
OBD_NOT_FOUND;
}
if (lustre_fs && !param->got_uuids) {
- ret = setup_obd_indexes(dir ? dir : parent, param);
+ ret = setup_target_indexes(dir ? dir : parent, path,
+ param);
if (ret)
return ret;
@@
-2085,59
+2435,36
@@
static int cb_find_init(char *path, DIR *parent, DIR *dir,
} else if (!lustre_fs && param->got_uuids) {
/* A lustre/non-lustre mount point is crossed. */
param->got_uuids = 0;
- param->obdindex = OBD_NOT_FOUND;
+ param->obdindex =
param->mdtindex =
OBD_NOT_FOUND;
}
}
- /* If an OBD UUID is specified but no one matches, skip this file. */
-
if (param->obduuid && param->obdindex == OBD_NOT_FOUND
)
+ if ((param->obduuid && param->obdindex == OBD_NOT_FOUND) ||
+
(param->mdtuuid && param->mdtindex == OBD_NOT_FOUND)
)
goto decided;
- /* If a OST UUID is given, and some OST matches, check it here. */
- if (param->obdindex != OBD_NOT_FOUND) {
- if (!S_ISREG(st->st_mode))
- goto decided;
-
- /* Only those files should be accepted, which have a
- * stripe on the specified OST. */
- if (!param->lmd->lmd_lmm.lmm_stripe_count) {
- goto decided;
- } else {
- int i, j;
- struct lov_user_ost_data_v1 *lmm_objects;
-
- if (param->lmd->lmd_lmm.lmm_magic ==
- LOV_USER_MAGIC_V3) {
- struct lov_user_md_v3 *lmmv3 =
- (void *)¶m->lmd->lmd_lmm;
-
- lmm_objects = lmmv3->lmm_objects;
+ /* If a OST or MDT UUID is given, and some OST matches,
+ * check it here. */
+ if (param->obdindex != OBD_NOT_FOUND ||
+ param->mdtindex != OBD_NOT_FOUND) {
+ if (param->obduuid) {
+ if (check_obd_match(param)) {
+ /* If no mdtuuid is given, we are done.
+ * Otherwise, fall through to the mdtuuid
+ * check below. */
+ if (!param->mdtuuid)
+ goto obd_matches;
} else {
- lmm_objects = param->lmd->lmd_lmm.lmm_objects;
- }
-
- for (i = 0;
- i < param->lmd->lmd_lmm.lmm_stripe_count; i++) {
- for (j = 0; j < param->num_obds; j++) {
- if (param->obdindexes[j] ==
- lmm_objects[i].l_ost_idx) {
- if (param->exclude_obd)
- goto decided;
- break;
- }
- }
- /* If an OBD matches, just break */
- if (j != param->num_obds)
- break;
- }
-
- if (i == param->lmd->lmd_lmm.lmm_stripe_count) {
- if (!param->exclude_obd)
- goto decided;
+ goto decided;
}
}
+ if (param->mdtuuid) {
+ if (check_mdt_match(param))
+ goto obd_matches;
+ goto decided;
+ }
}
-
+obd_matches:
if (param->check_uid) {
if (st->st_uid == param->uid) {
if (param->exclude_uid)
@@
-2201,30
+2528,16
@@
static int cb_find_init(char *path, DIR *parent, DIR *dir,
while (!decision) {
/* For regular files with the stripe the decision may have not
* been taken yet if *time or size is to be checked. */
- LASSERT(S_ISREG(st->st_mode) &&
- param->lmd->lmd_lmm.lmm_stripe_count);
-
- if (param->obdindex != OBD_NOT_FOUND) {
- /* Check whether the obd is active or not, if it is
- * not active, just print the object affected by this
- * failed ost
- * */
- struct obd_statfs stat_buf;
- struct obd_uuid uuid_buf;
-
- memset(&stat_buf, 0, sizeof(struct obd_statfs));
- memset(&uuid_buf, 0, sizeof(struct obd_uuid));
- ret = llapi_obd_statfs(path, LL_STATFS_LOV,
- param->obdindex, &stat_buf,
- &uuid_buf);
- if (ret) {
- llapi_printf(LLAPI_MSG_NORMAL,
- "obd_uuid: %s failed %s ",
- param->obduuid->uuid,
- strerror(errno));
- break;
- }
- }
+ LASSERT((S_ISREG(st->st_mode) &&
+ param->lmd->lmd_lmm.lmm_stripe_count) ||
+ param->mdtindex != OBD_NOT_FOUND);
+
+ if (param->obdindex != OBD_NOT_FOUND)
+ print_failed_tgt(param, path, LL_STATFS_LOV);
+
+ if (param->mdtindex != OBD_NOT_FOUND)
+ print_failed_tgt(param, path, LL_STATFS_LMV);
+
if (dir) {
ret = ioctl(dirfd(dir), IOC_LOV_GETINFO,
(void *)param->lmd);
@@
-2290,7
+2603,7
@@
int llapi_find(char *path, struct find_param *param)
*/
int llapi_file_fget_mdtidx(int fd, int *mdtidx)
{
- if (ioctl(fd, LL_IOC_GET_MDTIDX,
&
mdtidx) < 0)
+ if (ioctl(fd, LL_IOC_GET_MDTIDX, mdtidx) < 0)
return -errno;
return 0;
}
@@
-2341,7
+2654,7
@@
static int cb_get_mdt_index(char *path, DIR *parent, DIR *d, void *data,
return ret;
}
- if (param->quiet)
+ if (param->quiet
|| !(param->verbose & VERBOSE_DETAIL)
)
llapi_printf(LLAPI_MSG_NORMAL, "%d\n", mdtidx);
else
llapi_printf(LLAPI_MSG_NORMAL, "%s MDT index: %d\n",
@@
-2492,7
+2805,6
@@
int llapi_obd_statfs(char *path, __u32 type, __u32 index,
}
#define MAX_STRING_SIZE 128
-#define DEVICES_LIST "/proc/fs/lustre/devices"
int llapi_ping(char *obd_type, char *obd_name)
{
@@
-2717,36
+3029,15
@@
static int cb_quotachown(char *path, DIR *parent, DIR *d, void *data,
LASSERT(parent != NULL || d != NULL);
- if (d) {
- rc = ioctl(dirfd(d), LL_IOC_MDC_GETINFO,
- (void *)param->lmd);
- } else if (parent) {
- char *fname = strrchr(path, '/');
- fname = (fname == NULL ? path : fname + 1);
-
- strncpy((char *)param->lmd, fname, param->lumlen);
- rc = ioctl(dirfd(parent), IOC_MDC_GETFILEINFO,
- (void *)param->lmd);
- } else {
- return 0;
- }
-
+ rc = get_lmd_info(path, parent, d, param->lmd, param->lumlen);
if (rc) {
- if (
errno ==
ENODATA) {
+ if (
rc == -
ENODATA) {
if (!param->obduuid && !param->quiet)
llapi_error(LLAPI_MSG_ERROR, -ENODATA,
"%s has no stripe info", path);
rc = 0;
- } else if (errno == ENOENT) {
- llapi_error(LLAPI_MSG_ERROR, -ENOENT,
- "warning: %s: %s does not exist",
- __func__, path);
+ } else if (rc == -ENOENT) {
rc = 0;
- } else if (errno != EISDIR) {
- rc = -errno;
- llapi_error(LLAPI_MSG_ERROR, rc, "%s ioctl failed for %s.",
- d ? "LL_IOC_MDC_GETINFO" :
- "IOC_MDC_GETFILEINFO", path);
}
return rc;
}