#include <stdarg.h>
#include <signal.h>
-#ifndef __KERNEL__
-#include <liblustre.h>
-#endif
-#include <linux/lustre_lib.h>
-#include <linux/lustre_idl.h>
-#include <linux/lustre_dlm.h>
+#include "obdctl.h"
+
#include <linux/obd.h> /* for struct lov_stripe_md */
-#include <linux/obd_lov.h> /* for IOC_LOV_SET_OSC_ACTIVE */
#include <linux/lustre_build_version.h>
#include <unistd.h>
#include <sys/un.h>
#include <time.h>
#include <sys/time.h>
-#include <netinet/in.h>
#include <errno.h>
#include <string.h>
#include <linux/list.h>
#undef __KERNEL__
-#include "obdctl.h"
#include <portals/ptlctl.h>
#include "parser.h"
#include <stdio.h>
struct timeval prev_time;
#endif
-uint64_t conn_addr = -1;
-uint64_t conn_cookie;
-char rawbuf[8192];
-char *buf = rawbuf;
-int max = sizeof(rawbuf);
+static int jt_recording;
+static uint64_t conn_cookie = -1;
+static char rawbuf[8192];
+static char *buf = rawbuf;
+static int max = sizeof(rawbuf);
static int thread;
struct lov_stripe_md lsm;
} lsm_buffer;
-static char *cmdname(char *func);
+static int l2_ioctl(int dev_id, int opc, void *buf)
+{
+// if (jt_recording) {
+// struct obd_ioctl_data *data = buf;
+// data->ioc_command = opc;
+// opc = OBD_IOC_DORECORD;
+// }
+ return l_ioctl(dev_id, opc, buf);
+}
#define IOC_INIT(data) \
do { \
memset(&data, 0, sizeof(data)); \
- data.ioc_addr = conn_addr; \
data.ioc_cookie = conn_cookie; \
} while (0)
memset(buf, 0, sizeof(rawbuf)); \
if (obd_ioctl_pack(&data, &buf, max)) { \
fprintf(stderr, "error: %s: invalid ioctl\n", \
- cmdname(func)); \
+ jt_cmdname(func)); \
return -2; \
} \
} while (0)
do { \
if (obd_ioctl_unpack(&data, buf, max)) { \
fprintf(stderr, "error: %s: invalid reply\n", \
- cmdname(func)); \
+ jt_cmdname(func)); \
return -2; \
} \
} while (0)
+int obd_record(enum cfg_record_type type, int len, void *ptr)
+{
+ struct obd_ioctl_data data;
+
+ IOC_INIT(data);
+ data.ioc_type = type;
+ data.ioc_plen1 = len;
+ data.ioc_pbuf1 = ptr;
+ IOC_PACK("obd_record", data);
+
+ return l_ioctl(OBD_DEV_ID, OBD_IOC_DORECORD, &data);
+}
+
+int lcfg_ioctl(char * func, int dev_id, struct lustre_cfg *lcfg)
+{
+ int opc;
+ char lcfg_rawbuf[8192];
+ char * lcfg_buf= lcfg_rawbuf;
+ struct obd_ioctl_data data;
+ int len;
+ int rc;
+
+ memset(lcfg_buf, 0, sizeof(lcfg_rawbuf));
+ if (lustre_cfg_pack(lcfg, &lcfg_buf, sizeof(lcfg_rawbuf), &len)) {
+ fprintf(stderr, "error: %s: invalid ioctl\n",
+ jt_cmdname(func));
+ return -2;
+ }
+
+ IOC_INIT(data);
+ data.ioc_type = LUSTRE_CFG_TYPE;
+ data.ioc_plen1 = len;
+ data.ioc_pbuf1 = lcfg_buf;
+ IOC_PACK(func, data);
+
+ if (jt_recording)
+ opc = OBD_IOC_DORECORD;
+ else
+ opc = OBD_IOC_PROCESS_CFG;
+
+ rc = l_ioctl(dev_id, opc, buf);
+ if (rc == 0)
+ rc = lustre_cfg_unpack(lcfg, lcfg_buf, sizeof(lcfg_rawbuf));
+
+ return rc;
+}
+
char *obdo_print(struct obdo *obd)
{
char buf[1024];
data.ioc_inlbuf1 = name;
IOC_PACK(func, data);
- rc = l_ioctl(OBD_DEV_ID, OBD_IOC_NAME2DEV, buf);
- if (rc < 0) {
- fprintf(stderr, "error: %s: %s - %s\n", cmdname(func),
- name, strerror(rc = errno));
- return rc;
- }
+ rc = l2_ioctl(OBD_DEV_ID, OBD_IOC_NAME2DEV, buf);
+ if (rc < 0)
+ return errno;
IOC_UNPACK(func, data);
return data.ioc_dev + N2D_OFF;
/*
* resolve a device name to a device number.
- * supports a number or name.
- * FIXME: support UUID
+ * supports a number, $name or %uuid.
*/
-static int parse_devname(char *func, char *name)
+int parse_devname(char *func, char *name)
{
int rc;
int ret = -1;
if (!name)
return ret;
- if (name[0] == '$') {
- rc = do_name2dev(func, name + 1);
+ if (name[0] == '$' || name[0] == '%') {
+ name++;
+ rc = do_name2dev(func, name);
if (rc >= N2D_OFF) {
ret = rc - N2D_OFF;
- printf("%s is device %d\n", name, ret);
+ printf("Name %s is device %d\n", name, ret);
} else {
- fprintf(stderr, "error: %s: %s: %s\n", cmdname(func),
- name, "device not found");
+ printf("No device found for name %s: %s\n",
+ name, strerror(rc));
}
- } else
+ } else {
+ /* Assume it's a number. This means that bogus strings become
+ * 0. I might care about that some day. */
ret = strtoul(name, NULL, 0);
+ printf("Selected device %d\n", ret);
+ }
return ret;
}
space -= nob;
if (lsm->lsm_stripe_count != 0) {
- nob = snprintf (p, space, "=%u#%u@%d",
+ nob = snprintf (p, space, "=%u#%u",
lsm->lsm_stripe_size,
- lsm->lsm_stripe_count,
- lsm->lsm_stripe_offset);
+ lsm->lsm_stripe_count);
p += nob;
space -= nob;
for (i = 0; i < lsm->lsm_stripe_count; i++) {
- nob = snprintf (p, space, ":"LPX64,
+ nob = snprintf (p, space, "@%u:"LPX64,
+ lsm->lsm_oinfo[i].loi_ost_idx,
lsm->lsm_oinfo[i].loi_id);
p += nob;
space -= nob;
int i;
/*
- * object_id[=size#count[@offset][:id]*]
+ * object_id[=size#count[@offset:id]*]
*/
reset_lsmb (lsmb);
return (-1);
string = end;
- if (*string == '@') {
- string++;
- lsm->lsm_stripe_offset = strtol (string, &end, 0);
- if (end == string)
- return (-1);
- string = end;
- }
-
if (*string == 0) /* don't have to specify obj ids */
return (0);
for (i = 0; i < lsm->lsm_stripe_count; i++) {
- if (*string != ':')
+ if (*string != '@')
return (-1);
string++;
- lsm->lsm_oinfo[i].loi_id = strtoull (string, &end, 0);
+ lsm->lsm_oinfo[i].loi_ost_idx = strtoul(string, &end, 0);
+ if (*end != ':')
+ return (-1);
+ string = end + 1;
+ lsm->lsm_oinfo[i].loi_id = strtoull(string, &end, 0);
string = end;
}
return (0);
}
-static char *cmdname(char *func)
+char *jt_cmdname(char *func)
{
static char buf[512];
return func;
}
-#define difftime(a, b) \
- ((double)(a)->tv_sec - (b)->tv_sec + \
- ((double)((a)->tv_usec - (b)->tv_usec) / 1000000))
+#define difftime(a, b) \
+ ((a)->tv_sec - (b)->tv_sec + \
+ ((a)->tv_usec - (b)->tv_usec) / 1000000.0)
static int be_verbose(int verbose, struct timeval *next_time,
__u64 num, __u64 *next_num, int num_total)
}
/* A negative verbosity means to print at most each X seconds */
- if (verbose < 0 && next_time != NULL && difftime(&now, next_time) >= 0){
+ if (verbose < 0 && next_time != NULL &&
+ difftime(&now, next_time) >= 0.0){
next_time->tv_sec = now.tv_sec - verbose;
next_time->tv_usec = now.tv_usec;
if (next_num)
verbose = (int)strtoul(arg, &end, 0);
if (*end) {
fprintf(stderr, "error: %s: bad verbose option '%s'\n",
- cmdname(func), arg);
+ jt_cmdname(func), arg);
return BAD_VERBOSE;
}
}
int do_disconnect(char *func, int verbose)
{
- int rc;
- struct obd_ioctl_data data;
-
- if (conn_addr == -1)
- return 0;
-
- IOC_INIT(data);
-
- IOC_PACK(func, data);
- rc = l_ioctl(OBD_DEV_ID, OBD_IOC_DISCONNECT, buf);
- if (rc < 0) {
- fprintf(stderr, "error: %s: OPD_IOC_DISCONNECT %s\n",
- cmdname(func),strerror(errno));
- } else {
- if (verbose)
- printf("%s: disconnected conn "LPX64"\n", cmdname(func),
- conn_addr);
- conn_addr = -1;
- }
-
- return rc;
+ return 0;
}
#if SHMEM_STATS
data.ioc_dev = dev;
IOC_PACK(func, data);
- return l_ioctl(OBD_DEV_ID, OBD_IOC_DEVICE, buf);
+ return l2_ioctl(OBD_DEV_ID, OBD_IOC_DEVICE, buf);
}
int jt_obd_device(int argc, char **argv)
rc = do_device(argv[0], dev);
if (rc < 0)
- fprintf(stderr, "error: %s: %s\n", cmdname(argv[0]),
+ fprintf(stderr, "error: %s: %s\n", jt_cmdname(argv[0]),
strerror(rc = errno));
return rc;
return CMD_HELP;
IOC_PACK(argv[0], data);
- rc = l_ioctl(OBD_DEV_ID, OBD_IOC_CONNECT, buf);
+ rc = l2_ioctl(OBD_DEV_ID, OBD_IOC_CONNECT, buf);
IOC_UNPACK(argv[0], data);
if (rc < 0)
fprintf(stderr, "error: %s: OBD_IOC_CONNECT %s\n",
- cmdname(argv[0]), strerror(rc = errno));
- else {
- conn_addr = data.ioc_addr;
+ jt_cmdname(argv[0]), strerror(rc = errno));
+ else
conn_cookie = data.ioc_cookie;
- }
return rc;
}
if (argc != 1)
return CMD_HELP;
- if (conn_addr == -1)
+ if (conn_cookie == -1)
return 0;
return do_disconnect(argv[0], 0);
threads = strtoull(argv[1], &end, 0);
if (*end) {
fprintf(stderr, "error: %s: invalid page count '%s'\n",
- cmdname(argv[0]), argv[1]);
+ jt_cmdname(argv[0]), argv[1]);
return CMD_HELP;
}
return rc;
}
-int jt_obd_detach(int argc, char **argv)
-{
- struct obd_ioctl_data data;
- int rc;
-
- IOC_INIT(data);
-
- if (argc != 1)
- return CMD_HELP;
-
- IOC_PACK(argv[0], data);
- rc = l_ioctl(OBD_DEV_ID, OBD_IOC_DETACH, buf);
- if (rc < 0)
- fprintf(stderr, "error: %s: %s\n", cmdname(argv[0]),
- strerror(rc = errno));
-
- return rc;
-}
-
-int jt_obd_cleanup(int argc, char **argv)
+int jt_opt_net(int argc, char **argv)
{
- struct obd_ioctl_data data;
- char force = 'F';
+ char *arg2[3];
int rc;
- IOC_INIT(data);
-
- if (argc != 1 && argc != 2)
+ if (argc < 3)
return CMD_HELP;
- if (argc == 2) {
- if (strcmp(argv[1], "force"))
- return CMD_HELP;
- data.ioc_inllen1 = 1;
- data.ioc_inlbuf1 = &force;
- }
+ arg2[0] = argv[0];
+ arg2[1] = argv[1];
+ arg2[2] = NULL;
+ rc = jt_ptl_network (2, arg2);
- IOC_PACK(argv[0], data);
- rc = l_ioctl(OBD_DEV_ID, OBD_IOC_CLEANUP, buf);
- if (rc < 0)
- fprintf(stderr, "error: %s: %s\n", cmdname(argv[0]),
- strerror(rc = errno));
+ if (!rc)
+ rc = Parser_execarg(argc - 2, argv + 2, cmdlist);
return rc;
}
return CMD_HELP;
IOC_PACK(argv[0], data);
- rc = l_ioctl(OBD_DEV_ID, OBD_IOC_NO_TRANSNO, buf);
+ rc = l2_ioctl(OBD_DEV_ID, OBD_IOC_NO_TRANSNO, buf);
if (rc < 0)
- fprintf(stderr, "error: %s: %s\n", cmdname(argv[0]),
+ fprintf(stderr, "error: %s: %s\n", jt_cmdname(argv[0]),
strerror(rc = errno));
return rc;
return CMD_HELP;
IOC_PACK(argv[0], data);
- rc = l_ioctl(OBD_DEV_ID, OBD_IOC_SET_READONLY, buf);
+ rc = l2_ioctl(OBD_DEV_ID, OBD_IOC_SET_READONLY, buf);
if (rc < 0)
- fprintf(stderr, "error: %s: %s\n", cmdname(argv[0]),
+ fprintf(stderr, "error: %s: %s\n", jt_cmdname(argv[0]),
strerror(rc = errno));
return rc;
}
-int jt_obd_newdev(int argc, char **argv)
+int jt_obd_abort_recovery(int argc, char **argv)
{
- int rc;
struct obd_ioctl_data data;
+ int rc;
IOC_INIT(data);
return CMD_HELP;
IOC_PACK(argv[0], data);
- rc = l_ioctl(OBD_DEV_ID, OBD_IOC_NEWDEV, buf);
+ rc = l2_ioctl(OBD_DEV_ID, OBD_IOC_ABORT_RECOVERY, buf);
if (rc < 0)
- fprintf(stderr, "error: %s: %s\n", cmdname(argv[0]),
+ fprintf(stderr, "error: %s: %s\n", jt_cmdname(argv[0]),
strerror(rc = errno));
- else {
- IOC_UNPACK(argv[0], data);
- printf("Current device set to %d\n", data.ioc_dev);
- }
return rc;
}
memset(buf, 0, sizeof(buf));
data->ioc_version = OBD_IOCTL_VERSION;
- data->ioc_addr = conn_addr;
- data->ioc_cookie = conn_addr;
+ data->ioc_cookie = conn_cookie;
data->ioc_inllen1 = sizeof(buf) - size_round(sizeof(*data));
data->ioc_len = obd_ioctl_packlen(data);
- rc = l_ioctl(OBD_DEV_ID, OBD_GET_VERSION, buf);
+ rc = l2_ioctl(OBD_DEV_ID, OBD_GET_VERSION, buf);
if (rc < 0)
- fprintf(stderr, "error: %s: %s\n", cmdname(argv[0]),
+ fprintf(stderr, "error: %s: %s\n", jt_cmdname(argv[0]),
strerror(rc = errno));
else {
printf("Lustre version: %s\n", data->ioc_bulk);
int jt_obd_list(int argc, char **argv)
{
int rc;
- char buf[8192];
+ char buf[OBD_MAX_IOCTL_BUFFER];
struct obd_ioctl_data *data = (struct obd_ioctl_data *)buf;
if (argc != 1)
memset(buf, 0, sizeof(buf));
data->ioc_version = OBD_IOCTL_VERSION;
- data->ioc_addr = conn_addr;
- data->ioc_cookie = conn_addr;
+ data->ioc_cookie = conn_cookie;
data->ioc_inllen1 = sizeof(buf) - size_round(sizeof(*data));
data->ioc_len = obd_ioctl_packlen(data);
- rc = l_ioctl(OBD_DEV_ID, OBD_IOC_LIST, data);
+ rc = l2_ioctl(OBD_DEV_ID, OBD_IOC_LIST, data);
if (rc < 0)
- fprintf(stderr, "error: %s: %s\n", cmdname(argv[0]),
+ fprintf(stderr, "error: %s: %s\n", jt_cmdname(argv[0]),
strerror(rc = errno));
else {
printf("%s", data->ioc_bulk);
return rc;
}
-int jt_obd_attach(int argc, char **argv)
-{
- struct obd_ioctl_data data;
- int rc;
-
- IOC_INIT(data);
-
- if (argc != 2 && argc != 3 && argc != 4)
- return CMD_HELP;
-
- data.ioc_inllen1 = strlen(argv[1]) + 1;
- data.ioc_inlbuf1 = argv[1];
- if (argc >= 3) {
- data.ioc_inllen2 = strlen(argv[2]) + 1;
- data.ioc_inlbuf2 = argv[2];
- }
-
- if (argc == 4) {
- data.ioc_inllen3 = strlen(argv[3]) + 1;
- data.ioc_inlbuf3 = argv[3];
- }
-
- IOC_PACK(argv[0], data);
- rc = l_ioctl(OBD_DEV_ID, OBD_IOC_ATTACH, buf);
- if (rc < 0)
- fprintf(stderr, "error: %s: OBD_IOC_ATTACH %s\n",
- cmdname(argv[0]), strerror(rc = errno));
- else if (argc == 3) {
- char name[1024];
- if (strlen(argv[2]) > 128) {
- printf("Name too long to set environment\n");
- return -EINVAL;
- }
- snprintf(name, 512, "LUSTRE_DEV_%s", argv[2]);
- rc = setenv(name, argv[1], 1);
- if (rc) {
- printf("error setting env variable %s\n", name);
- }
- }
-
- return rc;
-}
-
-int jt_obd_name2dev(int argc, char **argv)
-{
- int rc;
-
- if (argc != 2)
- return CMD_HELP;
-
- rc = do_name2dev(argv[0], argv[1]);
- if (rc >= N2D_OFF) {
- int dev = rc - N2D_OFF;
- rc = do_device(argv[0], dev);
- if (rc == 0)
- printf("%d\n", dev);
- }
- return rc;
-}
-
-int jt_obd_setup(int argc, char **argv)
-{
- struct obd_ioctl_data data;
- int rc;
-
- IOC_INIT(data);
-
- if (argc > 4)
- return CMD_HELP;
-
- data.ioc_dev = -1;
- if (argc > 1) {
- data.ioc_dev = parse_devname(argv[0], argv[1]);
- if (data.ioc_dev < 0)
- return -1;
- data.ioc_inllen1 = strlen(argv[1]) + 1;
- data.ioc_inlbuf1 = argv[1];
- }
- if (argc > 2) {
- data.ioc_inllen2 = strlen(argv[2]) + 1;
- data.ioc_inlbuf2 = argv[2];
- }
- if (argc > 3) {
- data.ioc_inllen3 = strlen(argv[3]) + 1;
- data.ioc_inlbuf3 = argv[3];
- }
-
- IOC_PACK(argv[0], data);
- rc = l_ioctl(OBD_DEV_ID, OBD_IOC_SETUP, buf);
- if (rc < 0)
- fprintf(stderr, "error: %s: %s\n", cmdname(argv[0]),
- strerror(rc = errno));
-
- return rc;
-}
-
/* Get echo client's stripe meta-data for the given object
*/
int jt_obd_get_stripe (int argc, char **argv)
id = strtoull (argv[1], &end, 0);
if (*end) {
fprintf (stderr, "Error: %s: invalid object id '%s'\n",
- cmdname (argv[0]), argv[1]);
+ jt_cmdname (argv[0]), argv[1]);
return (CMD_HELP);
}
data.ioc_plen1 = sizeof (lsm_buffer);
IOC_PACK(argv[0], data);
- rc = l_ioctl(OBD_DEV_ID, ECHO_IOC_GET_STRIPE, buf);
+ rc = l2_ioctl(OBD_DEV_ID, ECHO_IOC_GET_STRIPE, buf);
IOC_UNPACK(argv[0], data);
if (rc != 0) {
fprintf (stderr, "Error: %s: rc %d(%s)\n",
- cmdname (argv[0]), rc, strerror (errno));
+ jt_cmdname (argv[0]), rc, strerror (errno));
return (rc);
}
rc = parse_lsm (&lsm_buffer, argv[1]);
if (rc != 0) {
fprintf (stderr, "error: %s: invalid object '%s'\n",
- cmdname (argv[0]), argv[1]);
+ jt_cmdname (argv[0]), argv[1]);
return CMD_HELP;
}
count = strtol (argv[2], &end, 0);
if (*end != 0) {
fprintf (stderr, "error: %s: invalid count '%s'\n",
- cmdname (argv[0]), argv[1]);
+ jt_cmdname (argv[0]), argv[1]);
return CMD_HELP;
}
}
data.ioc_plen1 = sizeof (lsm_buffer);
IOC_PACK (argv[0], data);
- rc = l_ioctl (OBD_DEV_ID, ECHO_IOC_SET_STRIPE, buf);
+ rc = l2_ioctl (OBD_DEV_ID, ECHO_IOC_SET_STRIPE, buf);
IOC_UNPACK (argv[0], data);
if (rc != 0) {
fprintf (stderr, "Error: %s: rc %d(%s)\n",
- cmdname (argv[0]), rc, strerror (errno));
+ jt_cmdname (argv[0]), rc, strerror (errno));
return (rc);
}
}
if (argc != 2)
return CMD_HELP;
- id = strtoll (argv[1], &end, 0);
- if (*end == 0) {
+ id = strtoull (argv[1], &end, 0);
+ if (*end != 0) {
fprintf (stderr, "error: %s: invalid object id '%s'\n",
- cmdname (argv[0]), argv[1]);
+ jt_cmdname (argv[0]), argv[1]);
return CMD_HELP;
}
IOC_INIT (data);
- data.ioc_obdo1.o_id = lsm_buffer.lsm.lsm_object_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;
IOC_PACK (argv[0], data);
- rc = l_ioctl (OBD_DEV_ID, ECHO_IOC_SET_STRIPE, buf);
+ rc = l2_ioctl (OBD_DEV_ID, ECHO_IOC_SET_STRIPE, buf);
IOC_UNPACK (argv[0], data);
if (rc != 0)
fprintf (stderr, "Error: %s: rc %d(%s)\n",
- cmdname (argv[0]), rc, strerror (errno));
+ jt_cmdname (argv[0]), rc, strerror (errno));
return (0);
}
-/* Create one or more objects, arg[1] may describe stripe meta-data. If
- * not, defaults assumed. This echo-client instances stashes the stripe
+/* Create one or more objects, arg[4] may describe stripe meta-data. If
+ * not, defaults assumed. This echo-client instance stashes the stripe
* object ids. Use get_stripe on this node to print full lsm and
* set_stripe on another node to cut/paste between nodes.
*/
int jt_obd_create(int argc, char **argv)
{
- static __u64 base_id = 1;
-
struct obd_ioctl_data data;
struct timeval next_time;
- __u64 count = 1, next_count;
- int verbose = 1, mode = 0100644, rc = 0, i;
+ __u64 count = 1, next_count, base_id = 0;
+ int verbose = 1, mode = 0100644, rc = 0, i, valid_lsm = 0;
char *end;
IOC_INIT(data);
count = strtoull(argv[1], &end, 0);
if (*end) {
fprintf(stderr, "error: %s: invalid iteration count '%s'\n",
- cmdname(argv[0]), argv[1]);
+ jt_cmdname(argv[0]), argv[1]);
return CMD_HELP;
}
mode = strtoul(argv[2], &end, 0);
if (*end) {
fprintf(stderr, "error: %s: invalid mode '%s'\n",
- cmdname(argv[0]), argv[2]);
+ jt_cmdname(argv[0]), argv[2]);
return CMD_HELP;
}
if (!(mode & S_IFMT))
rc = parse_lsm (&lsm_buffer, argv[4]);
if (rc != 0) {
fprintf(stderr, "error: %s: invalid lsm '%s'\n",
- cmdname(argv[0]), argv[4]);
+ jt_cmdname(argv[0]), argv[4]);
return CMD_HELP;
}
base_id = lsm_buffer.lsm.lsm_object_id;
+ valid_lsm = 1;
}
- printf("%s: "LPD64" objects\n", cmdname(argv[0]), count);
+ printf("%s: "LPD64" objects\n", jt_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_id = base_id++;
+ data.ioc_obdo1.o_id = base_id;
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;
+ OBD_MD_FLID | OBD_MD_FLUID | OBD_MD_FLGID;
- data.ioc_plen1 = sizeof (lsm_buffer);
- data.ioc_pbuf1 = (char *)&lsm_buffer;
+ if (valid_lsm) {
+ data.ioc_plen1 = sizeof lsm_buffer;
+ data.ioc_pbuf1 = (char *)&lsm_buffer;
+ }
IOC_PACK(argv[0], data);
- rc = l_ioctl(OBD_DEV_ID, OBD_IOC_CREATE, buf);
+ rc = l2_ioctl(OBD_DEV_ID, OBD_IOC_CREATE, buf);
IOC_UNPACK(argv[0], data);
SHMEM_BUMP();
if (rc < 0) {
fprintf(stderr, "error: %s: #%d - %s\n",
- cmdname(argv[0]), i, strerror(rc = errno));
+ jt_cmdname(argv[0]), i, strerror(rc = errno));
break;
}
if (!(data.ioc_obdo1.o_valid & OBD_MD_FLID)) {
fprintf(stderr, "error: %s: objid not valid #%d:%08x\n",
- cmdname(argv[0]), i, data.ioc_obdo1.o_valid);
+ jt_cmdname(argv[0]), i, 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",
- cmdname(argv[0]), i, data.ioc_obdo1.o_id);
+ jt_cmdname(argv[0]), i, data.ioc_obdo1.o_id);
}
return rc;
}
data.ioc_obdo1.o_id = strtoull(argv[1], &end, 0);
if (*end) {
fprintf(stderr, "error: %s: invalid objid '%s'\n",
- cmdname(argv[0]), argv[1]);
+ jt_cmdname(argv[0]), argv[1]);
return CMD_HELP;
}
data.ioc_obdo1.o_mode = S_IFREG | strtoul(argv[2], &end, 0);
if (*end) {
fprintf(stderr, "error: %s: invalid mode '%s'\n",
- cmdname(argv[0]), argv[2]);
+ jt_cmdname(argv[0]), argv[2]);
return CMD_HELP;
}
data.ioc_obdo1.o_valid = OBD_MD_FLID | OBD_MD_FLTYPE | OBD_MD_FLMODE;
IOC_PACK(argv[0], data);
- rc = l_ioctl(OBD_DEV_ID, OBD_IOC_SETATTR, buf);
+ rc = l2_ioctl(OBD_DEV_ID, OBD_IOC_SETATTR, buf);
if (rc < 0)
- fprintf(stderr, "error: %s: %s\n", cmdname(argv[0]),
+ fprintf(stderr, "error: %s: %s\n", jt_cmdname(argv[0]),
strerror(rc = errno));
return rc;
id = strtoull(argv[1], &end, 0);
if (*end) {
fprintf(stderr, "error: %s: invalid objid '%s'\n",
- cmdname(argv[0]), argv[1]);
+ jt_cmdname(argv[0]), argv[1]);
return CMD_HELP;
}
if (argc > 2) {
if (*end) {
fprintf(stderr,
"error: %s: invalid iteration count '%s'\n",
- cmdname(argv[0]), argv[2]);
+ jt_cmdname(argv[0]), argv[2]);
return CMD_HELP;
}
}
return CMD_HELP;
}
- printf("%s: "LPD64" objects\n", cmdname(argv[0]), count);
+ printf("%s: "LPD64" objects\n", jt_cmdname(argv[0]), count);
gettimeofday(&next_time, NULL);
next_time.tv_sec -= verbose;
data.ioc_obdo1.o_valid = OBD_MD_FLID | OBD_MD_FLMODE;
IOC_PACK(argv[0], data);
- rc = l_ioctl(OBD_DEV_ID, OBD_IOC_DESTROY, buf);
+ rc = l2_ioctl(OBD_DEV_ID, 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));
+ jt_cmdname(argv[0]), id, strerror(rc = errno));
break;
}
if (be_verbose(verbose, &next_time, i, &next_count, count))
printf("%s: #%d is object id "LPX64"\n",
- cmdname(argv[0]), i, id);
+ jt_cmdname(argv[0]), i, id);
}
return rc;
data.ioc_obdo1.o_id = strtoull(argv[1], &end, 0);
if (*end) {
fprintf(stderr, "error: %s: invalid objid '%s'\n",
- cmdname(argv[0]), argv[1]);
+ jt_cmdname(argv[0]), argv[1]);
return CMD_HELP;
}
/* to help obd filter */
data.ioc_obdo1.o_mode = 0100644;
data.ioc_obdo1.o_valid = 0xffffffff;
- printf("%s: object id "LPX64"\n", cmdname(argv[0]),data.ioc_obdo1.o_id);
+ printf("%s: object id "LPX64"\n", jt_cmdname(argv[0]),data.ioc_obdo1.o_id);
IOC_PACK(argv[0], data);
- rc = l_ioctl(OBD_DEV_ID, OBD_IOC_GETATTR, buf);
+ rc = l2_ioctl(OBD_DEV_ID, OBD_IOC_GETATTR, buf);
IOC_UNPACK(argv[0], data);
if (rc) {
- fprintf(stderr, "error: %s: %s\n", cmdname(argv[0]),
+ fprintf(stderr, "error: %s: %s\n", jt_cmdname(argv[0]),
strerror(rc = errno));
} else {
- printf("%s: object id "LPX64", mode %o\n", cmdname(argv[0]),
+ printf("%s: object id "LPX64", mode %o\n", jt_cmdname(argv[0]),
data.ioc_obdo1.o_id, data.ioc_obdo1.o_mode);
}
return rc;
count = strtoull(argv[1], &end, 0);
if (*end) {
fprintf(stderr, "error: %s: invalid iteration count '%s'\n",
- cmdname(argv[0]), argv[1]);
+ jt_cmdname(argv[0]), argv[1]);
return CMD_HELP;
}
objid = strtoull(argv[3], &end, 0);
if (*end) {
fprintf(stderr, "error: %s: invalid objid '%s'\n",
- cmdname(argv[0]), argv[3]);
+ jt_cmdname(argv[0]), argv[3]);
return CMD_HELP;
}
}
next_time.tv_usec = start.tv_usec;
if (verbose != 0)
printf("%s: getting "LPD64" attrs (objid "LPX64"): %s",
- cmdname(argv[0]), count, objid, ctime(&start.tv_sec));
+ jt_cmdname(argv[0]), count, objid, ctime(&start.tv_sec));
for (i = 1, next_count = verbose; i <= count; i++) {
data.ioc_obdo1.o_id = objid;
data.ioc_obdo1.o_mode = S_IFREG;
data.ioc_obdo1.o_valid = 0xffffffff;
IOC_PACK(argv[0], data);
- rc = l_ioctl(OBD_DEV_ID, OBD_IOC_GETATTR, &data);
+ rc = l2_ioctl(OBD_DEV_ID, OBD_IOC_GETATTR, &data);
SHMEM_BUMP();
if (rc < 0) {
fprintf(stderr, "error: %s: #"LPD64" - %d:%s\n",
- cmdname(argv[0]), i, errno, strerror(rc = errno));
+ jt_cmdname(argv[0]), i, errno, strerror(rc = errno));
break;
} else {
if (be_verbose
(verbose, &next_time, i, &next_count, count))
printf("%s: got attr #"LPD64"\n",
- cmdname(argv[0]), i);
+ jt_cmdname(argv[0]), i);
}
}
--i;
if (verbose != 0)
- printf("%s: "LPD64" attrs in %.4gs (%.4g attr/s): %s",
- cmdname(argv[0]), i, diff, (double)i / diff,
+ printf("%s: "LPD64" attrs in %.3fs (%.3f attr/s): %s",
+ jt_cmdname(argv[0]), i, diff, i / diff,
ctime(&end.tv_sec));
}
return rc;
{
struct obd_ioctl_data data;
struct timeval start, next_time;
- int pages = 1;
- __u64 count, next_count;
- __u64 objid = 3;
- int verbose = 1, write = 0, rw;
+ __u64 count, next_count, len, thr_offset = 0, objid = 3;
+ int write = 0, verbose = 1, cmd, i, rc = 0, pages = 1;
char *end;
- int thr_offset = 0;
- int i;
- int len;
- int rc = 0;
- if (argc < 2 || argc > 6) {
+ if (argc < 2 || argc > 7) {
fprintf(stderr, "error: %s: bad number of arguments: %d\n",
- cmdname(argv[0]), argc);
+ jt_cmdname(argv[0]), argc);
return CMD_HELP;
}
if (*end) {
fprintf(stderr, "error: %s: bad iteration count '%s'\n",
- cmdname(argv[0]), argv[1]);
+ jt_cmdname(argv[0]), argv[1]);
return CMD_HELP;
}
pages = strtoul(argv[4], &end, 0);
if (*end) {
fprintf(stderr, "error: %s: bad page count '%s'\n",
- cmdname(argv[0]), argv[4]);
+ jt_cmdname(argv[0]), argv[4]);
return CMD_HELP;
}
}
objid = strtoull(argv[5], &end, 0);
if (*end) {
fprintf(stderr, "error: %s: bad objid '%s'\n",
- cmdname(argv[0]), argv[5]);
+ jt_cmdname(argv[0]), argv[5]);
return CMD_HELP;
}
}
+ IOC_INIT(data);
+
+ /* communicate the 'type' of brw test and batching to echo_client.
+ * don't start. we'd love to refactor this lctl->echo_client
+ * interface */
+ data.ioc_pbuf1 = (void *)1;
+ data.ioc_plen1 = 1;
+
+ if (argc >= 7) {
+ switch(argv[6][0]) {
+ case 'g': /* plug and unplug */
+ data.ioc_pbuf1 = (void *)2;
+ data.ioc_plen1 = strtoull(argv[6] + 1, &end,
+ 0);
+ break;
+ case 'p': /* prep and commit */
+ data.ioc_pbuf1 = (void *)3;
+ data.ioc_plen1 = strtoull(argv[6] + 1, &end,
+ 0);
+ break;
+ default:
+ fprintf(stderr, "error: %s: batching '%s' "
+ "needs to specify 'p' or 'g'\n",
+ jt_cmdname(argv[0]), argv[6]);
+ return CMD_HELP;
+ }
+
+ if (*end) {
+ fprintf(stderr, "error: %s: bad batching '%s'\n",
+ jt_cmdname(argv[0]), argv[6]);
+ return CMD_HELP;
+ }
+ data.ioc_plen1 *= PAGE_SIZE;
+ }
+
len = pages * PAGE_SIZE;
- IOC_INIT(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;
if (verbose != 0)
printf("%s: %s "LPU64"x%d pages (obj "LPX64", off "LPU64"): %s",
- cmdname(argv[0]), write ? "writing" : "reading", count,
+ jt_cmdname(argv[0]), write ? "writing" : "reading", count,
pages, objid, data.ioc_offset, ctime(&start.tv_sec));
- IOC_PACK(argv[0], data);
- rc = l_ioctl(OBD_DEV_ID, 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;
+ cmd = write ? OBD_IOC_BRW_WRITE : OBD_IOC_BRW_READ;
for (i = 1, next_count = verbose; i <= count; i++) {
- rc = l_ioctl(OBD_DEV_ID, rw, buf);
+ data.ioc_obdo1.o_valid &= ~(OBD_MD_FLBLOCKS|OBD_MD_FLGRANT);
+ IOC_PACK(argv[0], data);
+ rc = l2_ioctl(OBD_DEV_ID, cmd, buf);
SHMEM_BUMP();
if (rc) {
fprintf(stderr, "error: %s: #%d - %s on %s\n",
- cmdname(argv[0]), i, strerror(rc = errno),
+ jt_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 %dx%d\n", cmdname(argv[0]),
+ printf("%s: %s number %dx%d\n", jt_cmdname(argv[0]),
write ? "write" : "read", i, pages);
data.ioc_offset += len;
--i;
if (verbose != 0)
- printf("%s: %s %dx%d pages in %.4gs (%.4g pg/s): %s",
- cmdname(argv[0]), write ? "wrote" : "read",
- i, pages, diff, (double)i * pages / diff,
+ printf("%s: %s %dx%d pages in %.3fs (%.3f MB/s): %s",
+ jt_cmdname(argv[0]), write ? "wrote" : "read",
+ i, pages, diff,
+ ((double)i * pages * getpagesize()) /
+ (diff * 1048576.0),
ctime(&end.tv_sec));
}
- rw = l_ioctl(OBD_DEV_ID, 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_setconfig(int argc, char **argv)
-{
- struct obd_ioctl_data data;
- struct lov_desc desc;
- struct obd_uuid *uuidarray, *ptr;
- int rc, i;
- char *end;
-
- IOC_INIT(data);
-
- if (argc <= 6)
- return CMD_HELP;
-
- if (strlen(argv[1]) > sizeof(desc.ld_uuid) - 1) {
- fprintf(stderr,
- "error: %s: LOV uuid '%s' longer than "LPSZ" chars\n",
- cmdname(argv[0]), argv[1], sizeof(desc.ld_uuid) - 1);
- return -EINVAL;
- }
-
- memset(&desc, 0, sizeof(desc));
- obd_str2uuid(&desc.ld_uuid, argv[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;
- }
- 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: 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 = strtoull(argv[4], &end, 0);
- if (*end) {
- fprintf(stderr, "error: %s: bad default stripe offset '%s'\n",
- cmdname(argv[0]), argv[4]);
- return CMD_HELP;
- }
- desc.ld_pattern = strtoul(argv[5], &end, 0);
- if (*end) {
- fprintf(stderr, "error: %s: bad stripe pattern '%s'\n",
- cmdname(argv[0]), argv[5]);
- return CMD_HELP;
- }
-
- /* 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 memory for %d UUIDs\n",
- cmdname(argv[0]), desc.ld_tgt_count);
- rc = -ENOMEM;
- goto out;
- }
- 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]);
- rc = -EINVAL;
- goto out;
- }
- strcpy((char *)ptr, argv[i]);
- }
-
- 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 = l_ioctl(OBD_DEV_ID, 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;
memset(&desc, 0, sizeof(desc));
obd_str2uuid(&desc.ld_uuid, argv[1]);
- desc.ld_tgt_count = DEF_UUID_ARRAY_LEN;
+ desc.ld_tgt_count = ((OBD_MAX_IOCTL_BUFFER-sizeof(data)-sizeof(desc)) /
+ sizeof(*uuidarray));
+
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);
+ jt_cmdname(argv[0]), desc.ld_tgt_count);
rc = -ENOMEM;
goto out;
}
data.ioc_inlbuf2 = (char *)uuidarray;
if (obd_ioctl_pack(&data, &buf, max)) {
- fprintf(stderr, "error: %s: invalid ioctl\n", cmdname(argv[0]));
+ fprintf(stderr, "error: %s: invalid ioctl\n",
+ jt_cmdname(argv[0]));
rc = -EINVAL;
goto out;
}
goto repeat;
} else if (rc) {
fprintf(stderr, "error: %s: ioctl error: %s\n",
- cmdname(argv[0]), strerror(rc = errno));
+ jt_cmdname(argv[0]), strerror(rc = errno));
} else {
struct obd_uuid *ptr;
int i;
if (obd_ioctl_unpack(&data, buf, max)) {
fprintf(stderr, "error: %s: invalid reply\n",
- cmdname(argv[0]));
+ jt_cmdname(argv[0]));
rc = -EINVAL;
goto out;
}
return CMD_HELP;
IOC_PACK(argv[0], data);
- rc = l_ioctl(OBD_DEV_ID, IOC_LDLM_TEST, buf);
+ rc = l2_ioctl(OBD_DEV_ID, IOC_LDLM_TEST, buf);
if (rc)
fprintf(stderr, "error: %s: test failed: %s\n",
- cmdname(argv[0]), strerror(rc = errno));
+ jt_cmdname(argv[0]), strerror(rc = errno));
return rc;
}
return CMD_HELP;
IOC_PACK(argv[0], data);
- rc = l_ioctl(OBD_DEV_ID, IOC_LDLM_DUMP, buf);
+ rc = l2_ioctl(OBD_DEV_ID, IOC_LDLM_DUMP, buf);
if (rc)
fprintf(stderr, "error: %s failed: %s\n",
- cmdname(argv[0]), strerror(rc = errno));
+ jt_cmdname(argv[0]), strerror(rc = errno));
return rc;
}
}
IOC_PACK(argv[0], data);
- rc = l_ioctl(OBD_DEV_ID, IOC_LDLM_REGRESS_START, buf);
+ rc = l2_ioctl(OBD_DEV_ID, IOC_LDLM_REGRESS_START, buf);
if (rc)
fprintf(stderr, "error: %s: test failed: %s\n",
- cmdname(argv[0]), strerror(rc = errno));
+ jt_cmdname(argv[0]), strerror(rc = errno));
return rc;
}
return CMD_HELP;
IOC_PACK(argv[0], data);
- rc = l_ioctl(OBD_DEV_ID, IOC_LDLM_REGRESS_STOP, buf);
+ rc = l2_ioctl(OBD_DEV_ID, IOC_LDLM_REGRESS_STOP, buf);
if (rc)
fprintf(stderr, "error: %s: test failed: %s\n",
- cmdname(argv[0]), strerror(rc = errno));
+ jt_cmdname(argv[0]), strerror(rc = errno));
return rc;
}
-int jt_obd_lov_set_osc_active(int argc, char **argv)
+static int do_activate(int argc, char **argv, int flag)
{
struct obd_ioctl_data data;
int rc;
IOC_INIT(data);
- if (argc != 3)
+ if (argc != 1)
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]);
+ data.ioc_offset = flag;
IOC_PACK(argv[0], data);
- rc = l_ioctl(OBD_DEV_ID, IOC_LOV_SET_OSC_ACTIVE, buf);
+ rc = l2_ioctl(OBD_DEV_ID, IOC_OSC_SET_ACTIVE, buf);
if (rc)
fprintf(stderr, "error: %s: failed: %s\n",
- cmdname(argv[0]), strerror(rc = errno));
+ jt_cmdname(argv[0]), strerror(rc = errno));
return rc;
}
-int jt_obd_newconn(int argc, char **argv)
+int jt_obd_deactivate(int argc, char **argv)
{
- int rc;
- struct obd_ioctl_data data;
-
- IOC_INIT(data);
- if (argc < 2 || argc > 3)
- return CMD_HELP;
-
- data.ioc_inllen1 = strlen(argv[1]) + 1;
- data.ioc_inlbuf1 = argv[1];
-
- if (argc == 3) {
- data.ioc_inllen2 = strlen(argv[2]) + 1;
- data.ioc_inlbuf2 = argv[2];
- }
-
- IOC_PACK(argv[0], data);
- rc = l_ioctl(OBD_DEV_ID, OBD_IOC_RECOVD_NEWCONN, buf);
- if (rc < 0)
- fprintf(stderr, "error: %s: %s\n", cmdname(argv[0]),
- strerror(rc = errno));
+ return do_activate(argc, argv, 0);
+}
- return rc;
+int jt_obd_activate(int argc, char **argv)
+{
+ return do_activate(argc, argv, 1);
}
-int jt_obd_failconn(int argc, char **argv)
+int jt_obd_recover(int argc, char **argv)
{
int rc;
struct obd_ioctl_data data;
IOC_INIT(data);
- if (argc < 2)
+ if (argc > 2)
return CMD_HELP;
- data.ioc_inllen1 = strlen(argv[1]) + 1;
- data.ioc_inlbuf1 = argv[1];
+ if (argc == 2) {
+ data.ioc_inllen1 = strlen(argv[1]) + 1;
+ data.ioc_inlbuf1 = argv[1];
+ }
IOC_PACK(argv[0], data);
- rc = l_ioctl(OBD_DEV_ID, OBD_IOC_RECOVD_FAILCONN, buf);
- if (rc < 0)
- fprintf(stderr, "error: %s: %s\n", cmdname(argv[0]),
+ rc = l2_ioctl(OBD_DEV_ID, OBD_IOC_CLIENT_RECOVER, buf);
+ if (rc < 0) {
+ fprintf(stderr, "error: %s: %s\n", jt_cmdname(argv[0]),
strerror(rc = errno));
+ }
return rc;
}
rc = ioctl(fd, IOC_MDC_LOOKUP, buf);
if (rc < 0) {
fprintf(stderr, "error: %s: ioctl error: %s\n",
- cmdname(argv[0]), strerror(rc = errno));
+ jt_cmdname(argv[0]), strerror(rc = errno));
}
close(fd);
return rc;
}
-static
-int do_add_uuid(char * func, char *uuid, ptl_nid_t nid, int nal)
+
+int jt_obd_close_uuid(int argc, char **argv)
{
- char tmp[64];
- int rc;
+ int rc, nal;
struct obd_ioctl_data data;
+ if (argc != 3) {
+ fprintf(stderr, "usage: %s <uuid> <net-type>\n", argv[0]);
+ return 0;
+ }
+
+ nal = ptl_name2nal(argv[2]);
+
+ if (nal <= 0) {
+ fprintf (stderr, "Can't parse NAL %s\n", argv[2]);
+ return -1;
+ }
+
IOC_INIT(data);
- data.ioc_nid = nid;
- data.ioc_inllen1 = strlen(uuid) + 1;
- data.ioc_inlbuf1 = uuid;
+ data.ioc_inllen1 = strlen(argv[1]) + 1;
+ data.ioc_inlbuf1 = argv[1];
data.ioc_nal = nal;
- IOC_PACK(func, data);
- rc = l_ioctl(OBD_DEV_ID, OBD_IOC_ADD_UUID, buf);
+ IOC_PACK(argv[0], data);
+ rc = l2_ioctl(OBD_DEV_ID, OBD_IOC_CLOSE_UUID, buf);
if (rc) {
- fprintf(stderr, "IOC_PORTAL_ADD_UUID failed: %s\n",
+ fprintf(stderr, "IOC_PORTAL_CLOSE_UUID failed: %s\n",
strerror(errno));
return -1;
}
-
- printf ("Added uuid %s: %s\n", uuid, ptl_nid2str (tmp, nid));
return 0;
}
-int jt_obd_add_uuid(int argc, char **argv)
+
+int jt_cfg_record(int argc, char **argv)
{
- ptl_nid_t nid = 0;
- int nal;
-
- if (argc != 4) {
+ struct obd_ioctl_data data;
+ int rc;
+
+ IOC_INIT(data);
+
+ if (argc != 2)
return CMD_HELP;
- }
- if (ptl_parse_nid (&nid, argv[2]) != 0) {
- fprintf (stderr, "Can't parse NID %s\n", argv[2]);
- return (-1);
+ data.ioc_inllen1 = strlen(argv[1]) + 1;
+ data.ioc_inlbuf1 = argv[1];
+
+ IOC_PACK(argv[0], data);
+ rc = l_ioctl(OBD_DEV_ID, OBD_IOC_RECORD, buf);
+ if (rc == 0) {
+ jt_recording = 1;
+ ptl_set_cfg_record_cb(obd_record);
+ } else {
+ fprintf(stderr, "OBD_IOC_RECORD failed: %s\n",
+ strerror(errno));
}
- nal = ptl_name2nal(argv[3]);
+ return rc;
+}
- if (nal == 0) {
- fprintf (stderr, "Can't parse NAL %s\n", argv[3]);
- return -1;
- }
+int jt_cfg_parse(int argc, char **argv)
+{
+ struct obd_ioctl_data data;
+ int rc;
+
+ IOC_INIT(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 = l_ioctl(OBD_DEV_ID, OBD_IOC_PARSE, buf);
+ if (rc < 0)
+ fprintf(stderr, "OBD_IOC_PARSE failed: %s\n",
+ strerror(errno));
- return do_add_uuid(argv[0], argv[1], nid, nal);
+ return rc;
}
-int jt_obd_close_uuid(int argc, char **argv)
+
+int jt_cfg_dump_log(int argc, char **argv)
{
- int rc, nal;
struct obd_ioctl_data data;
+ int rc;
- if (argc != 3) {
- fprintf(stderr, "usage: %s <uuid>\n", argv[0]);
+ IOC_INIT(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 = l_ioctl(OBD_DEV_ID, OBD_IOC_DUMP_LOG, buf);
+ if (rc < 0)
+ fprintf(stderr, "OBD_IOC_DUMP_LOG failed: %s\n",
+ strerror(errno));
+
+ return rc;
+}
+
+
+int jt_cfg_endrecord(int argc, char **argv)
+{
+ struct obd_ioctl_data data;
+ int rc;
+
+ IOC_INIT(data);
+
+ if (argc != 1)
+ return CMD_HELP;
+
+ if (!jt_recording) {
+ fprintf(stderr, "Not recording, so endrecord doesn't make sense.\n");
return 0;
}
- nal = ptl_name2nal(argv[2]);
-
- if (nal == 0) {
- fprintf (stderr, "Can't parse NAL %s\n", argv[2]);
- return -1;
+ IOC_PACK(argv[0], data);
+ rc = l_ioctl(OBD_DEV_ID, OBD_IOC_ENDRECORD, buf);
+ if (rc == 0) {
+ jt_recording = 0;
+ ptl_set_cfg_record_cb(NULL);
+ } else {
+ fprintf(stderr, "OBD_IOC_ENDRECORD failed: %s\n",
+ strerror(errno));
}
+ return rc;
+}
+
+int jt_llog_catlist(int argc, char **argv)
+{
+ struct obd_ioctl_data data;
+ int rc;
+
+ if (argc != 1)
+ return CMD_HELP;
+
+ IOC_INIT(data);
+ data.ioc_inllen1 = max - size_round(sizeof(data));
+ IOC_PACK(argv[0], data);
+
+ rc = l_ioctl(OBD_DEV_ID, OBD_IOC_CATLOGLIST, buf);
+ if (rc == 0)
+ fprintf(stdout, "%s", ((struct obd_ioctl_data*)buf)->ioc_bulk);
+ else
+ fprintf(stderr, "OBD_IOC_CATLOGLIST failed: %s\n",
+ strerror(errno));
+
+ return rc;
+}
+
+int jt_llog_info(int argc, char **argv)
+{
+ struct obd_ioctl_data data;
+ int rc;
+
+ if (argc != 2)
+ return CMD_HELP;
IOC_INIT(data);
data.ioc_inllen1 = strlen(argv[1]) + 1;
data.ioc_inlbuf1 = argv[1];
- data.ioc_nal = nal;
-
+ data.ioc_inllen2 = max - size_round(sizeof(data)) -
+ size_round(data.ioc_inllen1);
IOC_PACK(argv[0], data);
- rc = l_ioctl(OBD_DEV_ID, OBD_IOC_CLOSE_UUID, buf);
- if (rc) {
- fprintf(stderr, "IOC_PORTAL_CLOSE_UUID failed: %s\n",
+
+ rc = l_ioctl(OBD_DEV_ID, OBD_IOC_LLOG_INFO, buf);
+ if (rc == 0)
+ fprintf(stdout, "%s", ((struct obd_ioctl_data*)buf)->ioc_bulk);
+ else
+ fprintf(stderr, "OBD_IOC_LLOG_INFO failed: %s\n",
strerror(errno));
- return -1;
- }
- return 0;
+
+ return rc;
}
+int jt_llog_print(int argc, char **argv)
+{
+ struct obd_ioctl_data data;
+ int rc;
+
+ if (argc != 2 && argc != 4)
+ return CMD_HELP;
+
+ IOC_INIT(data);
+ data.ioc_inllen1 = strlen(argv[1]) + 1;
+ data.ioc_inlbuf1 = argv[1];
+ if (argc == 4) {
+ data.ioc_inllen2 = strlen(argv[2]) + 1;
+ data.ioc_inlbuf2 = argv[2];
+ data.ioc_inllen3 = strlen(argv[3]) + 1;
+ data.ioc_inlbuf3 = argv[3];
+ } else {
+ char from[2] = "1", to[3] = "-1";
+ data.ioc_inllen2 = strlen(from) + 1;
+ data.ioc_inlbuf2 = from;
+ data.ioc_inllen3 = strlen(to) + 1;
+ data.ioc_inlbuf3 = to;
+ }
+ data.ioc_inllen4 = max - size_round(sizeof(data)) -
+ size_round(data.ioc_inllen1) -
+ size_round(data.ioc_inllen2) -
+ size_round(data.ioc_inllen3);
+ IOC_PACK(argv[0], data);
+
+ rc = l_ioctl(OBD_DEV_ID, OBD_IOC_LLOG_PRINT, buf);
+ if (rc == 0)
+ fprintf(stdout, "%s", ((struct obd_ioctl_data*)buf)->ioc_bulk);
+ else
+ fprintf(stderr, "OBD_IOC_LLOG_PRINT failed: %s\n",
+ strerror(errno));
-int jt_obd_del_uuid(int argc, char **argv)
+ return rc;
+}
+
+int jt_llog_cancel(int argc, char **argv)
{
+ struct obd_ioctl_data data;
int rc;
+
+ if (argc != 4)
+ return CMD_HELP;
+
+ IOC_INIT(data);
+ data.ioc_inllen1 = strlen(argv[1]) + 1;
+ data.ioc_inlbuf1 = argv[1];
+ data.ioc_inllen2 = strlen(argv[2]) + 1;
+ data.ioc_inlbuf2 = argv[2];
+ data.ioc_inllen3 = strlen(argv[3]) + 1;
+ data.ioc_inlbuf3 = argv[3];
+ IOC_PACK(argv[0], data);
+
+ rc = l_ioctl(OBD_DEV_ID, OBD_IOC_LLOG_CANCEL, buf);
+ if (rc == 0)
+ fprintf(stdout, "index %s be canceled.\n", argv[3]);
+ else
+ fprintf(stderr, "OBD_IOC_LLOG_CANCEL failed: %s\n",
+ strerror(errno));
+
+ return rc;
+
+}
+int jt_llog_check(int argc, char **argv)
+{
struct obd_ioctl_data data;
+ int rc;
- if (argc != 2) {
- fprintf(stderr, "usage: %s <uuid>\n", argv[0]);
- return 0;
- }
+ if (argc != 2 && argc != 4)
+ return CMD_HELP;
IOC_INIT(data);
+ data.ioc_inllen1 = strlen(argv[1]) + 1;
+ data.ioc_inlbuf1 = argv[1];
+ if (argc == 4) {
+ data.ioc_inllen2 = strlen(argv[2]) + 1;
+ data.ioc_inlbuf2 = argv[2];
+ data.ioc_inllen3 = strlen(argv[3]) + 1;
+ data.ioc_inlbuf3 = argv[3];
+ } else {
+ char from[2] = "1", to[3] = "-1";
+ data.ioc_inllen2 = strlen(from) + 1;
+ data.ioc_inlbuf2 = from;
+ data.ioc_inllen3 = strlen(to) + 1;
+ data.ioc_inlbuf3 = to;
+ }
+ data.ioc_inllen4 = max - size_round(sizeof(data)) -
+ size_round(data.ioc_inllen1) -
+ size_round(data.ioc_inllen2) -
+ size_round(data.ioc_inllen3);
+ IOC_PACK(argv[0], data);
- if (strcmp (argv[1], "_all_"))
- {
- data.ioc_inllen1 = strlen(argv[1]) + 1;
- data.ioc_inlbuf1 = argv[1];
+ rc = l_ioctl(OBD_DEV_ID, OBD_IOC_LLOG_CHECK, buf);
+ if (rc == 0)
+ fprintf(stdout, "%s", ((struct obd_ioctl_data*)buf)->ioc_bulk);
+ else
+ fprintf(stderr, "OBD_IOC_LLOG_CHECK failed: %s\n",
+ strerror(errno));
+ return rc;
+}
+
+int jt_llog_remove(int argc, char **argv)
+{
+ struct obd_ioctl_data data;
+ int rc;
+
+ if (argc != 3 && argc != 2)
+ return CMD_HELP;
+
+ IOC_INIT(data);
+ data.ioc_inllen1 = strlen(argv[1]) + 1;
+ data.ioc_inlbuf1 = argv[1];
+ if (argc == 3){
+ data.ioc_inllen2 = strlen(argv[2]) + 1;
+ data.ioc_inlbuf2 = argv[2];
}
-
IOC_PACK(argv[0], data);
- rc = l_ioctl(OBD_DEV_ID, OBD_IOC_DEL_UUID, buf);
- if (rc) {
- fprintf(stderr, "IOC_PORTAL_DEL_UUID failed: %s\n",
+
+ rc = l_ioctl(OBD_DEV_ID, OBD_IOC_LLOG_REMOVE, buf);
+ if (rc == 0) {
+ if (argc == 3)
+ fprintf(stdout, "log %s are removed.\n", argv[2]);
+ else
+ fprintf(stdout, "the log in catlog %s are removed. \n", argv[1]);
+ } else
+ fprintf(stderr, "OBD_IOC_LLOG_REMOVE failed: %s\n",
strerror(errno));
- return -1;
- }
- return 0;
+
+ return rc;
}
static void signal_server(int sig)
do_disconnect("sigint", 1);
exit(1);
} else
- fprintf(stderr, "%s: got signal %d\n", cmdname("sigint"), sig);
+ fprintf(stderr, "%s: got signal %d\n", jt_cmdname("sigint"), sig);
}
int obd_initialize(int argc, char **argv)
}
-void obd_cleanup(int argc, char **argv)
+void obd_finalize(int argc, char **argv)
{
struct sigaction sigact;
sigact.sa_flags = SA_RESTART;
sigaction(SIGINT, &sigact, NULL);
+ if (jt_recording) {
+ printf("END RECORD\n");
+ jt_cfg_endrecord(argc, argv);
+ }
+
do_disconnect(argv[0], 1);
}
git://git.whamcloud.com / fs / lustre-release.git / blobdiff