X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre%2Futils%2Fobd.c;h=4c0c14ecf9884d8cfd33a853876fefd2069d34a3;hp=aa9117f9de4e178425f742748194d6cab0f3b56e;hb=9c5fad36aac2086b38f91e28db90da01efc9126a;hpb=dd918fb51ed8ba180f888a242df20e5a4af29af2;ds=sidebyside diff --git a/lustre/utils/obd.c b/lustre/utils/obd.c index aa9117f..4c0c14e 100644 --- a/lustre/utils/obd.c +++ b/lustre/utils/obd.c @@ -15,11 +15,7 @@ * * You should have received a copy of the GNU General Public License * version 2 along with this program; If not, see - * http://www.sun.com/software/products/lustre/docs/GPLv2.pdf - * - * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, - * CA 95054 USA or visit www.sun.com if you need additional information or - * have any questions. + * http://www.gnu.org/licenses/gpl-2.0.html * * GPL HEADER END */ @@ -27,7 +23,7 @@ * Copyright (c) 2002, 2010, Oracle and/or its affiliates. All rights reserved. * Use is subject to license terms. * - * Copyright (c) 2011, 2013, Intel Corporation. + * Copyright (c) 2011, 2016, Intel Corporation. */ /* * This file is part of Lustre, http://www.lustre.org/ @@ -53,7 +49,6 @@ #include #include #include -#include #include #include #include @@ -62,21 +57,28 @@ #include #include #include +#include #include "obdctl.h" -#include +#include "lustreapi_internal.h" +#include +#include +#include +#include +#include + #include -#include -#include -#include -#include +#include +#include +#include +#include #include -#include #include +#include +#include #define MAX_STRING_SIZE 128 -#define DEVICES_LIST "/proc/fs/lustre/devices" #if HAVE_LIBPTHREAD #include @@ -87,8 +89,8 @@ #define MAX_BASE_ID 0xffffffff #define NIDSTRING_LENGTH 64 struct shared_data { - l_mutex_t mutex; - l_cond_t cond; + pthread_mutex_t mutex; + pthread_cond_t cond; int stopping; struct { __u64 counters[MAX_THREADS]; @@ -202,15 +204,17 @@ char *obdo_print(struct obdo *obd) { char buf[1024]; - sprintf(buf, "id: "LPX64"\ngrp: "LPX64"\natime: "LPU64"\nmtime: "LPU64 - "\nctime: "LPU64"\nsize: "LPU64"\nblocks: "LPU64 - "\nblksize: %u\nmode: %o\nuid: %d\ngid: %d\nflags: %x\n" - "misc: %x\nnlink: %d,\nvalid "LPX64"\n", - ostid_id(&obd->o_oi), ostid_seq(&obd->o_oi), obd->o_atime, - obd->o_mtime, obd->o_ctime, - obd->o_size, obd->o_blocks, obd->o_blksize, obd->o_mode, - obd->o_uid, obd->o_gid, obd->o_flags, obd->o_misc, - obd->o_nlink, obd->o_valid); + snprintf(buf, sizeof(buf), "id: %#jx\ngrp: %#jx\natime: %ju\n" + "mtime: %ju\nctime: %ju\nsize: %ju\nblocks: %ju" + "\nblksize: %u\nmode: %o\nuid: %d\ngid: %d\nflags: %x\n" + "misc: %x\nnlink: %d,\nvalid %#jx\n", + (uintmax_t)ostid_id(&obd->o_oi), + (uintmax_t)ostid_seq(&obd->o_oi), + (uintmax_t)obd->o_atime, (uintmax_t)obd->o_mtime, + (uintmax_t)obd->o_ctime, (uintmax_t)obd->o_size, + (uintmax_t)obd->o_blocks, obd->o_blksize, obd->o_mode, + obd->o_uid, obd->o_gid, obd->o_flags, obd->o_misc, + obd->o_nlink, (uintmax_t)obd->o_valid); return strdup(buf); } @@ -423,22 +427,22 @@ out: static inline void shmem_lock(void) { - l_mutex_lock(&shared_data->mutex); + pthread_mutex_lock(&shared_data->mutex); } static inline void shmem_unlock(void) { - l_mutex_unlock(&shared_data->mutex); + pthread_mutex_unlock(&shared_data->mutex); } static inline void shmem_wait(void) { - l_cond_wait(&shared_data->cond, &shared_data->mutex); + pthread_cond_wait(&shared_data->cond, &shared_data->mutex); } static inline void shmem_wakeup_all(void) { - l_cond_broadcast(&shared_data->cond); + pthread_cond_broadcast(&shared_data->cond); } static inline void shmem_reset(int total_threads) @@ -487,8 +491,8 @@ static void shmem_total(int total_threads) &shared_data->body.start_time); shmem_unlock(); - printf("Total: total "LPU64" threads %d sec %f %f/second\n", - total, total_threads, secs, total / secs); + printf("Total: total %ju threads %d sec %f %f/second\n", + (uintmax_t)total, total_threads, secs, total / secs); return; } @@ -922,71 +926,69 @@ int jt_obd_abort_recovery(int argc, char **argv) int jt_get_version(int argc, char **argv) { - int rc; - char rawbuf[MAX_IOC_BUFLEN]; - char *version; + char version[128]; + int rc; - if (argc != 1) - return CMD_HELP; + if (argc != 1) + return CMD_HELP; - rc = llapi_get_version(rawbuf, MAX_IOC_BUFLEN, &version); - if (rc) - fprintf(stderr, "error: %s: %s\n", jt_cmdname(argv[0]), - strerror(-rc)); + rc = llapi_get_version_string(version, sizeof(version)); + if (rc) + printf("Lustre version: %s\n", LUSTRE_VERSION_STRING); else printf("Lustre version: %s\n", version); - return rc; + return 0; } static void print_obd_line(char *s) { - char buf[MAX_STRING_SIZE]; - char obd_name[MAX_OBD_NAME]; - FILE *fp = NULL; - char *ptr; - - snprintf(buf, sizeof(buf), " %%*d %%*s osc %%%zus %%*s %%*d ", - sizeof(obd_name) - 1); + const char *param = "osc/%s/ost_conn_uuid"; + char buf[MAX_STRING_SIZE]; + char obd_name[MAX_OBD_NAME]; + FILE *fp = NULL; + glob_t path; + char *ptr; +retry: + /* obd device type is the first 3 characters of param name */ + snprintf(buf, sizeof(buf), " %%*d %%*s %.3s %%%zus %%*s %%*d ", + param, sizeof(obd_name) - 1); if (sscanf(s, buf, obd_name) == 0) - goto try_mdc; - snprintf(buf, sizeof(buf), - "/proc/fs/lustre/osc/%s/ost_conn_uuid", obd_name); - if ((fp = fopen(buf, "r")) == NULL) - goto try_mdc; - goto got_one; - + goto try_mdc; + if (cfs_get_param_paths(&path, param, obd_name) != 0) + goto try_mdc; + fp = fopen(path.gl_pathv[0], "r"); + if (fp == NULL) { + /* need to free path data before retry */ + cfs_free_param_data(&path); try_mdc: - snprintf(buf, sizeof(buf), " %%*d %%*s mdc %%%zus %%*s %%*d ", - sizeof(obd_name) - 1); - if (sscanf(s, buf, obd_name) == 0) - goto fail; - snprintf(buf, sizeof(buf), - "/proc/fs/lustre/mdc/%s/mds_conn_uuid", obd_name); - if ((fp = fopen(buf, "r")) == NULL) - goto fail; - -got_one: - /* should not ignore fgets(3)'s return value */ - if (!fgets(buf, sizeof(buf), fp)) { - fprintf(stderr, "reading from %s: %s", buf, strerror(errno)); - fclose(fp); - return; - } - fclose(fp); - - /* trim trailing newlines */ - ptr = strrchr(buf, '\n'); - if (ptr) *ptr = '\0'; - ptr = strrchr(s, '\n'); - if (ptr) *ptr = '\0'; + if (param[0] == 'o') { /* failed with osc, try mdc */ + param = "mdc/%s/mds_conn_uuid"; + goto retry; + } + buf[0] = '\0'; + goto fail_print; + } - printf("%s %s\n", s, buf); - return; + /* should not ignore fgets(3)'s return value */ + if (!fgets(buf, sizeof(buf), fp)) { + fprintf(stderr, "reading from %s: %s", buf, strerror(errno)); + goto fail_close; + } -fail: - printf("%s", s); - return; +fail_close: + fclose(fp); + cfs_free_param_data(&path); + + /* trim trailing newlines */ + ptr = strrchr(buf, '\n'); + if (ptr) + *ptr = '\0'; +fail_print: + ptr = strrchr(s, '\n'); + if (ptr) + *ptr = '\0'; + printf("%s%s%s\n", s, buf[0] ? " " : "", buf); } /* get device list by ioctl */ @@ -1029,10 +1031,10 @@ int jt_obd_list_ioctl(int argc, char **argv) int jt_obd_list(int argc, char **argv) { - int rc; - char buf[MAX_STRING_SIZE]; - FILE *fp = NULL; - int print_obd = 0; + char buf[MAX_STRING_SIZE]; + int print_obd = 0; + glob_t path; + FILE *fp; if (argc > 2) return CMD_HELP; @@ -1043,10 +1045,14 @@ int jt_obd_list(int argc, char **argv) return CMD_HELP; } - fp = fopen(DEVICES_LIST, "r"); + if (cfs_get_param_paths(&path, "devices") != 0) + return -errno; + + fp = fopen(path.gl_pathv[0], "r"); if (fp == NULL) { - fprintf(stderr, "error: %s: %s opening "DEVICES_LIST"\n", - jt_cmdname(argv[0]), strerror(rc = errno)); + fprintf(stderr, "error: %s: %s opening %s\n", + jt_cmdname(argv[0]), strerror(errno), path.gl_pathv[0]); + cfs_free_param_data(&path); return jt_obd_list_ioctl(argc, argv); } @@ -1056,14 +1062,15 @@ int jt_obd_list(int argc, char **argv) else printf("%s", buf); + cfs_free_param_data(&path); fclose(fp); return 0; } struct jt_fid_space { - obd_seq jt_seq; - obd_id jt_id; - int jt_width; + __u64 jt_seq; + __u64 jt_id; + int jt_width; }; int jt_obd_alloc_fids(struct jt_fid_space *space, struct lu_fid *fid, @@ -1108,7 +1115,9 @@ int jt_obd_alloc_fids(struct jt_fid_space *space, struct lu_fid *fid, fid->f_oid = space->jt_id; fid->f_ver = 0; - space->jt_id = min(space->jt_id + *count, space->jt_width); + space->jt_id = space->jt_id + *count; + if (space->jt_id > space->jt_width) + space->jt_id = space->jt_width; *count = space->jt_id - fid->f_oid; return 0; @@ -1141,20 +1150,22 @@ int jt_obd_md_common(int argc, char **argv, int cmd) char *name = NULL; struct jt_fid_space fid_space = {0}; int version = 0; - struct option long_opts[] = { - {"child_base_id", required_argument, 0, 'b'}, - {"stripe_count", required_argument, 0, 'c'}, - {"parent_basedir", required_argument, 0, 'd'}, - {"parent_dircount", required_argument, 0, 'D'}, - {"stripe_index", required_argument, 0, 'i'}, - {"mode", required_argument, 0, 'm'}, - {"count", required_argument, 0, 'n'}, - {"time", required_argument, 0, 't'}, - {"version", no_argument, 0, 'v'}, - {0, 0, 0, 0} - }; - - optind = 0; + struct option long_opts[] = { + { .val = 'b', .name = "child_base_id", + .has_arg = required_argument }, + { .val = 'c', .name = "stripe_count", + .has_arg = required_argument }, + { .val = 'd', .name = "parent_basedir", + .has_arg = required_argument }, + { .val = 'D', .name = "parent_dircount", + .has_arg = required_argument }, + { .val = 'i', .name = "stripe_index", .has_arg = required_argument }, + { .val = 'm', .name = "mode", .has_arg = required_argument }, + { .val = 'n', .name = "count", .has_arg = required_argument }, + { .val = 't', .name = "time", .has_arg = required_argument }, + { .val = 'v', .name = "version", .has_arg = no_argument }, + { .name = NULL } }; + while ((c = getopt_long(argc, argv, "b:c:d:D:m:n:t:v", long_opts, NULL)) >= 0) { switch (c) { @@ -1358,7 +1369,7 @@ int jt_obd_md_common(int argc, char **argv, int cmd) fprintf(stderr, "Allocate fids error %d.\n",rc); return rc; } - fid_to_ostid(&fid, &data.ioc_obdo1.o_oi); + data.ioc_obdo1.o_oi.oi_fid = fid; } child_base_id += data.ioc_count; @@ -1480,19 +1491,25 @@ int jt_obd_create(int argc, char **argv) return CMD_HELP; } - printf("%s: "LPD64" objects\n", jt_cmdname(argv[0]), count); + printf("%s: %jd objects\n", jt_cmdname(argv[0]), (uintmax_t)count); gettimeofday(&next_time, NULL); next_time.tv_sec -= verbose; ostid_set_seq_echo(&data.ioc_obdo1.o_oi); for (i = 1, next_count = verbose; i <= count && shmem_running(); i++) { + /* + * base_id is 1 so we don't need to worry about it being + * greater than OBIF_MAX_OID + */ + data.ioc_obdo1.o_oi.oi_fid.f_oid = base_id; data.ioc_obdo1.o_mode = mode; - ostid_set_id(&data.ioc_obdo1.o_oi, base_id); data.ioc_obdo1.o_uid = 0; data.ioc_obdo1.o_gid = 0; + data.ioc_obdo1.o_projid = 0; data.ioc_obdo1.o_valid = OBD_MD_FLTYPE | OBD_MD_FLMODE | OBD_MD_FLID | OBD_MD_FLUID | - OBD_MD_FLGID | OBD_MD_FLGROUP; + OBD_MD_FLGID | OBD_MD_FLGROUP | + OBD_MD_FLPROJID; memset(buf, 0, sizeof(rawbuf)); rc = obd_ioctl_pack(&data, &buf, sizeof(rawbuf)); @@ -1510,46 +1527,59 @@ int jt_obd_create(int argc, char **argv) break; } if (!(data.ioc_obdo1.o_valid & OBD_MD_FLID)) { - fprintf(stderr,"error: %s: oid not valid #%d:"LPX64"\n", - jt_cmdname(argv[0]), i, data.ioc_obdo1.o_valid); + fprintf(stderr, "error: %s: oid not valid #%d:%#jx\n", + jt_cmdname(argv[0]), i, + (uintmax_t)data.ioc_obdo1.o_valid); rc = EINVAL; break; } if (be_verbose(verbose, &next_time, i, &next_count, count)) - printf("%s: #%d is object id "LPX64"\n", + printf("%s: #%d is object id %#jx\n", jt_cmdname(argv[0]), i, - ostid_id(&data.ioc_obdo1.o_oi)); + (uintmax_t) ostid_id(&data.ioc_obdo1.o_oi)); } return rc; } int jt_obd_setattr(int argc, char **argv) { - struct obd_ioctl_data data; - char rawbuf[MAX_IOC_BUFLEN], *buf = rawbuf; - char *end; - int rc; + struct obd_ioctl_data data; + char rawbuf[MAX_IOC_BUFLEN], *buf = rawbuf; + __u64 objid; + char *end; + int mode; + int rc; memset(&data, 0, sizeof(data)); data.ioc_dev = cur_device; if (argc != 2) return CMD_HELP; - ostid_set_seq_echo(&data.ioc_obdo1.o_oi); - ostid_set_id(&data.ioc_obdo1.o_oi, strtoull(argv[1], &end, 0)); - if (*end) { + objid = strtoull(argv[1], &end, 0); + if (*end) { + fprintf(stderr, "error: %s: objid '%s' is not a number\n", + jt_cmdname(argv[0]), argv[1]); + return CMD_HELP; + } + + if (objid >= OBIF_MAX_OID) { fprintf(stderr, "error: %s: invalid objid '%s'\n", jt_cmdname(argv[0]), argv[1]); return CMD_HELP; } - data.ioc_obdo1.o_mode = S_IFREG | strtoul(argv[2], &end, 0); + + mode = strtoul(argv[2], &end, 0); if (*end) { fprintf(stderr, "error: %s: invalid mode '%s'\n", jt_cmdname(argv[0]), argv[2]); return CMD_HELP; } - data.ioc_obdo1.o_valid = OBD_MD_FLID | OBD_MD_FLTYPE | OBD_MD_FLMODE; + + ostid_set_seq_echo(&data.ioc_obdo1.o_oi); + data.ioc_obdo1.o_mode = S_IFREG | mode; + data.ioc_obdo1.o_oi.oi_fid.f_oid = objid; + data.ioc_obdo1.o_valid = OBD_MD_FLID | OBD_MD_FLTYPE | OBD_MD_FLMODE; memset(buf, 0, sizeof(rawbuf)); rc = obd_ioctl_pack(&data, &buf, sizeof(rawbuf)); @@ -1570,10 +1600,10 @@ int jt_obd_test_setattr(int argc, char **argv) { struct obd_ioctl_data data; struct timeval start, next_time; - __u64 i, count, next_count; + __u64 i, count, next_count; char rawbuf[MAX_IOC_BUFLEN], *buf = rawbuf; int verbose = 1; - obd_id objid = 3; + __u64 objid = 3; char *end; int rc = 0; @@ -1613,12 +1643,19 @@ int jt_obd_test_setattr(int argc, char **argv) next_time.tv_sec = start.tv_sec - verbose; next_time.tv_usec = start.tv_usec; if (verbose != 0) - printf("%s: setting "LPD64" attrs (objid "LPX64"): %s", - jt_cmdname(argv[0]), count, objid, ctime(&start.tv_sec)); + printf("%s: setting %jd attrs (objid %#jx): %s", + jt_cmdname(argv[0]), (uintmax_t)count, + (uintmax_t)objid, ctime(&start.tv_sec)); ostid_set_seq_echo(&data.ioc_obdo1.o_oi); for (i = 1, next_count = verbose; i <= count && shmem_running(); i++) { - ostid_set_id(&data.ioc_obdo1.o_oi, objid); + if (objid >= OBIF_MAX_OID) { + fprintf(stderr, "errr: %s: invalid objid '%llu'\n", + jt_cmdname(argv[0]), objid); + return -E2BIG; + } + + data.ioc_obdo1.o_oi.oi_fid.f_oid = objid; data.ioc_obdo1.o_mode = S_IFREG; data.ioc_obdo1.o_valid = OBD_MD_FLID | OBD_MD_FLTYPE | OBD_MD_FLMODE; memset(buf, 0, sizeof(rawbuf)); @@ -1631,14 +1668,15 @@ int jt_obd_test_setattr(int argc, char **argv) rc = l2_ioctl(OBD_DEV_ID, OBD_IOC_SETATTR, &data); shmem_bump(1); if (rc < 0) { - fprintf(stderr, "error: %s: #"LPD64" - %d:%s\n", - jt_cmdname(argv[0]), i, errno, strerror(rc = errno)); + fprintf(stderr, "error: %s: #%jd - %d:%s\n", + jt_cmdname(argv[0]), (uintmax_t)i, + errno, strerror(rc = errno)); break; } else { if (be_verbose (verbose, &next_time, i, &next_count, count)) - printf("%s: set attr #"LPD64"\n", - jt_cmdname(argv[0]), i); + printf("%s: set attr #%jd\n", + jt_cmdname(argv[0]), (uintmax_t)i); } } @@ -1652,9 +1690,9 @@ int jt_obd_test_setattr(int argc, char **argv) --i; if (verbose != 0) - printf("%s: "LPD64" attrs in %.3fs (%.3f attr/s): %s", - jt_cmdname(argv[0]), i, diff, i / diff, - ctime(&end.tv_sec)); + printf("%s: %jd attrs in %.3fs (%.3f attr/s): %s", + jt_cmdname(argv[0]), (uintmax_t)i, diff, + i / diff, ctime(&end.tv_sec)); } return rc; } @@ -1697,13 +1735,19 @@ int jt_obd_destroy(int argc, char **argv) return CMD_HELP; } - printf("%s: "LPD64" objects\n", jt_cmdname(argv[0]), count); + printf("%s: %jd objects\n", jt_cmdname(argv[0]), (uintmax_t)count); gettimeofday(&next_time, NULL); next_time.tv_sec -= verbose; ostid_set_seq_echo(&data.ioc_obdo1.o_oi); for (i = 1, next_count = verbose; i <= count && shmem_running(); i++, id++) { - ostid_set_id(&data.ioc_obdo1.o_oi, id); + if (id >= OBIF_MAX_OID) { + fprintf(stderr, "errr: %s: invalid objid '%llu'\n", + jt_cmdname(argv[0]), id); + return -E2BIG; + } + + data.ioc_obdo1.o_oi.oi_fid.f_oid = id; data.ioc_obdo1.o_mode = S_IFREG | 0644; data.ioc_obdo1.o_valid = OBD_MD_FLID | OBD_MD_FLMODE; @@ -1718,14 +1762,15 @@ int jt_obd_destroy(int argc, char **argv) obd_ioctl_unpack(&data, buf, sizeof(rawbuf)); shmem_bump(1); if (rc < 0) { - fprintf(stderr, "error: %s: objid "LPX64": %s\n", - jt_cmdname(argv[0]), id, strerror(rc = errno)); + fprintf(stderr, "error: %s: objid %#jx: %s\n", + jt_cmdname(argv[0]), (uintmax_t)id, + strerror(rc = errno)); break; } if (be_verbose(verbose, &next_time, i, &next_count, count)) - printf("%s: #%d is object id "LPX64"\n", - jt_cmdname(argv[0]), i, id); + printf("%s: #%d is object id %#jx\n", + jt_cmdname(argv[0]), i, (uintmax_t)id); } return rc; @@ -1735,26 +1780,35 @@ int jt_obd_getattr(int argc, char **argv) { struct obd_ioctl_data data; char rawbuf[MAX_IOC_BUFLEN], *buf = rawbuf; + __u64 objid; char *end; int rc; if (argc != 2) return CMD_HELP; - memset(&data, 0, sizeof(data)); - data.ioc_dev = cur_device; - ostid_set_seq_echo(&data.ioc_obdo1.o_oi); - ostid_set_id(&data.ioc_obdo1.o_oi, strtoull(argv[1], &end, 0)); + objid = strtoull(argv[1], &end, 0); if (*end) { + fprintf(stderr, "error: %s: objid '%s' is not a number\n", + jt_cmdname(argv[0]), argv[1]); + return CMD_HELP; + } + + if (objid >= OBIF_MAX_OID) { fprintf(stderr, "error: %s: invalid objid '%s'\n", jt_cmdname(argv[0]), argv[1]); return CMD_HELP; } + + memset(&data, 0, sizeof(data)); + data.ioc_dev = cur_device; + ostid_set_seq_echo(&data.ioc_obdo1.o_oi); + data.ioc_obdo1.o_oi.oi_fid.f_oid = objid; /* to help obd filter */ data.ioc_obdo1.o_mode = 0100644; data.ioc_obdo1.o_valid = 0xffffffff; - printf("%s: object id "LPX64"\n", jt_cmdname(argv[0]), - ostid_id(&data.ioc_obdo1.o_oi)); + printf("%s: object id %#jx\n", jt_cmdname(argv[0]), + (uintmax_t)ostid_id(&data.ioc_obdo1.o_oi)); memset(buf, 0, sizeof(rawbuf)); rc = obd_ioctl_pack(&data, &buf, sizeof(rawbuf)); @@ -1769,8 +1823,9 @@ int jt_obd_getattr(int argc, char **argv) fprintf(stderr, "error: %s: %s\n", jt_cmdname(argv[0]), strerror(rc = errno)); } else { - printf("%s: object id "LPU64", mode %o\n", jt_cmdname(argv[0]), - ostid_id(&data.ioc_obdo1.o_oi), data.ioc_obdo1.o_mode); + printf("%s: object id %ju, mode %o\n", jt_cmdname(argv[0]), + (uintmax_t)ostid_id(&data.ioc_obdo1.o_oi), + data.ioc_obdo1.o_mode); } return rc; } @@ -1780,9 +1835,9 @@ int jt_obd_test_getattr(int argc, char **argv) struct obd_ioctl_data data; struct timeval start, next_time; char rawbuf[MAX_IOC_BUFLEN], *buf = rawbuf; - __u64 i, count, next_count; + __u64 i, count, next_count; int verbose = 1; - obd_id objid = 3; + __u64 objid = 3; char *end; int rc = 0; @@ -1822,12 +1877,19 @@ int jt_obd_test_getattr(int argc, char **argv) next_time.tv_sec = start.tv_sec - verbose; next_time.tv_usec = start.tv_usec; if (verbose != 0) - printf("%s: getting "LPD64" attrs (objid "LPX64"): %s", - jt_cmdname(argv[0]), count, objid, ctime(&start.tv_sec)); + printf("%s: getting %jd attrs (objid %#jx): %s", + jt_cmdname(argv[0]), (uintmax_t) count, + (uintmax_t)objid, ctime(&start.tv_sec)); ostid_set_seq_echo(&data.ioc_obdo1.o_oi); for (i = 1, next_count = verbose; i <= count && shmem_running(); i++) { - ostid_set_id(&data.ioc_obdo1.o_oi, objid); + if (objid >= OBIF_MAX_OID) { + fprintf(stderr, "errr: %s: invalid objid '%llu'\n", + jt_cmdname(argv[0]), objid); + return -E2BIG; + } + + data.ioc_obdo1.o_oi.oi_fid.f_oid = objid; data.ioc_obdo1.o_mode = S_IFREG; data.ioc_obdo1.o_valid = 0xffffffff; memset(buf, 0, sizeof(rawbuf)); @@ -1840,14 +1902,15 @@ int jt_obd_test_getattr(int argc, char **argv) rc = l2_ioctl(OBD_DEV_ID, OBD_IOC_GETATTR, &data); shmem_bump(1); if (rc < 0) { - fprintf(stderr, "error: %s: #"LPD64" - %d:%s\n", - jt_cmdname(argv[0]), i, errno, strerror(rc = errno)); + fprintf(stderr, "error: %s: #%jd - %d:%s\n", + jt_cmdname(argv[0]), (uintmax_t)i, + errno, strerror(rc = errno)); break; } else { if (be_verbose (verbose, &next_time, i, &next_count, count)) - printf("%s: got attr #"LPD64"\n", - jt_cmdname(argv[0]), i); + printf("%s: got attr #%jd\n", + jt_cmdname(argv[0]), (uintmax_t)i); } } @@ -1861,9 +1924,9 @@ int jt_obd_test_getattr(int argc, char **argv) --i; if (verbose != 0) - printf("%s: "LPD64" attrs in %.3fs (%.3f attr/s): %s", - jt_cmdname(argv[0]), i, diff, i / diff, - ctime(&end.tv_sec)); + printf("%s: %jd attrs in %.3fs (%.3f attr/s): %s", + jt_cmdname(argv[0]), (uintmax_t) i, diff, + i / diff, ctime(&end.tv_sec)); } return rc; } @@ -2033,7 +2096,13 @@ int jt_obd_test_brw(int argc, char **argv) #endif ostid_set_seq_echo(&data.ioc_obdo1.o_oi); - ostid_set_id(&data.ioc_obdo1.o_oi, objid); + if (objid >= OBIF_MAX_OID) { + fprintf(stderr, "errr: %s: invalid objid '%llu'\n", + jt_cmdname(argv[0]), objid); + return -E2BIG; + } + + data.ioc_obdo1.o_oi.oi_fid.f_oid = objid; data.ioc_obdo1.o_mode = S_IFREG; data.ioc_obdo1.o_valid = OBD_MD_FLID | OBD_MD_FLTYPE | OBD_MD_FLMODE | OBD_MD_FLFLAGS | OBD_MD_FLGROUP; @@ -2046,9 +2115,10 @@ int jt_obd_test_brw(int argc, char **argv) next_time.tv_usec = start.tv_usec; if (verbose != 0) - printf("%s: %s "LPU64"x%d pages (obj "LPX64", off "LPU64"): %s", - jt_cmdname(argv[0]), write ? "writing" : "reading", count, - pages, objid, data.ioc_offset, ctime(&start.tv_sec)); + printf("%s: %s %jux%d pages (obj %#jx, off %ju): %s", + jt_cmdname(argv[0]), write ? "writing" : "reading", + (uintmax_t)count, pages, (uintmax_t) objid, + (uintmax_t)data.ioc_offset, ctime(&start.tv_sec)); cmd = write ? OBD_IOC_BRW_WRITE : OBD_IOC_BRW_READ; for (i = 1, next_count = verbose; i <= count && shmem_running(); i++) { @@ -2069,9 +2139,10 @@ int jt_obd_test_brw(int argc, char **argv) break; } else if (be_verbose(verbose, &next_time,i, &next_count,count)) { shmem_lock (); - printf("%s: %s number %d @ "LPD64":"LPU64" for %d\n", + printf("%s: %s number %d @ %jd:%ju for %d\n", jt_cmdname(argv[0]), write ? "write" : "read", i, - ostid_id(&data.ioc_obdo1.o_oi), data.ioc_offset, + (uintmax_t)ostid_id(&data.ioc_obdo1.o_oi), + (uintmax_t)data.ioc_offset, (int)(pages * getpagesize())); shmem_unlock (); } @@ -2205,10 +2276,10 @@ repeat: else printf("default_stripe_count: %u\n", desc.ld_default_stripe_count); - printf("default_stripe_size: "LPU64"\n", - desc.ld_default_stripe_size); - printf("default_stripe_offset: "LPU64"\n", - desc.ld_default_stripe_offset); + printf("default_stripe_size: %ju\n", + (uintmax_t)desc.ld_default_stripe_size); + printf("default_stripe_offset: %ju\n", + (uintmax_t)desc.ld_default_stripe_offset); printf("default_stripe_pattern: %u\n", desc.ld_pattern); printf("obd_count: %u\n", desc.ld_tgt_count); printf("OBDS:\tobdidx\t\tobdgen\t\t obduuid\n"); @@ -2405,33 +2476,71 @@ int jt_obd_mdc_lookup(int argc, char **argv) return rc; } -int jt_cfg_dump_log(int argc, char **argv) +int jt_lcfg_fork(int argc, char **argv) { - struct obd_ioctl_data data; - char rawbuf[MAX_IOC_BUFLEN], *buf = rawbuf; - int rc; + struct obd_ioctl_data data; + char rawbuf[MAX_IOC_BUFLEN], *buf = rawbuf; + int rc; - if (argc != 2) - return CMD_HELP; + if (argc != 3) + return CMD_HELP; - memset(&data, 0, sizeof(data)); - data.ioc_dev = cur_device; - data.ioc_inllen1 = strlen(argv[1]) + 1; - data.ioc_inlbuf1 = argv[1]; + memset(&data, 0, sizeof(data)); + data.ioc_dev = get_mgs_device(); + data.ioc_inllen1 = strlen(argv[1]) + 1; + data.ioc_inlbuf1 = argv[1]; + data.ioc_inllen2 = strlen(argv[2]) + 1; + data.ioc_inlbuf2 = argv[2]; - memset(buf, 0, sizeof(rawbuf)); - rc = obd_ioctl_pack(&data, &buf, sizeof(rawbuf)); - if (rc) { - fprintf(stderr, "error: %s: invalid ioctl\n", - jt_cmdname(argv[0])); - return rc; - } - rc = l_ioctl(OBD_DEV_ID, OBD_IOC_DUMP_LOG, buf); - if (rc < 0) - fprintf(stderr, "OBD_IOC_DUMP_LOG failed: %s\n", - strerror(errno)); + memset(buf, 0, sizeof(rawbuf)); + rc = obd_ioctl_pack(&data, &buf, sizeof(rawbuf)); + if (rc) { + fprintf(stderr, "error: %s: invalid ioctl\n", + jt_cmdname(argv[0])); + return rc; + } - return rc; + rc = l_ioctl(OBD_DEV_ID, OBD_IOC_LCFG_FORK, buf); + if (rc < 0) + fprintf(stderr, "error: %s: OBD_IOC_LCFG_FORK failed: %s\n", + jt_cmdname(argv[0]), strerror(errno)); + + return rc; +} + +int jt_lcfg_erase(int argc, char **argv) +{ + struct obd_ioctl_data data; + char rawbuf[MAX_IOC_BUFLEN], *buf = rawbuf; + int rc; + + if (argc == 3) { + if (strncmp(argv[2], "-q", strlen("-q")) != 0 && + strncmp(argv[2], "--quiet", strlen("--quiet")) != 0) + return CMD_HELP; + } else if (argc != 2) { + return CMD_HELP; + } + + memset(&data, 0, sizeof(data)); + data.ioc_dev = get_mgs_device(); + data.ioc_inllen1 = strlen(argv[1]) + 1; + data.ioc_inlbuf1 = argv[1]; + + memset(buf, 0, sizeof(rawbuf)); + rc = obd_ioctl_pack(&data, &buf, sizeof(rawbuf)); + if (rc) { + fprintf(stderr, "error: %s: invalid ioctl\n", + jt_cmdname(argv[0])); + return rc; + } + + rc = l_ioctl(OBD_DEV_ID, OBD_IOC_LCFG_ERASE, buf); + if (rc < 0) + fprintf(stderr, "error: %s: OBD_IOC_LCFG_ERASE failed: %s\n", + jt_cmdname(argv[0]), strerror(errno)); + + return rc; } int jt_llog_catlist(int argc, char **argv) @@ -2547,14 +2656,13 @@ static int llog_cancel_parse_optional(int argc, char **argv, struct obd_ioctl_data *data) { int cOpt; - const char *const short_options = "c:l:i:h"; - const struct option long_options[] = { - {"catalog", required_argument, NULL, 'c'}, - {"log_id", required_argument, NULL, 'l'}, - {"log_idx", required_argument, NULL, 'i'}, - {"help", no_argument, NULL, 'h'}, - {NULL, 0, NULL, 0} - }; + const char *const short_opts = "c:l:i:h"; + const struct option long_opts[] = { + { .val = 'c', .name = "catalog", .has_arg = required_argument }, + { .val = 'h', .name = "help", .has_arg = no_argument }, + { .val = 'i', .name = "log_idx", .has_arg = required_argument }, + { .val = 'l', .name = "log_id", .has_arg = required_argument }, + { .name = NULL } }; /* sanity check */ if (!data || argc <= 1) { @@ -2562,8 +2670,8 @@ static int llog_cancel_parse_optional(int argc, char **argv, } /*now process command line arguments*/ - while ((cOpt = getopt_long(argc, argv, short_options, - long_options, NULL)) != -1) { + while ((cOpt = getopt_long(argc, argv, short_opts, + long_opts, NULL)) != -1) { switch (cOpt) { case 'c': data->ioc_inllen1 = strlen(optarg) + 1; @@ -2740,208 +2848,6 @@ int jt_llog_remove(int argc, char **argv) return rc; } -/* attach a regular file to virtual block device. - * return vaule: - * -1: fatal error - * 1: error, it always means the command run failed - * 0: success - */ -static int jt_blockdev_run_process(const char *file, char *argv[]) -{ - pid_t pid; - int rc; - - pid = vfork(); - if (pid == 0) { /* child process */ - /* don't print error messages */ - close(1), close(2); - (void)execvp(file, argv); - exit(-1); - } else if (pid > 0) { - int status; - - rc = waitpid(pid, &status, 0); - if (rc < 0 || !WIFEXITED(status)) - return -1; - - return WEXITSTATUS(status); - } - - return -1; -} - -static int jt_blockdev_find_module(const char *module) -{ - FILE *fp; - int found = 0; - char buf[1024]; - char *ptr; - - fp = fopen("/proc/modules", "r"); - if (fp == NULL) - return -1; - - while (fgets(buf, 1024, fp) != NULL) { - ptr = strchr(buf, ' '); - if (ptr != NULL) - *ptr = 0; - if (strcmp(module, buf) == 0) { - found = 1; - break; - } - } - fclose(fp); - - return found; -} - -static int jt_blockdev_probe_module(const char *module) -{ - char buf[1024]; - char *argv[10]; - int c, rc; - - if (jt_blockdev_find_module(module) == 1) - return 0; - - /* run modprobe first */ - c = 0; - argv[c++] = "/sbin/modprobe"; - argv[c++] = "-q"; - argv[c++] = (char *)module; - argv[c++] = NULL; - rc = jt_blockdev_run_process("modprobe", argv); - if (rc != 1) - return rc; - - /* cannot find the module in default directory ... */ - sprintf(buf, "../llite/%s.ko", module); - c = 0; - argv[c++] = "/sbin/insmod"; - argv[c++] = buf; - argv[c++] = NULL; - rc = jt_blockdev_run_process("insmod", argv); - return rc ? -1 : 0; -} - -int jt_blockdev_attach(int argc, char **argv) -{ - int rc, fd; - struct stat st; - char *filename, *devname; - unsigned long dev; - - if (argc != 3) - return CMD_HELP; - - if (jt_blockdev_probe_module("llite_lloop") < 0) { - fprintf(stderr, "error: cannot find module llite_lloop.(k)o\n"); - return ENOENT; - } - - filename = argv[1]; - devname = argv[2]; - - fd = open(filename, O_RDWR); - if (fd < 0) { - fprintf(stderr, "file %s can't be opened(%s)\n\n", - filename, strerror(errno)); - return CMD_HELP; - } - - rc = ioctl(fd, LL_IOC_LLOOP_ATTACH, &dev); - if (rc < 0) { - rc = errno; - fprintf(stderr, "attach error(%s)\n", strerror(rc)); - goto out; - } - - rc = stat(devname, &st); - if (rc == 0 && (!S_ISBLK(st.st_mode) || st.st_rdev != dev)) { - rc = EEXIST; - } else if (rc < 0) { - if (errno == ENOENT && - !mknod(devname, S_IFBLK|S_IRUSR|S_IWUSR, dev)) - rc = 0; - else - rc = errno; - } - - if (rc) { - fprintf(stderr, "error: the file %s could be attached to block " - "device %X but creating %s failed: %s\n" - "now detaching the block device..", - filename, (int)dev, devname, strerror(rc)); - - (void)ioctl(fd, LL_IOC_LLOOP_DETACH_BYDEV, dev); - fprintf(stderr, "%s\n", strerror(errno)); - } -out: - close(fd); - return -rc; -} - -int jt_blockdev_detach(int argc, char **argv) -{ - char *filename; - int rc, fd; - - if (argc != 2) - return CMD_HELP; - - filename = argv[1]; - fd = open(filename, O_RDONLY); - if (fd < 0) { - fprintf(stderr, "cannot open file %s error %s\n", - filename, strerror(errno)); - return CMD_HELP; - } - - rc = ioctl(fd, LL_IOC_LLOOP_DETACH, 0); - if (rc < 0) { - rc = errno; - fprintf(stderr, "detach error(%s)\n", strerror(rc)); - } else { - (void)unlink(filename); - } - - close(fd); - return -rc; -} - -int jt_blockdev_info(int argc, char **argv) -{ - char *filename; - int rc, fd; - struct lu_fid fid; - - if (argc != 2) - return CMD_HELP; - - filename = argv[1]; - fd = open(filename, O_RDONLY); - if (fd < 0) { - fprintf(stderr, "cannot open file %s error: %s\n", - filename, strerror(errno)); - return CMD_HELP; - } - - rc = ioctl(fd, LL_IOC_LLOOP_INFO, &fid); - if (rc < 0) { - rc = errno; - fprintf(stderr, "error: %s\n", strerror(errno)); - goto out; - } - fprintf(stdout, "lloop device info: "); - if (fid_is_zero(&fid)) - fprintf(stdout, "Not attached\n"); - else - fprintf(stdout, "attached to inode "DFID"\n", PFID(&fid)); -out: - close(fd); - return -rc; -} - static void signal_server(int sig) { if (sig == SIGINT) { @@ -2992,7 +2898,9 @@ static int check_pool_cmd(enum lcfg_command_type cmd, switch (cmd) { case LCFG_POOL_NEW: { - LASSERT(ostname == NULL); + if (ostname != NULL) + return -EINVAL; + if (rc >= 0) { fprintf(stderr, "Pool %s.%s already exists\n", fsname, poolname); @@ -3001,7 +2909,9 @@ static int check_pool_cmd(enum lcfg_command_type cmd, return 0; } case LCFG_POOL_DEL: { - LASSERT(ostname == NULL); + if (ostname != NULL) + return -EINVAL; + if (rc == 1) { fprintf(stderr, "Pool %s.%s not empty, " "please remove all members\n", @@ -3209,9 +3119,11 @@ static int pool_cmd(enum lcfg_command_type cmd, if (ostname != NULL) lustre_cfg_bufs_set_string(&bufs, 2, ostname); - lcfg = lustre_cfg_new(cmd, &bufs); + + lcfg = malloc(lustre_cfg_len(bufs.lcfg_bufcount, bufs.lcfg_buflen)); if (lcfg == NULL) - return rc; + return -ENOMEM; + lustre_cfg_init(lcfg, cmd, &bufs); memset(&data, 0, sizeof(data)); rc = data.ioc_dev = get_mgs_device(); @@ -3228,13 +3140,14 @@ static int pool_cmd(enum lcfg_command_type cmd, if (rc) { fprintf(stderr, "error: %s: invalid ioctl\n", jt_cmdname(cmdname)); + free(lcfg); return rc; } rc = l_ioctl(OBD_DEV_ID, OBD_IOC_POOL, buf); out: if (rc) rc = -errno; - lustre_cfg_free(lcfg); + free(lcfg); return rc; } @@ -3274,9 +3187,10 @@ static int nodemap_cmd(enum lcfg_command_type cmd, void *ret_data, } va_end(ap); - lcfg = lustre_cfg_new(cmd, &bufs); + lcfg = malloc(lustre_cfg_len(bufs.lcfg_bufcount, bufs.lcfg_buflen)); if (lcfg == NULL) return -ENOMEM; + lustre_cfg_init(lcfg, cmd, &bufs); memset(&data, 0, sizeof(data)); rc = data.ioc_dev = get_mgs_device(); @@ -3308,12 +3222,13 @@ static int nodemap_cmd(enum lcfg_command_type cmd, void *ret_data, if (rc != 0) goto out; - memcpy(ret_data, data.ioc_pbuf1, data.ioc_plen1); - if (ret_data == NULL || sizeof(ret_data) != ret_size) - rc = -errno; + if (ret_size > data.ioc_plen1) + ret_size = data.ioc_plen1; + + memcpy(ret_data, data.ioc_pbuf1, ret_size); } out: - lustre_cfg_free(lcfg); + free(lcfg); return rc; } @@ -3523,28 +3438,15 @@ int jt_nodemap_add_range(int argc, char **argv) int rc = 0; int c; - static struct option long_options[] = { - { - .name = "name", - .has_arg = required_argument, - .flag = 0, - .val = 'n', - }, - { - .name = "range", - .has_arg = required_argument, - .flag = 0, - .val = 'r', - }, - { - NULL - } - }; + static struct option long_opts[] = { + { .val = 'n', .name = "name", .has_arg = required_argument }, + { .val = 'r', .name = "range", .has_arg = required_argument }, + { .name = NULL } }; INIT_LIST_HEAD(&nidlist); while ((c = getopt_long(argc, argv, "n:r:", - long_options, NULL)) != -1) { + long_opts, NULL)) != -1) { switch (c) { case 'n': nodemap_name = optarg; @@ -3680,14 +3582,67 @@ int jt_nodemap_del_range(int argc, char **argv) } /** - * modify a nodemap's behavior + * set a fileset on a nodemap * * \param argc number of args * \param argv[] variable string arguments * * --name nodemap name - * --property nodemap property to change - * admin, trusted, squash_uid, squash_gid) + * --fileset fileset name + * + * \retval 0 on success + */ +int jt_nodemap_set_fileset(int argc, char **argv) +{ + char *nodemap_name = NULL; + char *fileset_name = NULL; + int rc = 0; + int c; + + static struct option long_opts[] = { + { .val = 'f', .name = "fileset", .has_arg = required_argument }, + { .val = 'n', .name = "name", .has_arg = required_argument }, + { .name = NULL } }; + + while ((c = getopt_long(argc, argv, "n:f:", + long_opts, NULL)) != -1) { + switch (c) { + case 'n': + nodemap_name = optarg; + break; + case 'f': + fileset_name = optarg; + break; + } + } + + if (nodemap_name == NULL || fileset_name == NULL) { + fprintf(stderr, "usage: nodemap_set_fileset --name " + "--fileset \n"); + return -1; + } + + rc = nodemap_cmd(LCFG_NODEMAP_SET_FILESET, NULL, 0, argv[0], + nodemap_name, fileset_name, NULL); + if (rc != 0) { + errno = -rc; + fprintf(stderr, "error: %s: cannot set fileset '%s' on nodemap " + "'%s': rc = %d\n", + jt_cmdname(argv[0]), fileset_name, nodemap_name, rc); + } + + return rc; +} + +/** + * modify a nodemap's behavior + * + * \param argc number of args + * \param argv[] variable string arguments + * + * --name nodemap name + * --property nodemap property to change + * admin, trusted, squash_uid, squash_gid) * --value value to set property * * \retval 0 on success @@ -3743,8 +3698,8 @@ int jt_nodemap_modify(int argc, char **argv) if (nodemap_name == NULL || param == NULL || value == NULL) { fprintf(stderr, "usage: nodemap_modify --name " "--property --value \n"); - fprintf(stderr, "valid properties: admin trusted " - "squash_uid squash_gid\n"); + fprintf(stderr, "valid properties: admin trusted map_mode " + "squash_uid squash_gid deny_unknown\n"); return -1; } @@ -3752,10 +3707,14 @@ int jt_nodemap_modify(int argc, char **argv) cmd = LCFG_NODEMAP_ADMIN; } else if (strcmp("trusted", param) == 0) { cmd = LCFG_NODEMAP_TRUSTED; + } else if (strcmp("deny_unknown", param) == 0) { + cmd = LCFG_NODEMAP_DENY_UNKNOWN; } else if (strcmp("squash_uid", param) == 0) { cmd = LCFG_NODEMAP_SQUASH_UID; } else if (strcmp("squash_gid", param) == 0) { cmd = LCFG_NODEMAP_SQUASH_GID; + } else if (strcmp("map_mode", param) == 0) { + cmd = LCFG_NODEMAP_MAP_MODE; } else { fprintf(stderr, "error: %s: nodemap_modify invalid " "subcommand: %s\n", @@ -3961,14 +3920,16 @@ static int get_array_idx(char *rule, char *format, int **array) /* extract the 3 fields */ rc = sscanf(start, "%x-%x/%u", &lo, &hi, &step); switch (rc) { - case 0: { - return 0; - } - case 1: { - array_sz++; - *array = realloc(*array, array_sz * sizeof(int)); - if (*array == NULL) - return 0; + case 0: + goto err; + case 1: { + void *tmp; + + array_sz++; + tmp = realloc(*array, array_sz * sizeof(int)); + if (tmp == NULL) + goto err; + *array = tmp; (*array)[array_idx] = lo; array_idx++; break; @@ -3978,12 +3939,15 @@ static int get_array_idx(char *rule, char *format, int **array) /* do not break to share code with case 3: */ } case 3: { - if ((hi < lo) || (step == 0)) - return 0; - array_sz += (hi - lo) / step + 1; - *array = realloc(*array, sizeof(int) * array_sz); - if (*array == NULL) - return 0; + void *tmp; + + if ((hi < lo) || (step == 0)) + goto err; + array_sz += (hi - lo) / step + 1; + tmp = realloc(*array, array_sz * sizeof(int)); + if (tmp == NULL) + goto err; + *array = tmp; for (i = lo; i <= hi; i+=step, array_idx++) (*array)[array_idx] = i; break; @@ -3995,50 +3959,50 @@ static int get_array_idx(char *rule, char *format, int **array) } while (ptr != NULL); return array_sz; +err: + if (*array != NULL) { + free(*array); + *array = NULL; + } + return 0; } -static int extract_fsname_poolname(char *arg, char *fsname, char *poolname) +static int extract_fsname_poolname(const char *arg, char *fsname, + char *poolname) { - char *ptr; - int len; - int rc; + char *ptr; + int rc; - strcpy(fsname, arg); - ptr = strchr(fsname, '.'); - if (ptr == NULL) { - fprintf(stderr, ". is missing in %s\n", fsname); - rc = -EINVAL; - goto err; - } + strlcpy(fsname, arg, PATH_MAX + 1); + ptr = strchr(fsname, '.'); + if (ptr == NULL) { + fprintf(stderr, ". is missing in %s\n", fsname); + rc = -EINVAL; + goto err; + } - len = ptr - fsname; - if (len == 0) { - fprintf(stderr, "fsname is empty\n"); - rc = -EINVAL; - goto err; - } + if ((ptr - fsname) == 0) { + fprintf(stderr, "fsname is empty\n"); + rc = -EINVAL; + goto err; + } - len = strlen(ptr + 1); - if (len == 0) { - fprintf(stderr, "poolname is empty\n"); - rc = -EINVAL; - goto err; - } - if (len > LOV_MAXPOOLNAME) { - fprintf(stderr, - "poolname %s is too long (length is %d max is %d)\n", - ptr + 1, len, LOV_MAXPOOLNAME); - rc = -ENAMETOOLONG; - goto err; - } - strncpy(poolname, ptr + 1, LOV_MAXPOOLNAME); - poolname[LOV_MAXPOOLNAME] = '\0'; - *ptr = '\0'; - return 0; + *ptr = '\0'; + ++ptr; + + if (strlen(ptr) == 0) { + fprintf(stderr, "poolname is empty\n"); + rc = -EINVAL; + goto err; + } + + strncpy(poolname, ptr, LOV_MAXPOOLNAME); + poolname[LOV_MAXPOOLNAME] = '\0'; + return 0; err: - fprintf(stderr, "argument %s must be .\n", arg); - return rc; + fprintf(stderr, "argument %s must be .\n", arg); + return rc; } int jt_pool_cmd(int argc, char **argv) @@ -4176,6 +4140,236 @@ out: return rc; } +static const char *barrier_status2name(enum barrier_status status) +{ + switch (status) { + case BS_INIT: + return "init"; + case BS_FREEZING_P1: + return "freezing_p1"; + case BS_FREEZING_P2: + return "freezing_p2"; + case BS_FROZEN: + return "frozen"; + case BS_THAWING: + return "thawing"; + case BS_THAWED: + return "thawed"; + case BS_FAILED: + return "failed"; + case BS_EXPIRED: + return "expired"; + case BS_RESCAN: + return "rescan"; + default: + return "unknown"; + } +} + +int jt_barrier_freeze(int argc, char **argv) +{ + struct obd_ioctl_data data; + char rawbuf[MAX_IOC_BUFLEN], *buf = rawbuf; + struct barrier_ctl bc; + int rc; + + if (argc < 2 || argc > 3) + return CMD_HELP; + + memset(&data, 0, sizeof(data)); + rc = data.ioc_dev = get_mgs_device(); + if (rc < 0) + return rc; + + memset(&bc, 0, sizeof(bc)); + bc.bc_version = BARRIER_VERSION_V1; + bc.bc_cmd = BC_FREEZE; + if (argc == 3) + bc.bc_timeout = atoi(argv[2]); + if (bc.bc_timeout == 0) + bc.bc_timeout = BARRIER_TIMEOUT_DEFAULT; + + if (strlen(argv[1]) > 8) { + fprintf(stderr, "%s: fsname name %s is too long. " + "It should not exceed 8.\n", argv[0], argv[1]); + return -EINVAL; + } + + strncpy(bc.bc_name, argv[1], sizeof(bc.bc_name)); + data.ioc_inlbuf1 = (char *)&bc; + data.ioc_inllen1 = sizeof(bc); + memset(buf, 0, sizeof(rawbuf)); + rc = obd_ioctl_pack(&data, &buf, sizeof(rawbuf)); + if (rc) { + fprintf(stderr, "Fail to pack ioctl data: rc = %d.\n", rc); + return rc; + } + + rc = l_ioctl(OBD_DEV_ID, OBD_IOC_BARRIER, buf); + if (rc < 0) + fprintf(stderr, "Fail to freeze barrier for %s: %s\n", + argv[1], strerror(errno)); + + return rc; +} + +int jt_barrier_thaw(int argc, char **argv) +{ + struct obd_ioctl_data data; + char rawbuf[MAX_IOC_BUFLEN], *buf = rawbuf; + struct barrier_ctl bc; + int rc; + + if (argc != 2) + return CMD_HELP; + + memset(&data, 0, sizeof(data)); + rc = data.ioc_dev = get_mgs_device(); + if (rc < 0) + return rc; + + memset(&bc, 0, sizeof(bc)); + bc.bc_version = BARRIER_VERSION_V1; + bc.bc_cmd = BC_THAW; + + if (strlen(argv[1]) > 8) { + fprintf(stderr, "fsname name %s is too long. " + "It should not exceed 8.\n", argv[1]); + return -EINVAL; + } + + strncpy(bc.bc_name, argv[1], sizeof(bc.bc_name)); + data.ioc_inlbuf1 = (char *)&bc; + data.ioc_inllen1 = sizeof(bc); + memset(buf, 0, sizeof(rawbuf)); + rc = obd_ioctl_pack(&data, &buf, sizeof(rawbuf)); + if (rc) { + fprintf(stderr, "Fail to pack ioctl data: rc = %d.\n", rc); + return rc; + } + + rc = l_ioctl(OBD_DEV_ID, OBD_IOC_BARRIER, buf); + if (rc < 0) + fprintf(stderr, "Fail to thaw barrier for %s: %s\n", + argv[1], strerror(errno)); + + return rc; +} + +int __jt_barrier_stat(int argc, char **argv, struct barrier_ctl *bc) +{ + struct obd_ioctl_data data; + char rawbuf[MAX_IOC_BUFLEN], *buf = rawbuf; + int rc; + + memset(&data, 0, sizeof(data)); + rc = data.ioc_dev = get_mgs_device(); + if (rc < 0) + return rc; + + memset(bc, 0, sizeof(*bc)); + bc->bc_version = BARRIER_VERSION_V1; + bc->bc_cmd = BC_STAT; + strncpy(bc->bc_name, argv[1], sizeof(bc->bc_name)); + data.ioc_inlbuf1 = (char *)bc; + data.ioc_inllen1 = sizeof(*bc); + memset(buf, 0, sizeof(rawbuf)); + rc = obd_ioctl_pack(&data, &buf, sizeof(rawbuf)); + if (rc) { + fprintf(stderr, "Fail to pack ioctl data: rc = %d.\n", rc); + return rc; + } + + rc = l_ioctl(OBD_DEV_ID, OBD_IOC_BARRIER, buf); + if (rc < 0) + fprintf(stderr, "Fail to query barrier for %s: %s\n", + argv[1], strerror(errno)); + else + obd_ioctl_unpack(&data, buf, sizeof(rawbuf)); + + return rc; +} + +int jt_barrier_stat(int argc, char **argv) +{ + struct barrier_ctl bc; + int rc; + + if (argc != 2) + return CMD_HELP; + + if (strlen(argv[1]) > 8) { + fprintf(stderr, "fsname name %s is too long. " + "It should not exceed 8.\n", argv[1]); + return -EINVAL; + } + + rc = __jt_barrier_stat(argc, argv, &bc); + if (!rc) { + printf("The barrier for %s is in '%s'\n", + argv[1], barrier_status2name(bc.bc_status)); + if (bc.bc_status == BS_FREEZING_P1 || + bc.bc_status == BS_FREEZING_P2 || + bc.bc_status == BS_FROZEN) + printf("The barrier will be expired after %d " + "seconds\n", bc.bc_timeout); + } + + return rc; +} + +int jt_barrier_rescan(int argc, char **argv) +{ + struct obd_ioctl_data data; + char rawbuf[MAX_IOC_BUFLEN], *buf = rawbuf; + struct barrier_ctl bc; + int rc; + + if (argc < 2 || argc > 3) + return CMD_HELP; + + memset(&data, 0, sizeof(data)); + rc = data.ioc_dev = get_mgs_device(); + if (rc < 0) + return rc; + + memset(&bc, 0, sizeof(bc)); + bc.bc_version = BARRIER_VERSION_V1; + bc.bc_cmd = BC_RESCAN; + if (argc == 3) + bc.bc_timeout = atoi(argv[2]); + if (bc.bc_timeout == 0) + bc.bc_timeout = BARRIER_TIMEOUT_DEFAULT; + + if (strlen(argv[1]) > 8) { + fprintf(stderr, "fsname name %s is too long. " + "It should not exceed 8.\n", argv[1]); + return -EINVAL; + } + + strncpy(bc.bc_name, argv[1], sizeof(bc.bc_name)); + data.ioc_inlbuf1 = (char *)&bc; + data.ioc_inllen1 = sizeof(bc); + memset(buf, 0, sizeof(rawbuf)); + rc = obd_ioctl_pack(&data, &buf, sizeof(rawbuf)); + if (rc) { + fprintf(stderr, "Fail to pack ioctl data: rc = %d.\n", rc); + return rc; + } + + rc = l_ioctl(OBD_DEV_ID, OBD_IOC_BARRIER, buf); + if (rc < 0) { + fprintf(stderr, "Fail to rescan barrier bitmap for %s: %s\n", + argv[1], strerror(errno)); + } else { + obd_ioctl_unpack(&data, buf, sizeof(rawbuf)); + printf("%u of %u MDT(s) in the filesystem %s are inactive\n", + bc.bc_absence, bc.bc_total, argv[1]); + } + + return rc; +} + int jt_get_obj_version(int argc, char **argv) { struct lu_fid fid; @@ -4239,131 +4433,110 @@ int jt_get_obj_version(int argc, char **argv) } obd_ioctl_unpack(&data, buf, sizeof rawbuf); - printf(LPX64"\n", version); + printf("%#jx\n", (uintmax_t)version); return 0; } int jt_changelog_register(int argc, char **argv) { - char rawbuf[MAX_IOC_BUFLEN], *buf = rawbuf; - struct obd_ioctl_data data; - char devname[30]; - int rc; + struct obd_ioctl_data data = { 0 }; + char rawbuf[MAX_IOC_BUFLEN] = ""; + char *buf = rawbuf; + char *device = lcfg_get_devname(); + bool print_name_only = false; + int c; + int rc; - if (argc > 2) - return CMD_HELP; - else if (argc == 2 && strcmp(argv[1], "-n") != 0) - return CMD_HELP; - if (cur_device < 0) - return CMD_HELP; + if (argc > 2) + return CMD_HELP; - memset(&data, 0, sizeof(data)); - data.ioc_dev = cur_device; - memset(buf, 0, sizeof(rawbuf)); - rc = obd_ioctl_pack(&data, &buf, sizeof(rawbuf)); - if (rc) { - fprintf(stderr, "error: %s: invalid ioctl\n", - jt_cmdname(argv[0])); - return rc; - } + while ((c = getopt(argc, argv, "hn")) >= 0) { + switch (c) { + case 'n': + print_name_only = true; + break; + case 'h': + default: + return CMD_HELP; + } + } - rc = l2_ioctl(OBD_DEV_ID, OBD_IOC_CHANGELOG_REG, buf); - if (rc < 0) { - fprintf(stderr, "error: %s: %s\n", jt_cmdname(argv[0]), - strerror(rc = errno)); - return rc; - } - obd_ioctl_unpack(&data, buf, sizeof(rawbuf)); + if (cur_device < 0 || device == NULL) + return CMD_HELP; + + data.ioc_dev = cur_device; + + rc = obd_ioctl_pack(&data, &buf, sizeof(rawbuf)); + if (rc < 0) { + fprintf(stderr, "error: %s: cannot pack ioctl: %s\n", + jt_cmdname(argv[0]), strerror(-rc)); + return rc; + } + + rc = l2_ioctl(OBD_DEV_ID, OBD_IOC_CHANGELOG_REG, buf); + if (rc < 0) { + rc = -errno; + fprintf(stderr, "error: %s: %s\n", jt_cmdname(argv[0]), + strerror(-rc)); + return rc; + } + + obd_ioctl_unpack(&data, buf, sizeof(rawbuf)); if (data.ioc_u32_1 == 0) { fprintf(stderr, "received invalid userid!\n"); return -EPROTO; } - if (lcfg_get_devname() != NULL) { - if (strlen(lcfg_get_devname()) > sizeof(devname)-1) { - fprintf(stderr, "Dev name too long\n"); - return -E2BIG; - } - strncpy(devname, lcfg_get_devname(), sizeof(devname)); - } else { - if (snprintf(devname, sizeof(devname), "dev %d", cur_device) >= - sizeof(devname)) { - fprintf(stderr, "Dev name too long\n"); - return -E2BIG; - } - } + if (print_name_only) + printf("%s%u\n", CHANGELOG_USER_PREFIX, data.ioc_u32_1); + else + printf("%s: Registered changelog userid '%s%u'\n", + device, CHANGELOG_USER_PREFIX, data.ioc_u32_1); - if (argc == 2) - /* -n means bare name */ - printf(CHANGELOG_USER_PREFIX"%u\n", data.ioc_u32_1); - else - printf("%s: Registered changelog userid '"CHANGELOG_USER_PREFIX - "%u'\n", devname, data.ioc_u32_1); - return 0; + return 0; } int jt_changelog_deregister(int argc, char **argv) { - char rawbuf[MAX_IOC_BUFLEN], *buf = rawbuf; - struct obd_ioctl_data data; - char devname[30]; - int id, rc; - - if (argc != 2 || cur_device < 0) - return CMD_HELP; + struct obd_ioctl_data data = { 0 }; + char rawbuf[MAX_IOC_BUFLEN] = ""; + char *buf = rawbuf; + char *device = lcfg_get_devname(); + int id; + int rc; - id = strtol(argv[1] + strlen(CHANGELOG_USER_PREFIX), NULL, 10); - if ((id == 0) || (strncmp(argv[1], CHANGELOG_USER_PREFIX, - strlen(CHANGELOG_USER_PREFIX)) != 0)) { - fprintf(stderr, "expecting id of the form '" - CHANGELOG_USER_PREFIX"'; got '%s'\n", argv[1]); - return CMD_HELP; - } + if (argc != 2 || cur_device < 0 || device == NULL) + return CMD_HELP; - memset(&data, 0, sizeof(data)); - data.ioc_dev = cur_device; - data.ioc_u32_1 = id; - memset(buf, 0, sizeof(rawbuf)); - rc = obd_ioctl_pack(&data, &buf, sizeof(rawbuf)); - if (rc) { - fprintf(stderr, "error: %s: invalid ioctl\n", - jt_cmdname(argv[0])); - return rc; - } + rc = sscanf(argv[1], CHANGELOG_USER_PREFIX"%d", &id); + if (rc != 1 || id <= 0) { + fprintf(stderr, + "error: %s: expected id of the form %s got '%s'\n", + jt_cmdname(argv[0]), CHANGELOG_USER_PREFIX, argv[1]); + return CMD_HELP; + } - rc = l2_ioctl(OBD_DEV_ID, OBD_IOC_CHANGELOG_DEREG, buf); - if (rc < 0) { - fprintf(stderr, "error: %s: %s\n", jt_cmdname(argv[0]), - strerror(rc = errno)); - return rc; - } - obd_ioctl_unpack(&data, buf, sizeof(rawbuf)); + data.ioc_dev = cur_device; + data.ioc_u32_1 = id; - if (data.ioc_u32_1 != id) { - fprintf(stderr, "No changelog user '%s'. Blocking user" - " is '"CHANGELOG_USER_PREFIX"%d'.\n", argv[1], - data.ioc_u32_1); - return -ENOENT; + rc = obd_ioctl_pack(&data, &buf, sizeof(rawbuf)); + if (rc < 0) { + fprintf(stderr, "error: %s: invalid ioctl\n", + jt_cmdname(argv[0])); + return rc; } - if (lcfg_get_devname() != NULL) { - if (strlen(lcfg_get_devname()) > sizeof(devname)-1) { - fprintf(stderr, "Dev name too long\n"); - return -E2BIG; - } - strncpy(devname, lcfg_get_devname(), sizeof(devname)); - } else { - if (snprintf(devname, sizeof(devname), "dev %d", cur_device) >= - sizeof(devname)) { - fprintf(stderr, "Dev name too long\n"); - return -E2BIG; - } + rc = l2_ioctl(OBD_DEV_ID, OBD_IOC_CHANGELOG_DEREG, buf); + if (rc < 0) { + fprintf(stderr, "error: %s: %s\n", jt_cmdname(argv[0]), + strerror(rc = errno)); + return rc; } - printf("%s: Deregistered changelog user '"CHANGELOG_USER_PREFIX"%d'\n", - devname, data.ioc_u32_1); - return 0; -} - + obd_ioctl_unpack(&data, buf, sizeof(rawbuf)); + printf("%s: Deregistered changelog user '%s%u'\n", + device, CHANGELOG_USER_PREFIX, data.ioc_u32_1); + return 0; +}