*
*/
+
#include <stdlib.h>
#include <sys/ioctl.h>
#include <fcntl.h>
#include <sys/wait.h>
#include <sys/stat.h>
#include <stdio.h>
+#include <stdarg.h>
#include <signal.h>
#define printk printf
#include <linux/lustre_idl.h>
#include <linux/lustre_dlm.h>
+#include <libxml/xmlmemory.h>
+#include <libxml/parser.h>
+
#include <unistd.h>
#include <sys/un.h>
#include <time.h>
#include <errno.h>
#include <string.h>
+#include <asm/page.h> /* needed for PAGE_SIZE - rread*/
+
#define __KERNEL__
#include <linux/list.h>
#undef __KERNEL__
#include "parser.h"
#include <stdio.h>
+static int jt_newdev(int argc, char **argv);
+static int jt_attach(int argc, char **argv);
+static int jt_setup(int argc, char **argv);
+
+
int fd = -1;
-int connid = -1;
+uint64_t conn_addr = -1;
+uint64_t conn_cookie;
char rawbuf[8192];
char *buf = rawbuf;
int max = 8192;
int thread;
+int rc = 0;
#define IOCINIT(data) \
do { \
memset(&data, 0, sizeof(data)); \
data.ioc_version = OBD_IOCTL_VERSION; \
- data.ioc_conn1 = connid; \
+ data.ioc_addr = conn_addr; \
+ data.ioc_cookie = conn_cookie; \
data.ioc_len = sizeof(data); \
if (fd < 0) { \
fprintf(stderr, "No device open, use device\n"); \
return 0;
}
-/*
#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))
static int be_verbose(int verbose, struct timeval *next_time,
int num, int *next_num, int num_total)
else
verbose = (int) strtoul(arg, NULL, 0);
- printf("Verbose = %d\n",verbose);
+ if (verbose < 0)
+ printf("Print status every %d seconds\n", -verbose);
+ else if (verbose == 1)
+ printf("Print status every operation\n");
+ else if (verbose > 1)
+ printf("Print status every %d operations\n", verbose);
return verbose;
}
static int do_disconnect(char *func, int verbose)
{
struct obd_ioctl_data data;
- int rc;
- if (connid == -1)
- return 0;
+ if (conn_addr == -1)
+ return 0;
IOCINIT(data);
OBD_IOC_DISCONNECT, strerror(errno));
} else {
if (verbose)
- printf("%s: disconnected connid %d\n", cmdname(func),
- connid);
- connid = -1;
+ printf("%s: disconnected conn %Lx\n", cmdname(func),
+ conn_addr);
+ conn_addr = -1;
}
return rc;
extern command_t cmdlist[];
+static int xml_command(char *cmd, ...) {
+ va_list args;
+ char *arg, *cmds[8];
+ int i = 1, j;
+
+ cmds[0] = cmd;
+ va_start(args, cmd);
+
+ while (((arg = va_arg(args, char *)) != NULL) && (i < 8)) {
+ cmds[i] = arg;
+ i++;
+ }
+
+ va_end(args);
+
+ printf("obdctl > ");
+ for (j = 0; j < i; j++)
+ printf("%s ", cmds[j]);
+
+ printf("\n");
+
+ return Parser_execarg(i, cmds, cmdlist);
+}
+
+#if 0
+static network_t *xml_network(xmlDocPtr doc, xmlNodePtr root) {
+ xmlNodePtr cur = root->xmlChildrenNode;
+ network_t *net;
+
+ if ((net = (network_t *)calloc(1, sizeof(network_t))) == NULL) {
+ printf("error: unable to malloc network_t\n");
+ return NULL;
+ }
+
+ net->type = xmlGetProp(root, "type");
+ if (net->type == NULL) {
+ printf("error: type attrib required (tcp, elan, myrinet)\n");
+ free(net);
+ return NULL;
+ }
+
+ while (cur != NULL) {
+ if (!xmlStrcmp(cur->name, "server"))
+ net->server = xmlNodeGetContent(cur);
+
+ if (!xmlStrcmp(cur->name, "port"))
+ net->port = atoi(xmlNodeGetContent(cur));
+
+ cur = cur->next;
+ }
+
+ if (net->server == NULL) {
+ printf("error: <server> tag required\n");
+ free(net);
+ return NULL;
+ }
+
+ return net;
+}
+#endif
+
+static int xml_mds(xmlDocPtr doc, xmlNodePtr root,
+ char *serv_name, char *serv_uuid) {
+ xmlNodePtr cur = root->xmlChildrenNode;
+ char *fstype = NULL, *device = NULL;
+ int rc;
+
+ printf("--- Setting up MDS ---\n");
+ while (cur != NULL) {
+ if (!xmlStrcmp(cur->name, "fstype"))
+ fstype = xmlNodeGetContent(cur);
+
+ if (!xmlStrcmp(cur->name, "device"))
+ device = xmlNodeGetContent(cur);
+
+ /* FIXME: Parse the network bits
+ * if (!xmlStrcmp(cur->name, "network")) {
+ * net = xml_network(doc, cur);
+ * if (net == NULL)
+ * return -1;
+ * }
+ * free(net);
+ */
+ cur = cur->next;
+ }
+
+ if ((fstype == NULL) || (device == NULL)) {
+ printf("error: <fstype> and <device> tags required\n");
+ return -1;
+ }
+
+ if ((rc = xml_command("newdev", NULL)) != 0)
+ return rc;
+
+ if ((rc = xml_command("attach","mds",serv_name,serv_uuid,NULL)) != 0)
+ return rc;
+
+ if ((rc = xml_command("setup", device, fstype, NULL)) != 0)
+ return rc;
+
+ return 0;
+}
+
+static int xml_obd(xmlDocPtr doc, xmlNodePtr root,
+ char *serv_name, char *serv_uuid) {
+ char *obdtype, *format = NULL, *fstype = NULL, *device = NULL;
+ xmlNodePtr cur = root->xmlChildrenNode;
+ int rc;
+
+ obdtype = xmlGetProp(root, "type");
+ printf("--- Setting up OBD ---\n");
+
+ while (cur != NULL) {
+ if (!xmlStrcmp(cur->name, "fstype"))
+ fstype = xmlNodeGetContent(cur);
+
+ if (!xmlStrcmp(cur->name, "device"))
+ device = xmlNodeGetContent(cur);
+
+ if (!xmlStrcmp(cur->name, "autoformat"))
+ format = xmlNodeGetContent(cur);
+
+ cur = cur->next;
+ }
+
+ if ((obdtype == NULL) || (fstype == NULL) || (device == NULL)) {
+ printf("error: 'type' attrib and <fstype> "
+ "and <device> tags required\n");
+ return -1;
+ }
+
+ /* FIXME: Building and configuring loopback devices should go here
+ * but is currently unsupported. You'll have to use the scripts
+ * for now until support is added, or specify a real device.
+ */
+
+ if ((rc = xml_command("newdev", NULL)) != 0)
+ return rc;
+
+ if ((rc = xml_command("attach", obdtype,
+ serv_name,serv_uuid, NULL)) != 0)
+ return rc;
+
+ if ((rc = xml_command("setup", device, fstype, NULL)) != 0)
+ return rc;
+
+ return 0;
+}
+
+static int xml_ost(xmlDocPtr doc, xmlNodePtr root,
+ char *serv_name, char *serv_uuid) {
+ char *server_name = NULL, *server_uuid = NULL;
+ char *failover_name = NULL, *failover_uuid = NULL;
+ xmlNodePtr cur = root->xmlChildrenNode;
+ int server_num, failover_num, rc;
+
+ printf("--- Setting up OST ---\n");
+ while (cur != NULL) {
+ if (!xmlStrcmp(cur->name, "server_id")) {
+ server_num = atoi(xmlGetProp(cur, "num"));
+ server_name = xmlGetProp(cur, "name");
+ server_uuid = xmlGetProp(cur, "uuid");
+ }
+
+ /* FIXME: Properly handle multiple failover servers */
+ if (!xmlStrcmp(cur->name, "failover_id")) {
+ failover_num = atoi(xmlGetProp(cur, "num"));
+ failover_name = xmlGetProp(cur, "name");
+ failover_uuid = xmlGetProp(cur, "uuid");
+ }
+
+ cur = cur->next;
+ }
+
+ if ((server_name == NULL) || (server_uuid == NULL)) {
+ printf("error: atleast the <server_id> tag is required\n");
+ return -1;
+ }
+
+ if ((rc = xml_command("newdev", NULL)) != 0)
+ return rc;
+
+ if ((rc = xml_command("attach","ost",serv_name,serv_uuid,NULL)) != 0)
+ return rc;
+
+ if ((rc = xml_command("setup", server_name, NULL)) != 0)
+ return rc;
+
+ return 0;
+}
+
+static int xml_osc(xmlDocPtr doc, xmlNodePtr root,
+ char *serv_name, char *serv_uuid) {
+ char *ost_name = NULL, *ost_uuid = NULL;
+ xmlNodePtr cur = root->xmlChildrenNode;
+ int ost_num, rc = 0;
+
+ printf("--- Setting up OSC ---\n");
+ while (cur != NULL) {
+ if (!xmlStrcmp(cur->name, "service_id")) {
+ ost_num = atoi(xmlGetProp(cur, "num"));
+ ost_name = xmlGetProp(cur, "name");
+ ost_uuid = xmlGetProp(cur, "uuid");
+ }
+
+ cur = cur->next;
+ }
+
+ if ((ost_name == NULL) || (ost_uuid == NULL)) {
+ printf("error: atleast the <service_id> tag is required\n");
+ return -1;
+ }
+
+ if ((rc = xml_command("newdev", NULL)) != 0)
+ return rc;
+
+ if ((rc = xml_command("attach","osc",serv_name,serv_uuid,NULL)) != 0)
+ return rc;
+
+ if ((rc = xml_command("setup", ost_uuid, "localhost", NULL)) != 0)
+ return rc;
+
+ return 0;
+}
+
+static int xml_mdc(xmlDocPtr doc, xmlNodePtr root,
+ char *serv_name, char *serv_uuid) {
+ char *mds_name = NULL, *mds_uuid = NULL;
+ xmlNodePtr cur = root->xmlChildrenNode;
+ int mds_num, rc = 0;
+
+ printf("--- Setting up MDC ---\n");
+ while (cur != NULL) {
+ if (!xmlStrcmp(cur->name, "service_id")) {
+ mds_num = atoi(xmlGetProp(cur, "num"));
+ mds_name = xmlGetProp(cur, "name");
+ mds_uuid = xmlGetProp(cur, "uuid");
+ }
+
+ cur = cur->next;
+ }
+
+ if ((mds_name == NULL) || (mds_uuid == NULL)) {
+ printf("error: atleast the <service_id> tag is required\n");
+ return -1;
+ }
+
+ if ((rc = xml_command("newdev", NULL)) != 0)
+ return rc;
+
+ if ((rc = xml_command("attach","mdc",serv_name,serv_uuid,NULL)) != 0)
+ return rc;
+
+ if ((rc = xml_command("setup", mds_uuid, "localhost", NULL)) != 0)
+ return rc;
+
+ return 0;
+}
+
+static int xml_lov(xmlDocPtr doc, xmlNodePtr root,
+ char *serv_name, char *serv_uuid) {
+ printf("--- Setting up LOV ---\n");
+ return 0;
+}
+
+static int xml_router(xmlDocPtr doc, xmlNodePtr root,
+ char *serv_name, char *serv_uuid) {
+ printf("--- Setting up ROUTER ---\n");
+ return 0;
+}
+
+static int xml_ldlm(xmlDocPtr doc, xmlNodePtr root,
+ char *serv_name, char *serv_uuid) {
+ int rc;
+
+ printf("--- Setting up LDLM ---\n");
+ if ((rc = xml_command("newdev", NULL)) != 0)
+ return rc;
+
+ if ((rc = xml_command("attach","ldlm",serv_name,serv_uuid,NULL)) != 0)
+ return rc;
+
+ if ((rc = xml_command("setup", NULL)) != 0)
+ return rc;
+
+ return 0;
+}
+
+static int xml_service(xmlDocPtr doc, xmlNodePtr root,
+ int serv_num, char *serv_name, char *serv_uuid) {
+ xmlNodePtr cur = root;
+ char *name, *uuid;
+
+ while (cur != NULL) {
+ name = xmlGetProp(cur, "name");
+ uuid = xmlGetProp(cur, "uuid");
+
+ if (xmlStrcmp(name, serv_name) ||
+ xmlStrcmp(uuid, serv_uuid)) {
+ cur = cur->next;
+ continue;
+ }
+
+ if (!xmlStrcmp(cur->name, "mds"))
+ return xml_mds(doc, cur, name, uuid);
+ else if (!xmlStrcmp(cur->name, "obd"))
+ return xml_obd(doc, cur, name, uuid);
+ else if (!xmlStrcmp(cur->name, "ost"))
+ return xml_ost(doc, cur, name, uuid);
+ else if (!xmlStrcmp(cur->name, "osc"))
+ return xml_osc(doc, cur, name, uuid);
+ else if (!xmlStrcmp(cur->name, "mdc"))
+ return xml_mdc(doc, cur, name, uuid);
+ else if (!xmlStrcmp(cur->name, "lov"))
+ return xml_lov(doc, cur, name, uuid);
+ else if (!xmlStrcmp(cur->name, "router"))
+ return xml_router(doc, cur, name, uuid);
+ else if (!xmlStrcmp(cur->name, "ldlm"))
+ return xml_ldlm(doc, cur, name, uuid);
+ else
+ return -1;
+
+ cur = cur->next;
+ }
+
+ printf("error: No XML config branch for name=%s uuid=%s\n",
+ serv_name, serv_uuid);
+ return -1;
+}
+
+static int xml_profile(xmlDocPtr doc, xmlNodePtr root,
+ int prof_num, char *prof_name, char *prof_uuid) {
+ xmlNodePtr parent, cur = root;
+ char *name, *uuid, *srv_name, *srv_uuid;
+ int rc = 0, num;
+
+ while (cur != NULL) {
+ name = xmlGetProp(cur, "name");
+ uuid = xmlGetProp(cur, "uuid");
+
+ if (xmlStrcmp(cur->name, "profile") ||
+ xmlStrcmp(name, prof_name) ||
+ xmlStrcmp(uuid, prof_uuid)) {
+ cur = cur->next;
+ continue;
+ }
+
+ /* FIXME: Doesn't understand mountpoints yet
+ * xml_mountpoint(doc, root, ...);
+ */
+
+ /* Setup each service in turn
+ * FIXME: Should be sorted by "num" attr, we shouldn't
+ * assume they're in order in the XML document.
+ */
+ parent = cur;
+ cur = cur->xmlChildrenNode;
+ while (cur != NULL) {
+ if (!xmlStrcmp(cur->name, "service_id")) {
+ num = atoi(xmlGetProp(cur, "num"));
+ rc = xml_service(doc, root, num,
+ srv_name = xmlGetProp(cur, "name"),
+ srv_uuid = xmlGetProp(cur, "uuid"));
+ if (rc != 0) {
+ printf("error: service config\n");
+ return rc;
+ }
+ }
+
+ cur = cur->next;
+ }
+
+ cur = parent->next;
+ }
+
+ return rc;
+}
+
+static int xml_node(xmlDocPtr doc, xmlNodePtr root) {
+ xmlNodePtr parent, cur = root;
+ char *name, *uuid;
+ int rc = 0, num;
+
+ /* Walk the node tags looking for ours */
+ while (cur != NULL) {
+ if (xmlStrcmp(cur->name, "node")) {
+ cur = cur->next;
+ continue;
+ }
+
+ name = xmlGetProp(cur, "name");
+ if (name == NULL)
+ return -1;
+
+ uuid = xmlGetProp(cur, "uuid");
+ if (uuid == NULL)
+ return -1;
+
+ /* FIXME: Verify our NAME and UUID against /etc/lustre/id
+ * so we're sure we are who we think we are.
+ */
+
+ /* Setup each profile in turn
+ * FIXME: Should be sorted by "num" attr, we shouldn't
+ * assume they're in order in the XML document.
+ */
+ parent = cur;
+ cur = cur->xmlChildrenNode;
+ while (cur != NULL) {
+ if (!xmlStrcmp(cur->name, "profile_id")) {
+ num = atoi(xmlGetProp(cur, "num"));
+ rc = xml_profile(doc, root, num,
+ xmlGetProp(cur, "name"),
+ xmlGetProp(cur, "uuid"));
+ if (rc != 0)
+ return rc;
+ }
+
+ cur = cur->next;
+ }
+
+ cur = parent->next;
+ }
+
+ return rc;
+}
+
+static int do_xml(char *func, char *file)
+{
+ xmlDocPtr doc;
+ xmlNodePtr cur;
+ int rc;
+
+ doc = xmlParseFile(file);
+ if (doc == NULL) {
+ fprintf(stderr, "error: Unable to parse XML\n");
+ return -1;
+ }
+
+ cur = xmlDocGetRootElement(doc);
+ if (cur == NULL) {
+ fprintf(stderr, "error: Empty XML\n");
+ xmlFreeDoc(doc);
+ return -1;
+ }
+
+ if (xmlStrcmp(cur->name, (const xmlChar *)"lustre")) {
+ fprintf(stderr, "error: Root node != <lustre>\n");
+ xmlFreeDoc(doc);
+ return -1;
+ }
+
+ /* FIXME: Validate the XML against the DTD here */
+
+ /* FIXME: Merge all the text nodes under each branch and
+ * prune empty nodes. Just to make the parsing more
+ * tolerant, the exact location of nested tags isn't
+ * critical for this.
+ */
+
+ rc = xml_node(doc, cur->xmlChildrenNode);
+ xmlFreeDoc(doc);
+
+ return rc;
+}
+
static int do_device(char *func, int dev)
{
struct obd_ioctl_data data;
static int jt_device(int argc, char **argv)
{
- int rc;
-
do_disconnect(argv[0], 1);
if (argc != 2) {
static int jt_connect(int argc, char **argv)
{
struct obd_ioctl_data data;
- int rc;
IOCINIT(data);
fprintf(stderr, "error: %s: %x %s\n", cmdname(argv[0]),
OBD_IOC_CONNECT, strerror(rc = errno));
else
- connid = data.ioc_conn1;
-
+ conn_addr = data.ioc_addr;
+ conn_cookie = data.ioc_cookie;
return rc;
}
return -1;
}
+ if (conn_addr == -1)
+ return 0;
+
return do_disconnect(argv[0], 0);
}
+static int jt__xml(int argc, char **argv)
+{
+ if (argc < 2) {
+ fprintf(stderr, "usage: %s <xml file> <command [args ...]>\n",
+ cmdname(argv[0]));
+ return -1;
+ }
+
+ return do_xml("xml", argv[1]);
+}
+
static int jt__device(int argc, char **argv)
{
char *arg2[3];
- int rc, ret;
+ int ret;
if (argc < 3) {
fprintf(stderr, "usage: %s devno <command [args ...]>\n",
int threads, next_thread;
int verbose;
int i, j;
- int rc;
if (argc < 5) {
fprintf(stderr,
static int jt_detach(int argc, char **argv)
{
struct obd_ioctl_data data;
- int rc;
IOCINIT(data);
static int jt_cleanup(int argc, char **argv)
{
struct obd_ioctl_data data;
- int rc;
IOCINIT(data);
static int jt_newdev(int argc, char **argv)
{
struct obd_ioctl_data data;
- int rc;
if (getfd(argv[0]))
return -1;
return rc;
}
+static int jt_list(int argc, char **argv)
+{
+ char buf[1024];
+ 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) {
+ fprintf(stderr, "usage: %s\n", cmdname(argv[0]));
+ return -1;
+ }
+
+ rc = ioctl(fd, OBD_IOC_LIST , data);
+ if (rc < 0)
+ fprintf(stderr, "error: %s: %s\n", cmdname(argv[0]),
+ strerror(rc=errno));
+ else {
+ printf("%s", data->ioc_bulk);
+ }
+
+ return rc;
+}
+
static int jt_attach(int argc, char **argv)
{
struct obd_ioctl_data data;
- int rc;
IOCINIT(data);
- if (argc != 2 && argc != 3) {
+ if (argc != 2 && argc != 3 && argc != 4) {
fprintf(stderr, "usage: %s type [name [uuid]]\n",
cmdname(argv[0]));
return -1;
data.ioc_inllen1 = strlen(argv[1]) + 1;
data.ioc_inlbuf1 = argv[1];
- if (argc == 3) {
+ 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];
+ }
+
if (obd_ioctl_pack(&data, &buf, max)) {
fprintf(stderr, "error: %s: invalid ioctl\n", cmdname(argv[0]));
return -2;
if (rc < 0)
fprintf(stderr, "error: %s: %x %s\n", cmdname(argv[0]),
OBD_IOC_ATTACH, strerror(rc = errno));
- else if (argc == 3) {
+ else if (argc == 3) {
char name[1024];
- if (strlen(argv[2]) > 128) {
+ 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);
+ rc = setenv(name, argv[1], 1);
+ if (rc) {
+ printf("error setting env variable %s\n", name);
}
}
static int do_name2dev(char *func, char *name)
{
struct obd_ioctl_data data;
- int rc;
if (getfd(func))
return -1;
static int jt_name2dev(int argc, char **argv)
{
- int rc;
-
if (argc != 2) {
fprintf(stderr, "usage: %s name\n", cmdname(argv[0]));
return -1;
static int jt_setup(int argc, char **argv)
{
struct obd_ioctl_data data;
- int rc;
IOCINIT(data);
int count = 1, next_count;
int verbose;
int i;
- int rc;
IOCINIT(data);
if (argc < 2 || argc > 4) {
static int jt_setattr(int argc, char **argv)
{
struct obd_ioctl_data data;
- int rc;
IOCINIT(data);
if (argc != 2) {
data.ioc_obdo1.o_id = strtoul(argv[1], NULL, 0);
data.ioc_obdo1.o_mode = S_IFREG | strtoul(argv[2], NULL, 0);
- data.ioc_obdo1.o_valid = OBD_MD_FLMODE;
+ data.ioc_obdo1.o_valid = OBD_MD_FLMODE;
rc = ioctl(fd, OBD_IOC_SETATTR , &data);
if (rc < 0)
static int jt_destroy(int argc, char **argv)
{
struct obd_ioctl_data data;
- int rc;
IOCINIT(data);
if (argc != 2) {
static int jt_getattr(int argc, char **argv)
{
struct obd_ioctl_data data;
- int rc;
if (argc != 2) {
fprintf(stderr, "usage: %s id\n", cmdname(argv[0]));
IOCINIT(data);
data.ioc_obdo1.o_id = strtoul(argv[1], NULL, 0);
- /* to help obd filter */
+ /* 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);
struct timeval start, next_time;
int i, count, next_count;
int verbose;
- int rc;
if (argc != 2 && argc != 3) {
fprintf(stderr, "usage: %s count [verbose]\n",cmdname(argv[0]));
int verbose = 1, write = 0, rw;
int i, o, p;
int len;
- int rc;
if (argc < 2 || argc > 6) {
fprintf(stderr,
return -2;
}
IOCINIT(data);
- data.ioc_conn2 = connid;
data.ioc_obdo1.o_id = 2;
data.ioc_count = len;
data.ioc_offset = 0;
data.ioc_plen1 = len;
data.ioc_pbuf1 = bulk;
if (obdos > 1) {
- data.ioc_obdo2.o_id = 2;
+ data.ioc_obdo2.o_id = 3;
data.ioc_plen2 = len;
data.ioc_pbuf2 = bulk + len;
}
* We will put in the start time (and loop count inside the loop)
* at the beginning of each page so that we will be able to validate
* (at some later time) whether the data actually made it or not.
+ *
+ * XXX we do not currently use any of this memory in OBD_IOC_BRW_*
+ * just to avoid the overhead of the copy_{to,from}_user. It
+ * can be fixed if we ever need to send real data around.
*/
for (o = 0, b = bulk; o < obdos; o++)
for (p = 0; p < pages; p++, b += PAGE_SIZE)
return rc;
}
+static int jt_lov_config(int argc, char **argv)
+{
+ struct obd_ioctl_data data;
+ struct lov_desc desc;
+ uuid_t *uuidarray;
+ int size, i;
+ IOCINIT(data);
+
+ if (argc <= 5 ){
+ Parser_printhelp("lovconfig");
+ return -1;
+ }
+
+ if (strlen(argv[1]) > sizeof(uuid_t) - 1) {
+ fprintf(stderr, "lov_config: no %dB memory for uuid's\n",
+ size);
+ return -ENOMEM;
+ }
+
+ memset(&desc, 0, sizeof(desc));
+ strcpy(desc.ld_uuid, argv[1]);
+ desc.ld_default_stripecount = strtoul(argv[2], NULL, 0);
+ desc.ld_default_stripesize = strtoul(argv[3], NULL, 0);
+ desc.ld_pattern = strtoul(argv[4], NULL, 0);
+ desc.ld_tgt_count = argc - 5;
+
+
+ size = sizeof(uuid_t) * desc.ld_tgt_count;
+ uuidarray = malloc(size);
+ if (!uuidarray) {
+ fprintf(stderr, "lov_config: no %dB memory for uuid's\n",
+ size);
+ return -ENOMEM;
+ }
+ memset(uuidarray, 0, size);
+ for (i=5 ; i < argc ; i++) {
+ char *buf = (char *) (uuidarray + i -5 );
+ if (strlen(argv[i]) >= sizeof(uuid_t)) {
+ fprintf(stderr, "lov_config: arg %d (%s) too long\n",
+ i, argv[i]);
+ free(uuidarray);
+ return -EINVAL;
+ }
+ strcpy(buf, argv[i]);
+ }
+
+ data.ioc_inllen1 = sizeof(desc);
+ data.ioc_inlbuf1 = (char *)&desc;
+ data.ioc_inllen2 = size;
+ data.ioc_inlbuf2 = (char *)uuidarray;
+
+ if (obd_ioctl_pack(&data, &buf, max)) {
+ fprintf(stderr, "error: %s: invalid ioctl\n", cmdname(argv[0]));
+ return -EINVAL;
+ }
+
+ rc = ioctl(fd, OBD_IOC_LOV_CONFIG , buf);
+ if (rc < 0)
+ fprintf(stderr, "lov_config: error: %s: %s\n",
+ cmdname(argv[0]),strerror(rc = errno));
+ free(uuidarray);
+ return rc;
+}
+
+
static int jt_test_ldlm(int argc, char **argv)
{
struct obd_ioctl_data data;
- int rc;
IOCINIT(data);
if (argc != 1) {
static int jt_newconn(int argc, char **argv)
{
struct obd_ioctl_data data;
- int rc;
IOCINIT(data);
if (argc != 1) {
return -1;
}
- rc = ioctl(fd, OBD_RECOVD_NEWCONN , &data);
+ rc = ioctl(fd, OBD_IOC_RECOVD_NEWCONN , &data);
if (rc < 0)
fprintf(stderr, "error: %s: %s\n", cmdname(argv[0]),
strerror(rc = errno));
return rc;
}
+static int jt_quit(int argc, char **argv)
+{
+ Parser_quit(argc, argv);
+
+ return rc;
+}
+
command_t cmdlist[] = {
/* Metacommands */
+ {"--xml", jt__xml, 0, "--xml <xml file> <command [args ...]>"},
{"--device", jt__device, 0, "--device <devno> <command [args ...]>"},
{"--threads", jt__threads, 0,
"--threads <threads> <devno> <command [args ...]>"},
/* Device configuration commands */
+ {"lovconfig", jt_lov_config, 0, "configure lov data on MDS "
+ "(usage: lov-uuid stripecount, stripesize, pattern, UUID1, [UUID2, ...])"},
+ {"list", jt_list, 0, "list the devices (no args)"},
{"newdev", jt_newdev, 0, "set device to a new unused obd (no args)"},
{"device", jt_device, 0, "set current device (args device_no name)"},
{"name2dev", jt_name2dev, 0, "set device by name (args name)"},
/* User interface commands */
{"help", Parser_help, 0, "help"},
- {"exit", Parser_quit, 0, "quit"},
- {"quit", Parser_quit, 0, "quit"},
+ {"exit", jt_quit, 0, "quit"},
+ {"quit", jt_quit, 0, "quit"},
{ 0, 0, 0, NULL }
};
static void signal_server(int sig)
{
- if (sig == SIGINT) {
+ if (sig == SIGINT) {
do_disconnect("sigint", 1);
exit(1);
} else {
int main(int argc, char **argv)
{
struct sigaction sigact;
- int rc = 0;
sigact.sa_handler = signal_server;
sigfillset(&sigact.sa_mask);
rc = Parser_execarg(argc - 1, argv + 1, cmdlist);
} else {
Parser_init("obdctl > ", cmdlist);
- Parser_commands();
+ rc = Parser_commands();
}
do_disconnect(argv[0], 1);
git://git.whamcloud.com / fs / lustre-release.git / blobdiff