X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Futils%2Fobd.c;h=a6ccd29ddbdc8e9bca343f131323a69e78c55772;hb=7312616768bfed768ecc00ba20322c37568138d0;hp=b4becb55a969710b1aa58fa0303987ddda7936be;hpb=753cd3b31d5cb06fe4233517a5460ec44d4eac48;p=fs%2Flustre-release.git diff --git a/lustre/utils/obd.c b/lustre/utils/obd.c index b4becb5..a6ccd29 100644 --- a/lustre/utils/obd.c +++ b/lustre/utils/obd.c @@ -40,6 +40,9 @@ #include #include #include +#include /* for IOC_LOV_SET_OSC_ACTIVE */ +#include /* for struct lov_stripe_md */ +#include #include #include @@ -75,9 +78,11 @@ uint64_t conn_addr = -1; uint64_t conn_cookie; char rawbuf[8192]; char *buf = rawbuf; -int max = 8192; +int max = sizeof(rawbuf); static int thread; +static struct lov_stripe_md saved_lsm; +static char lsm_valid = 0; static int getfd(char *func); static char *cmdname(char *func); @@ -95,25 +100,36 @@ do { \ } \ } while (0) +#define IOC_PACK(func, data) \ +do { \ + if (obd_ioctl_pack(&data, &buf, max)) { \ + fprintf(stderr, "error: %s: invalid ioctl\n", \ + cmdname(func)); \ + return -2; \ + } \ +} while (0) + +#define IOC_UNPACK(func, data) \ +do { \ + if (obd_ioctl_unpack(&data, buf, max)) { \ + fprintf(stderr, "error: %s: invalid reply\n", \ + cmdname(func)); \ + return -2; \ + } \ +} while (0) + char *obdo_print(struct obdo *obd) { char buf[1024]; - sprintf(buf, "id: %Ld\ngrp: %Ld\natime: %Ld\nmtime: %Ld\nctime: %Ld\n" - "size: %Ld\nblocks: %Ld\nblksize: %d\nmode: %o\nuid: %d\n" - "gid: %d\nflags: %x\nobdflags: %x\nnlink: %d,\nvalid %x\n", - obd->o_id, - obd->o_gr, - 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_obdflags, obd->o_nlink, obd->o_valid); + 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" + "obdflags: %x\nnlink: %d,\nvalid %x\n", + obd->o_id, obd->o_gr, 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_obdflags, + obd->o_nlink, obd->o_valid); return strdup(buf); } @@ -135,18 +151,14 @@ static int do_name2dev(char *func, char *name) data.ioc_inllen1 = strlen(name) + 1; data.ioc_inlbuf1 = name; - if (obd_ioctl_pack(&data, &buf, max)) { - fprintf(stderr, "error: %s: invalid ioctl\n", cmdname(func)); - return -2; - } + IOC_PACK(func, data); rc = ioctl(fd, OBD_IOC_NAME2DEV, buf); if (rc < 0) { fprintf(stderr, "error: %s: %s - %s\n", cmdname(func), name, strerror(rc = errno)); return rc; } - - memcpy((char *)(&data), buf, sizeof(data)); + IOC_UNPACK(func, data); return data.ioc_dev + N2D_OFF; } @@ -208,7 +220,7 @@ static int getfd(char *func) ((double)((a)->tv_usec - (b)->tv_usec) / 1000000)) static int be_verbose(int verbose, struct timeval *next_time, - int num, int *next_num, int num_total) + __u64 num, __u64 *next_num, int num_total) { struct timeval now; @@ -285,7 +297,7 @@ int do_disconnect(char *func, int verbose) OBD_IOC_DISCONNECT, strerror(errno)); } else { if (verbose) - printf("%s: disconnected conn %Lx\n", cmdname(func), + printf("%s: disconnected conn "LPX64"\n", cmdname(func), conn_addr); conn_addr = -1; } @@ -296,6 +308,7 @@ int do_disconnect(char *func, int verbose) #if SHMEM_STATS static void shmem_setup(void) { + /* Create new segment */ int shmid = shmget(IPC_PRIVATE, sizeof(counter_snapshot[0]), 0600); if (shmid == -1) { @@ -304,6 +317,7 @@ static void shmem_setup(void) return; } + /* Attatch to new segment */ shared_counters = (long long *)shmat(shmid, NULL, 0); if (shared_counters == (long long *)(-1)) { @@ -312,6 +326,14 @@ static void shmem_setup(void) shared_counters = NULL; return; } + + /* Mark segment as destroyed, so it will disappear when we exit. + * Forks will inherit attached segments, so we should be OK. + */ + if (shmctl(shmid, IPC_RMID, NULL) == -1) { + fprintf(stderr, "Can't destroy shared memory counters: %s\n", + strerror(errno)); + } } static inline void shmem_reset(void) @@ -391,11 +413,7 @@ static int do_device(char *func, int dev) if (getfd(func)) return -1; - if (obd_ioctl_pack(&data, &buf, max)) { - fprintf(stderr, "error: %s: invalid ioctl\n", cmdname(func)); - return -2; - } - + IOC_PACK(func, data); return ioctl(fd, OBD_IOC_DEVICE, buf); } @@ -483,7 +501,7 @@ int jt_opt_device(int argc, char **argv) int jt_opt_threads(int argc, char **argv) { - int threads, next_thread; + __u64 threads, next_thread; int verbose; int rc = 0; char *end; @@ -492,7 +510,7 @@ int jt_opt_threads(int argc, char **argv) if (argc < 5) return CMD_HELP; - threads = strtoul(argv[1], &end, 0); + threads = strtoull(argv[1], &end, 0); if (*end) { fprintf(stderr, "error: %s: invalid page count '%s'\n", cmdname(argv[0]), argv[1]); @@ -504,7 +522,7 @@ int jt_opt_threads(int argc, char **argv) return CMD_HELP; if (verbose != 0) - printf("%s: starting %d threads on device %s running %s\n", + printf("%s: starting "LPD64" threads on device %s running %s\n", argv[0], threads, argv[3], argv[4]); SHMEM_RESET(); @@ -573,18 +591,20 @@ int jt_opt_threads(int argc, char **argv) int jt_obd_detach(int argc, char **argv) { struct obd_ioctl_data data; + char force = 'F'; int rc; IOCINIT(data); - if (argc != 1) + if (argc != 1 && argc != 2) return CMD_HELP; - if (obd_ioctl_pack(&data, &buf, max)) { - fprintf(stderr, "error: %s: invalid ioctl\n", cmdname(argv[0])); - return -2; + if (argc == 2) { + data.ioc_inllen1 = 1; + data.ioc_inlbuf1 = &force; } + IOC_PACK(argv[0], data); rc = ioctl(fd, OBD_IOC_DETACH, buf); if (rc < 0) fprintf(stderr, "error: %s: %s\n", cmdname(argv[0]), @@ -635,10 +655,41 @@ int jt_obd_newdev(int argc, char **argv) return rc; } +int jt_get_version(int argc, char **argv) +{ + int rc; + char buf[8192]; + struct obd_ioctl_data *data = (struct obd_ioctl_data *)buf; + + if (getfd(argv[0])) + return -1; + + memset(buf, 0, sizeof(buf)); + data->ioc_version = OBD_IOCTL_VERSION; + data->ioc_addr = conn_addr; + data->ioc_cookie = conn_addr; + data->ioc_len = sizeof(buf); + data->ioc_inllen1 = sizeof(buf) - size_round(sizeof(*data)); + + if (argc != 1) + return CMD_HELP; + + rc = ioctl(fd, OBD_GET_VERSION, data); + if (rc < 0) + fprintf(stderr, "error: %s: %s\n", cmdname(argv[0]), + strerror(rc = errno)); + else { + printf("Lustre version: %s\n", data->ioc_bulk); + } + + printf("lctl version: %s\n",BUILD_VERSION); + return rc; +} + int jt_obd_list(int argc, char **argv) { int rc; - char buf[1024]; + char buf[8192]; struct obd_ioctl_data *data = (struct obd_ioctl_data *)buf; if (getfd(argv[0])) @@ -687,11 +738,7 @@ int jt_obd_attach(int argc, char **argv) data.ioc_inlbuf3 = argv[3]; } - if (obd_ioctl_pack(&data, &buf, max)) { - fprintf(stderr, "error: %s: invalid ioctl\n", cmdname(argv[0])); - return -2; - } - + IOC_PACK(argv[0], data); rc = ioctl(fd, OBD_IOC_ATTACH, buf); if (rc < 0) fprintf(stderr, "error: %s: %x %s\n", cmdname(argv[0]), @@ -752,10 +799,7 @@ int jt_obd_setup(int argc, char **argv) data.ioc_inlbuf2 = argv[2]; } - if (obd_ioctl_pack(&data, &buf, max)) { - fprintf(stderr, "error: %s: invalid ioctl\n", cmdname(argv[0])); - return -2; - } + IOC_PACK(argv[0], data); rc = ioctl(fd, OBD_IOC_SETUP, buf); if (rc < 0) fprintf(stderr, "error: %s: %s\n", cmdname(argv[0]), @@ -764,22 +808,22 @@ int jt_obd_setup(int argc, char **argv) return rc; } - +/* The ioctl API has been extended to provide the LOV stripe metadata to the + * caller when applicable. This utility, however, only saves the LSM for the + * latest CREATE. */ int jt_obd_create(int argc, char **argv) { struct obd_ioctl_data data; struct timeval next_time; - int count = 1, next_count; - int verbose = 1; - int mode = 0100644; - int rc = 0, i; + __u64 count = 1, next_count; + int verbose = 1, mode = 0100644, rc = 0, i; char *end; IOCINIT(data); if (argc < 2 || argc > 4) return CMD_HELP; - count = strtoul(argv[1], &end, 0); + count = strtoull(argv[1], &end, 0); if (*end) { fprintf(stderr, "error: %s: invalid iteration count '%s'\n", cmdname(argv[0]), argv[1]); @@ -793,6 +837,8 @@ int jt_obd_create(int argc, char **argv) cmdname(argv[0]), argv[2]); return CMD_HELP; } + if (!(mode & S_IFMT)) + mode |= S_IFREG; } if (argc > 3) { @@ -801,15 +847,26 @@ int jt_obd_create(int argc, char **argv) return CMD_HELP; } - printf("%s: %d objects\n", cmdname(argv[0]), count); + printf("%s: "LPD64" objects\n", cmdname(argv[0]), count); gettimeofday(&next_time, NULL); next_time.tv_sec -= verbose; for (i = 1, next_count = verbose; i <= count; i++) { data.ioc_obdo1.o_mode = mode; - data.ioc_obdo1.o_valid = OBD_MD_FLMODE; - - rc = ioctl(fd, OBD_IOC_CREATE, &data); + data.ioc_obdo1.o_id = i; + data.ioc_obdo1.o_uid = 0; + data.ioc_obdo1.o_gid = 0; + data.ioc_obdo1.o_valid = OBD_MD_FLTYPE | OBD_MD_FLMODE | + OBD_MD_FLID | OBD_MD_FLUID | OBD_MD_FLGID;; + + data.ioc_inllen1 = sizeof(saved_lsm); + data.ioc_inlbuf1 = (char *)&saved_lsm; + + IOC_PACK(argv[0], data); + rc = ioctl(fd, OBD_IOC_CREATE, buf); + IOC_UNPACK(argv[0], data); + fprintf(stderr, "lsm->lsm_o_id: "LPX64"\n", + saved_lsm.lsm_object_id); SHMEM_BUMP(); if (rc < 0) { fprintf(stderr, "error: %s: #%d - %s\n", @@ -823,9 +880,11 @@ int jt_obd_create(int argc, char **argv) break; } + lsm_valid = 1; + if (be_verbose(verbose, &next_time, i, &next_count, count)) - printf("%s: #%d is object id 0x%Lx\n", cmdname(argv[0]), - i, (long long)data.ioc_obdo1.o_id); + printf("%s: #%d is object id "LPX64"\n", + cmdname(argv[0]), i, data.ioc_obdo1.o_id); } return rc; } @@ -852,9 +911,15 @@ int jt_obd_setattr(int argc, char **argv) cmdname(argv[0]), argv[2]); return CMD_HELP; } - data.ioc_obdo1.o_valid = OBD_MD_FLID | OBD_MD_FLMODE; + data.ioc_obdo1.o_valid = OBD_MD_FLID | OBD_MD_FLTYPE | OBD_MD_FLMODE; - rc = ioctl(fd, OBD_IOC_SETATTR, &data); + if (lsm_valid == 1) { + data.ioc_inllen1 = sizeof(saved_lsm); + data.ioc_inlbuf1 = (char *)&saved_lsm; + } + + IOC_PACK(argv[0], data); + rc = ioctl(fd, OBD_IOC_SETATTR, buf); if (rc < 0) fprintf(stderr, "error: %s: %s\n", cmdname(argv[0]), strerror(rc = errno)); @@ -865,25 +930,66 @@ int jt_obd_setattr(int argc, char **argv) int jt_obd_destroy(int argc, char **argv) { struct obd_ioctl_data data; + struct timeval next_time; + __u64 count = 1, next_count; + int verbose = 1; + __u64 id; char *end; - int rc; + int rc = 0, i; IOCINIT(data); - if (argc != 2) + if (argc < 2 || argc > 4) return CMD_HELP; - data.ioc_obdo1.o_id = strtoull(argv[1], &end, 0); + id = strtoull(argv[1], &end, 0); if (*end) { fprintf(stderr, "error: %s: invalid objid '%s'\n", cmdname(argv[0]), argv[1]); return CMD_HELP; } - data.ioc_obdo1.o_mode = S_IFREG | 0644; + if (argc > 2) { + count = strtoull(argv[2], &end, 0); + if (*end) { + fprintf(stderr, + "error: %s: invalid iteration count '%s'\n", + cmdname(argv[0]), argv[2]); + return CMD_HELP; + } + } - rc = ioctl(fd, OBD_IOC_DESTROY, &data); - if (rc < 0) - fprintf(stderr, "error: %s: %s\n", cmdname(argv[0]), - strerror(rc = errno)); + if (argc > 3) { + verbose = get_verbose(argv[0], argv[3]); + if (verbose == BAD_VERBOSE) + return CMD_HELP; + } + + printf("%s: "LPD64" objects\n", cmdname(argv[0]), count); + gettimeofday(&next_time, NULL); + next_time.tv_sec -= verbose; + + for (i = 1, next_count = verbose; i <= count; i++, id++) { + data.ioc_obdo1.o_id = id; + data.ioc_obdo1.o_mode = S_IFREG | 0644; + data.ioc_obdo1.o_valid = OBD_MD_FLID | OBD_MD_FLMODE; + + data.ioc_inllen1 = sizeof(saved_lsm); + data.ioc_inlbuf1 = (char *)&saved_lsm; + + IOC_PACK(argv[0], data); + rc = ioctl(fd, OBD_IOC_DESTROY, buf); + IOC_UNPACK(argv[0], data); + SHMEM_BUMP(); + if (rc < 0) { + fprintf(stderr, "error: %s: objid "LPX64": %s\n", + cmdname(argv[0]), id, strerror(rc = errno)); + break; + } + lsm_valid = 0; + + if (be_verbose(verbose, &next_time, i, &next_count, count)) + printf("%s: #%d is object id "LPX64"\n", + cmdname(argv[0]), i, id); + } return rc; } @@ -907,14 +1013,21 @@ int jt_obd_getattr(int argc, char **argv) /* to help obd filter */ data.ioc_obdo1.o_mode = 0100644; data.ioc_obdo1.o_valid = 0xffffffff; - printf("%s: object id %Ld\n", cmdname(argv[0]), data.ioc_obdo1.o_id); + printf("%s: object id "LPX64"\n", cmdname(argv[0]),data.ioc_obdo1.o_id); + + if (lsm_valid == 1) { + data.ioc_inllen1 = sizeof(saved_lsm); + data.ioc_inlbuf1 = (char *)&saved_lsm; + } - rc = ioctl(fd, OBD_IOC_GETATTR, &data); + IOC_PACK(argv[0], data); + rc = ioctl(fd, OBD_IOC_GETATTR, buf); + IOC_UNPACK(argv[0], data); if (rc) { fprintf(stderr, "error: %s: %s\n", cmdname(argv[0]), strerror(rc = errno)); } else { - printf("%s: object id %Ld, mode %o\n", cmdname(argv[0]), + printf("%s: object id "LPX64", mode %o\n", cmdname(argv[0]), data.ioc_obdo1.o_id, data.ioc_obdo1.o_mode); } return rc; @@ -924,9 +1037,9 @@ int jt_obd_test_getattr(int argc, char **argv) { struct obd_ioctl_data data; struct timeval start, next_time; - int i, count, next_count; + __u64 i, count, next_count; int verbose = 1; - obd_id id = 3; + obd_id objid = 3; char *end; int rc = 0; @@ -934,7 +1047,7 @@ int jt_obd_test_getattr(int argc, char **argv) return CMD_HELP; IOCINIT(data); - count = strtoul(argv[1], &end, 0); + count = strtoull(argv[1], &end, 0); if (*end) { fprintf(stderr, "error: %s: invalid iteration count '%s'\n", cmdname(argv[0]), argv[1]); @@ -948,7 +1061,12 @@ int jt_obd_test_getattr(int argc, char **argv) } if (argc >= 4) { - id = strtoull(argv[3], &end, 0); + if (argv[3][0] == 't') { + objid = strtoull(argv[3] + 1, &end, 0); + if (thread) + objid += thread - 1; + } else + objid = strtoull(argv[3], &end, 0); if (*end) { fprintf(stderr, "error: %s: invalid objid '%s'\n", cmdname(argv[0]), argv[3]); @@ -960,23 +1078,24 @@ 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 %d attrs (testing only): %s", - cmdname(argv[0]), count, ctime(&start.tv_sec)); + printf("%s: getting "LPD64" attrs (objid "LPX64"): %s", + cmdname(argv[0]), count, objid, ctime(&start.tv_sec)); for (i = 1, next_count = verbose; i <= count; i++) { - data.ioc_obdo1.o_id = id; + data.ioc_obdo1.o_id = objid; + data.ioc_obdo1.o_mode = S_IFREG; data.ioc_obdo1.o_valid = 0xffffffff; rc = ioctl(fd, OBD_IOC_GETATTR, &data); SHMEM_BUMP(); if (rc < 0) { - fprintf(stderr, "error: %s: #%d - %s\n", + fprintf(stderr, "error: %s: #"LPD64" - %s\n", cmdname(argv[0]), i, strerror(rc = errno)); break; } else { if (be_verbose (verbose, &next_time, i, &next_count, count)) - printf("%s: got attr #%d\n", cmdname(argv[0]), - i); + printf("%s: got attr #"LPD64"\n", + cmdname(argv[0]), i); } } @@ -990,7 +1109,7 @@ int jt_obd_test_getattr(int argc, char **argv) --i; if (verbose != 0) - printf("%s: %d attrs in %.4gs (%.4g attr/s): %s", + printf("%s: "LPD64" attrs in %.4gs (%.4g attr/s): %s", cmdname(argv[0]), i, diff, (double)i / diff, ctime(&end.tv_sec)); } @@ -1001,10 +1120,12 @@ int jt_obd_test_brw(int argc, char **argv) { struct obd_ioctl_data data; struct timeval start, next_time; - int pages = 1, count, next_count; + int pages = 1; + __u64 count, next_count; __u64 objid = 3; int verbose = 1, write = 0, rw; char *end; + int thr_offset = 0; int i; int len; int rc = 0; @@ -1015,7 +1136,14 @@ int jt_obd_test_brw(int argc, char **argv) return CMD_HELP; } - count = strtoul(argv[1], &end, 0); + /* make each thread write to a different offset */ + if (argv[1][0] == 't') { + count = strtoull(argv[1] + 1, &end, 0); + if (thread) + thr_offset = thread - 1; + } else + count = strtoull(argv[1], &end, 0); + if (*end) { fprintf(stderr, "error: %s: bad iteration count '%s'\n", cmdname(argv[0]), argv[1]); @@ -1044,9 +1172,11 @@ int jt_obd_test_brw(int argc, char **argv) } } if (argc >= 6) { - if (argv[5][0] == 't') - objid = strtoull(argv[5] + 1, &end, 0) + thread; - else + if (argv[5][0] == 't') { + objid = strtoull(argv[5] + 1, &end, 0); + if (thread) + objid += thread - 1; + } else objid = strtoull(argv[5], &end, 0); if (*end) { fprintf(stderr, "error: %s: bad objid '%s'\n", @@ -1059,31 +1189,45 @@ int jt_obd_test_brw(int argc, char **argv) IOCINIT(data); data.ioc_obdo1.o_id = objid; + data.ioc_obdo1.o_mode = S_IFREG; + data.ioc_obdo1.o_valid = OBD_MD_FLID | OBD_MD_FLTYPE | OBD_MD_FLMODE; data.ioc_count = len; - data.ioc_offset = 0; + data.ioc_offset = thr_offset * len * count; + + if (lsm_valid == 1) { + data.ioc_inllen1 = sizeof(saved_lsm); + data.ioc_inlbuf1 = (char *)&saved_lsm; + } gettimeofday(&start, NULL); next_time.tv_sec = start.tv_sec - verbose; next_time.tv_usec = start.tv_usec; if (verbose != 0) - printf("%s: %s %dx%d pages (testing only): %s", - cmdname(argv[0]), write ? "writing" : "reading", - count, pages, ctime(&start.tv_sec)); + printf("%s: %s "LPU64"x%d pages (obj "LPX64", off "LPU64"): %s", + cmdname(argv[0]), write ? "writing" : "reading", count, + pages, objid, data.ioc_offset, ctime(&start.tv_sec)); + + IOC_PACK(argv[0], data); + rc = ioctl(fd, OBD_IOC_OPEN, buf); + IOC_UNPACK(argv[0], data); + if (rc) { + fprintf(stderr, "error: brw_open: %s\n", strerror(rc = errno)); + return rc; + } rw = write ? OBD_IOC_BRW_WRITE : OBD_IOC_BRW_READ; for (i = 1, next_count = verbose; i <= count; i++) { - rc = ioctl(fd, rw, &data); + rc = ioctl(fd, rw, buf); SHMEM_BUMP(); if (rc) { fprintf(stderr, "error: %s: #%d - %s on %s\n", cmdname(argv[0]), i, strerror(rc = errno), write ? "write" : "read"); break; - } else if (be_verbose - (verbose, &next_time, i, &next_count, count)) - printf("%s: %s number %d\n", cmdname(argv[0]), - write ? "write" : "read", i); + } else if (be_verbose(verbose, &next_time,i, &next_count,count)) + printf("%s: %s number %dx%d\n", cmdname(argv[0]), + write ? "write" : "read", i, pages); data.ioc_offset += len; } @@ -1103,15 +1247,22 @@ int jt_obd_test_brw(int argc, char **argv) i, pages, diff, (double)i * pages / diff, ctime(&end.tv_sec)); } + rw = ioctl(fd, OBD_IOC_CLOSE, buf); + if (rw) { + fprintf(stderr, "error: brw_close: %s\n", strerror(rw = errno)); + if (!rc) + rc = rw; + } + return rc; } -int jt_obd_lov_config(int argc, char **argv) +int jt_obd_lov_setconfig(int argc, char **argv) { struct obd_ioctl_data data; struct lov_desc desc; - uuid_t *uuidarray; - int rc, size, i; + obd_uuid_t *uuidarray, *ptr; + int rc, i; char *end; IOCINIT(data); @@ -1119,32 +1270,49 @@ int jt_obd_lov_config(int argc, char **argv) if (argc <= 6) return CMD_HELP; - if (strlen(argv[1]) > sizeof(*uuidarray) - 1) { - fprintf(stderr, "error: %s: no %dB memory for uuid's\n", - cmdname(argv[0]), strlen(argv[1])); - return -ENOMEM; + if (strlen(argv[1]) > sizeof(desc.ld_uuid) - 1) { + fprintf(stderr, + "error: %s: LOV uuid '%s' longer than %d characters\n", + cmdname(argv[0]), argv[1], sizeof(desc.ld_uuid) - 1); + return -EINVAL; } memset(&desc, 0, sizeof(desc)); - strncpy(desc.ld_uuid, argv[1], sizeof(*uuidarray) - 1); + strncpy(desc.ld_uuid, argv[1], sizeof(desc.ld_uuid) - 1); + desc.ld_tgt_count = argc - 6; desc.ld_default_stripe_count = strtoul(argv[2], &end, 0); if (*end) { fprintf(stderr, "error: %s: bad default stripe count '%s'\n", cmdname(argv[0]), argv[2]); return CMD_HELP; } - desc.ld_default_stripe_size = strtoul(argv[3], &end, 0); + if (desc.ld_default_stripe_count > desc.ld_tgt_count) { + fprintf(stderr, + "error: %s: default stripe count %u > OST count %u\n", + cmdname(argv[0]), desc.ld_default_stripe_count, + desc.ld_tgt_count); + return -EINVAL; + } + + desc.ld_default_stripe_size = strtoull(argv[3], &end, 0); if (*end) { fprintf(stderr, "error: %s: bad default stripe size '%s'\n", cmdname(argv[0]), argv[3]); return CMD_HELP; } if (desc.ld_default_stripe_size < 4096) { - fprintf(stderr, "error: %s: stripe size %ld too small\n", - cmdname(argv[0]), (long)desc.ld_default_stripe_size); + fprintf(stderr, + "error: %s: default stripe size "LPU64" too small\n", + cmdname(argv[0]), desc.ld_default_stripe_size); + return -EINVAL; + } else if ((long)desc.ld_default_stripe_size < + desc.ld_default_stripe_size) { + fprintf(stderr, + "error: %s: default stripe size "LPU64" too large\n", + cmdname(argv[0]), desc.ld_default_stripe_size); return -EINVAL; } - desc.ld_default_stripe_offset = (__u64) strtoul(argv[4], &end, 0); + desc.ld_default_stripe_offset = strtoull(argv[4], &end, 0); if (*end) { fprintf(stderr, "error: %s: bad default stripe offset '%s'\n", cmdname(argv[0]), argv[4]); @@ -1156,41 +1324,120 @@ int jt_obd_lov_config(int argc, char **argv) cmdname(argv[0]), argv[5]); return CMD_HELP; } - desc.ld_tgt_count = argc - 6; - size = desc.ld_tgt_count * sizeof(*uuidarray); - uuidarray = malloc(size); + /* NOTE: it is possible to overwrite the default striping parameters, + * but EXTREME care must be taken when saving the OST UUID list. + * It must be EXACTLY the same, or have only additions at the + * end of the list, or only overwrite individual OST entries + * that are restored from backups of the previous OST. + */ + uuidarray = calloc(desc.ld_tgt_count, sizeof(*uuidarray)); if (!uuidarray) { - fprintf(stderr, "error: %s: no %dB memory for uuid's\n", - cmdname(argv[0]), size); - return -ENOMEM; + fprintf(stderr, "error: %s: no memory for %d UUIDs\n", + cmdname(argv[0]), desc.ld_tgt_count); + rc = -ENOMEM; + goto out; } - memset(uuidarray, 0, size); - for (i = 6; i < argc; i++) { - char *buf = (char *)(uuidarray + i - 6); - if (strlen(argv[i]) >= sizeof(*uuidarray)) { + for (i = 6, ptr = uuidarray; i < argc; i++, ptr++) { + if (strlen(argv[i]) >= sizeof(*ptr)) { fprintf(stderr, "error: %s: arg %d (%s) too long\n", cmdname(argv[0]), i, argv[i]); - free(uuidarray); - return -EINVAL; + rc = -EINVAL; + goto out; } - strcpy(buf, argv[i]); + strcpy((char *)ptr, argv[i]); } data.ioc_inllen1 = sizeof(desc); data.ioc_inlbuf1 = (char *)&desc; - data.ioc_inllen2 = size; + data.ioc_inllen2 = desc.ld_tgt_count * sizeof(*uuidarray); data.ioc_inlbuf2 = (char *)uuidarray; if (obd_ioctl_pack(&data, &buf, max)) { fprintf(stderr, "error: %s: invalid ioctl\n", cmdname(argv[0])); + rc = -EINVAL; + goto out; + } + rc = ioctl(fd, OBD_IOC_LOV_SET_CONFIG, buf); + if (rc) + fprintf(stderr, "error: %s: ioctl error: %s\n", + cmdname(argv[0]), strerror(rc = errno)); +out: + free(uuidarray); + return rc; +} + +#define DEF_UUID_ARRAY_LEN (8192 / 40) + +int jt_obd_lov_getconfig(int argc, char **argv) +{ + struct obd_ioctl_data data; + struct lov_desc desc; + obd_uuid_t *uuidarray; + int rc; + + IOCINIT(data); + + if (argc != 2) + return CMD_HELP; + + if (strlen(argv[1]) > sizeof(desc.ld_uuid) - 1) { + fprintf(stderr, + "error: %s: LOV uuid '%s' longer than %d characters\n", + cmdname(argv[0]), argv[1], sizeof(desc.ld_uuid) - 1); return -EINVAL; } - rc = ioctl(fd, OBD_IOC_LOV_CONFIG, buf); - if (rc) - fprintf(stderr, "lov_config: error: %s: %s\n", + memset(&desc, 0, sizeof(desc)); + strncpy(desc.ld_uuid, argv[1], sizeof(desc.ld_uuid) - 1); + desc.ld_tgt_count = DEF_UUID_ARRAY_LEN; +repeat: + uuidarray = calloc(desc.ld_tgt_count, sizeof(*uuidarray)); + if (!uuidarray) { + fprintf(stderr, "error: %s: no memory for %d uuid's\n", + cmdname(argv[0]), desc.ld_tgt_count); + return -ENOMEM; + } + + data.ioc_inllen1 = sizeof(desc); + data.ioc_inlbuf1 = (char *)&desc; + data.ioc_inllen2 = desc.ld_tgt_count * sizeof(*uuidarray); + data.ioc_inlbuf2 = (char *)uuidarray; + + if (obd_ioctl_pack(&data, &buf, max)) { + fprintf(stderr, "error: %s: invalid ioctl\n", cmdname(argv[0])); + rc = -EINVAL; + goto out; + } + rc = ioctl(fd, OBD_IOC_LOV_GET_CONFIG, buf); + if (rc == -ENOSPC) { + free(uuidarray); + goto repeat; + } else if (rc) { + fprintf(stderr, "error: %s: ioctl error: %s\n", cmdname(argv[0]), strerror(rc = errno)); + } else { + obd_uuid_t *ptr; + int i; + + if (obd_ioctl_unpack(&data, buf, max)) { + fprintf(stderr, "error: %s: invalid reply\n", + cmdname(argv[0])); + rc = -EINVAL; + goto out; + } + 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_pattern: %u\n", desc.ld_pattern); + printf("obd_count: %u\n", desc.ld_tgt_count); + for (i = 0, ptr = uuidarray; i < desc.ld_tgt_count; i++, ptr++) + printf("%u: %s\n", i, (char *)ptr); + } +out: free(uuidarray); return rc; } @@ -1251,13 +1498,8 @@ int jt_obd_ldlm_regress_start(int argc, char **argv) data.ioc_inllen1 = strlen(argstring) + 1; } - if (obd_ioctl_pack(&data, &buf, max)) { - fprintf(stderr, "error: %s: invalid ioctl\n", cmdname(argv[0])); - return -2; - } - + IOC_PACK(argv[0], data); rc = ioctl(fd, IOC_LDLM_REGRESS_START, buf); - if (rc) fprintf(stderr, "error: %s: test failed: %s\n", cmdname(argv[0]), strerror(rc = errno)); @@ -1282,6 +1524,30 @@ int jt_obd_ldlm_regress_stop(int argc, char **argv) return rc; } +int jt_obd_lov_set_osc_active(int argc, char **argv) +{ + struct obd_ioctl_data data; + int rc; + + IOCINIT(data); + if (argc != 3) + return CMD_HELP; + + data.ioc_inlbuf1 = argv[1]; + data.ioc_inllen1 = strlen(argv[1]) + 1; + + /* reuse offset for 'active' */ + data.ioc_offset = atoi(argv[2]); + + IOC_PACK(argv[0], data); + rc = ioctl(fd, IOC_LOV_SET_OSC_ACTIVE, buf); + if (rc) + fprintf(stderr, "error: %s: failed: %s\n", + cmdname(argv[0]), strerror(rc = errno)); + + return rc; +} + int jt_obd_newconn(int argc, char **argv) { int rc; @@ -1299,11 +1565,7 @@ int jt_obd_newconn(int argc, char **argv) data.ioc_inlbuf2 = argv[2]; } - if (obd_ioctl_pack(&data, &buf, max)) { - fprintf(stderr, "error: %s: invalid ioctl\n", cmdname(argv[0])); - return -2; - } - + IOC_PACK(argv[0], data); rc = ioctl(fd, OBD_IOC_RECOVD_NEWCONN, buf); if (rc < 0) fprintf(stderr, "error: %s: %s\n", cmdname(argv[0]), @@ -1312,6 +1574,27 @@ int jt_obd_newconn(int argc, char **argv) return rc; } +int jt_obd_failconn(int argc, char **argv) +{ + int rc; + struct obd_ioctl_data data; + + IOCINIT(data); + if (argc < 2) + return CMD_HELP; + + data.ioc_inllen1 = strlen(argv[1]) + 1; + data.ioc_inlbuf1 = argv[1]; + + IOC_PACK(argv[0], data); + rc = ioctl(fd, OBD_IOC_RECOVD_FAILCONN, buf); + if (rc < 0) + fprintf(stderr, "error: %s: %s\n", cmdname(argv[0]), + strerror(rc = errno)); + + return rc; +} + static void signal_server(int sig) { if (sig == SIGINT) {