X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre%2Futils%2Fobdctl.c;h=9f817569f2ea709c9d838ace69bed0808151ffe3;hp=31fbfc3cc6d4a9bdac2b47e9b368f05f078e3a50;hb=3bd162312750c55fed587748ef73bceb983f511e;hpb=2ad1df3c62663ce61e82856ebe4f576f751d617d diff --git a/lustre/utils/obdctl.c b/lustre/utils/obdctl.c index 31fbfc3..9f81756 100644 --- a/lustre/utils/obdctl.c +++ b/lustre/utils/obdctl.c @@ -22,6 +22,7 @@ * */ + #include #include #include @@ -30,6 +31,7 @@ #include #include #include +#include #include #define printk printf @@ -37,6 +39,9 @@ #include #include +#include +#include + #include #include #include @@ -52,12 +57,18 @@ #include "parser.h" #include +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; char rawbuf[8192]; char *buf = rawbuf; int max = 8192; int thread; +int rc = 0; #define IOCINIT(data) \ do { \ @@ -146,9 +157,15 @@ int getfd(char *func) return 0; } +#if 1 #define difftime(a, b) \ ((double)(a)->tv_sec - (b)->tv_sec + \ ((double)((a)->tv_usec - (b)->tv_usec) / 1000000)) +#else + +#define difftime(a, b) (((a)->tv_sec - (b)->tv_sec) + \ + (((a)->tv_usec - (b)->tv_usec) / 1000000)) +#endif static int be_verbose(int verbose, struct timeval *next_time, int num, int *next_num, int num_total) @@ -193,7 +210,14 @@ static int get_verbose(const char *arg) else if (arg[0] == 's' || arg[0] == 'q') verbose = 0; else - verbose = strtoul(arg, NULL, 0); + verbose = (int) strtoul(arg, NULL, 0); + + 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; } @@ -201,7 +225,6 @@ static int get_verbose(const char *arg) static int do_disconnect(char *func, int verbose) { struct obd_ioctl_data data; - int rc; if (connid == -1) return 0; @@ -224,6 +247,449 @@ static int do_disconnect(char *func, int verbose) 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); +} + +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: tag required\n"); + free(net); + return NULL; + } + + return net; +} + +static int xml_mds(xmlDocPtr doc, xmlNodePtr root, + char *serv_id, 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); + + cur = cur->next; + } + + if ((fstype == NULL) || (device == NULL)) { + printf("error: and tags required\n"); + return -1; + } + + if ((rc = xml_command("newdev", NULL)) != 0) + return rc; + + if ((rc = xml_command("attach", "mds", "MDSDEV", 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_id, char *serv_uuid) { + xmlNodePtr cur = root->xmlChildrenNode; + char *obdtype, *format = NULL, *fstype = NULL, *device = NULL; + 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 and 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, "OBDDEV", 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_id, char *serv_uuid) { + int rc; + + printf("--- Setting up OST ---\n"); + if ((rc = xml_command("newdev", NULL)) != 0) + return rc; + + if ((rc = xml_command("attach", "ost", "OSTDEV", NULL)) != 0) + return rc; + + if ((rc = xml_command("setup", "$OBDDEV", NULL)) != 0) + return rc; + + return 0; +} + +static int xml_osc(xmlDocPtr doc, xmlNodePtr root, + char *serv_id, char *serv_uuid) { + xmlNodePtr cur = root->xmlChildrenNode; + network_t *net = NULL; + int rc = 0; + + printf("--- Setting up OSC ---\n"); + while (cur != NULL) { + if (!xmlStrcmp(cur->name, "network")) { + net = xml_network(doc, cur); + if (net == NULL) + return -1; + } + cur = cur->next; + } + + if (net == NULL) { + printf("error: tag required\n"); + return -1; + } + + if ((rc = xml_command("newdev", NULL)) != 0) { + rc = -1; + goto xml_osc_error; + } + + if ((rc = xml_command("attach", "osc", "OSCDEV", NULL)) != 0) { + rc = -1; + goto xml_osc_error; + } + + if ((rc = xml_command("setup", "OSTDEV", net->server, NULL)) != 0) { + rc = -1; + goto xml_osc_error; + } + +xml_osc_error: + free(net); + return rc; +} + +static int xml_mdc(xmlDocPtr doc, xmlNodePtr root, + char *serv_id, char *serv_uuid) { + xmlNodePtr cur = root->xmlChildrenNode; + network_t *net = NULL; + int rc = 0; + + printf("--- Setting up MDC ---\n"); + while (cur != NULL) { + if (!xmlStrcmp(cur->name, "network")) { + net = xml_network(doc, cur); + if (net == NULL) + return -1; + } + cur = cur->next; + } + + if (net == NULL) { + printf("error: tag required\n"); + return -1; + } + + if ((rc = xml_command("newdev", NULL)) != 0) { + rc = -1; + goto xml_mdc_error; + } + + if ((rc = xml_command("attach", "mdc", "MDCDEV", NULL)) != 0) { + rc = -1; + goto xml_mdc_error; + } + + if ((rc = xml_command("setup", "MDSDEV", net->server, NULL)) != 0) { + rc = -1; + goto xml_mdc_error; + } + +xml_mdc_error: + free(net); + return rc; +} + +static int xml_lov(xmlDocPtr doc, xmlNodePtr root, + char *serv_id, char *serv_uuid) { + printf("--- Setting up LOV ---\n"); + return 0; +} + +static int xml_router(xmlDocPtr doc, xmlNodePtr root, + char *serv_id, char *serv_uuid) { + printf("--- Setting up ROUTER ---\n"); + return 0; +} + +static int xml_ldlm(xmlDocPtr doc, xmlNodePtr root, + char *serv_id, 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", "LDLMDEV", 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_id, char *serv_uuid) { + xmlNodePtr cur = root; + char *id, *uuid; + + while (cur != NULL) { + id = xmlGetProp(cur, "id"); + uuid = xmlGetProp(cur, "uuid"); + + if (xmlStrcmp(id, serv_id) || + xmlStrcmp(uuid, serv_uuid)) { + cur = cur->next; + continue; + } + + if (!xmlStrcmp(cur->name, "mds")) + return xml_mds(doc, cur, serv_id, serv_uuid); + else if (!xmlStrcmp(cur->name, "obd")) + return xml_obd(doc, cur, serv_id, serv_uuid); + else if (!xmlStrcmp(cur->name, "ost")) + return xml_ost(doc, cur, serv_id, serv_uuid); + else if (!xmlStrcmp(cur->name, "osc")) + return xml_osc(doc, cur, serv_id, serv_uuid); + else if (!xmlStrcmp(cur->name, "mdc")) + return xml_mdc(doc, cur, serv_id, serv_uuid); + else if (!xmlStrcmp(cur->name, "lov")) + return xml_lov(doc, cur, serv_id, serv_uuid); + else if (!xmlStrcmp(cur->name, "router")) + return xml_router(doc, cur, serv_id, serv_uuid); + else if (!xmlStrcmp(cur->name, "ldlm")) + return xml_ldlm(doc, cur, serv_id, serv_uuid); + else + return -1; + + cur = cur->next; + } + + printf("error: No XML config branch for id=%s uuid=%s\n", + serv_id, serv_uuid); + return -1; +} + +static int xml_profile(xmlDocPtr doc, xmlNodePtr root, + int prof_num, char *prof_id, char *prof_uuid) { + xmlNodePtr parent, cur = root; + char *id, *uuid, *srv_id, *srv_uuid; + int rc = 0, num; + + while (cur != NULL) { + id = xmlGetProp(cur, "id"); + uuid = xmlGetProp(cur, "uuid"); + + if (xmlStrcmp(cur->name, "profile") || + xmlStrcmp(id, prof_id) || + 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_id = xmlGetProp(cur, "id"), + 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 *id, *uuid; + int rc = 0, num; + + /* Walk the node tags looking for ours */ + while (cur != NULL) { + if (xmlStrcmp(cur->name, "node")) { + cur = cur->next; + continue; + } + + id = xmlGetProp(cur, "id"); + if (id == NULL) + return -1; + + uuid = xmlGetProp(cur, "uuid"); + if (uuid == NULL) + return -1; + + /* FIXME: Verify our ID 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, "id"), + 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 != \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; @@ -245,8 +711,6 @@ static int do_device(char *func, int dev) static int jt_device(int argc, char **argv) { - int rc; - do_disconnect(argv[0], 1); if (argc != 2) { @@ -266,7 +730,6 @@ static int jt_device(int argc, char **argv) static int jt_connect(int argc, char **argv) { struct obd_ioctl_data data; - int rc; IOCINIT(data); @@ -297,10 +760,21 @@ static int jt_disconnect(int argc, char **argv) return do_disconnect(argv[0], 0); } +static int jt__xml(int argc, char **argv) +{ + if (argc < 2) { + fprintf(stderr, "usage: %s \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 \n", @@ -331,7 +805,6 @@ static int jt__threads(int argc, char **argv) int threads, next_thread; int verbose; int i, j; - int rc; if (argc < 5) { fprintf(stderr, @@ -402,7 +875,6 @@ static int jt__threads(int argc, char **argv) static int jt_detach(int argc, char **argv) { struct obd_ioctl_data data; - int rc; IOCINIT(data); @@ -427,7 +899,6 @@ static int jt_detach(int argc, char **argv) static int jt_cleanup(int argc, char **argv) { struct obd_ioctl_data data; - int rc; IOCINIT(data); @@ -447,7 +918,6 @@ static int jt_cleanup(int argc, char **argv) static int jt_newdev(int argc, char **argv) { struct obd_ioctl_data data; - int rc; if (getfd(argv[0])) return -1; @@ -473,7 +943,6 @@ static int jt_newdev(int argc, char **argv) static int jt_attach(int argc, char **argv) { struct obd_ioctl_data data; - int rc; IOCINIT(data); @@ -499,16 +968,16 @@ static int jt_attach(int argc, char **argv) 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); } } @@ -520,7 +989,6 @@ static int jt_attach(int argc, char **argv) static int do_name2dev(char *func, char *name) { struct obd_ioctl_data data; - int rc; if (getfd(func)) return -1; @@ -548,8 +1016,6 @@ static int do_name2dev(char *func, char *name) static int jt_name2dev(int argc, char **argv) { - int rc; - if (argc != 2) { fprintf(stderr, "usage: %s name\n", cmdname(argv[0])); return -1; @@ -568,7 +1034,6 @@ static int jt_name2dev(int argc, char **argv) static int jt_setup(int argc, char **argv) { struct obd_ioctl_data data; - int rc; IOCINIT(data); @@ -617,7 +1082,6 @@ static int jt_create(int argc, char **argv) int count = 1, next_count; int verbose; int i; - int rc; IOCINIT(data); if (argc < 2 || argc > 4) { @@ -656,7 +1120,6 @@ static int jt_create(int argc, char **argv) static int jt_setattr(int argc, char **argv) { struct obd_ioctl_data data; - int rc; IOCINIT(data); if (argc != 2) { @@ -666,7 +1129,7 @@ static int jt_setattr(int argc, char **argv) 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) @@ -679,7 +1142,6 @@ static int jt_setattr(int argc, char **argv) static int jt_destroy(int argc, char **argv) { struct obd_ioctl_data data; - int rc; IOCINIT(data); if (argc != 2) { @@ -701,7 +1163,6 @@ static int jt_destroy(int argc, char **argv) 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])); @@ -710,7 +1171,7 @@ static int jt_getattr(int argc, char **argv) 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); @@ -732,7 +1193,6 @@ static int jt_test_getattr(int argc, char **argv) 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])); @@ -742,7 +1202,10 @@ static int jt_test_getattr(int argc, char **argv) IOCINIT(data); count = strtoul(argv[1], NULL, 0); - verbose = get_verbose(argv[2]); + if (argc == 3) + verbose = get_verbose(argv[2]); + else + verbose = 1; data.ioc_obdo1.o_valid = 0xffffffff; data.ioc_obdo1.o_id = 2; @@ -758,9 +1221,11 @@ static int jt_test_getattr(int argc, char **argv) fprintf(stderr, "error: %s: #%d - %s\n", cmdname(argv[0]), i, strerror(rc = errno)); break; - } else if (be_verbose(verbose, &next_time, i,&next_count,count)) + } else { + if (be_verbose(verbose, &next_time, i,&next_count,count)) printf("%s: got attr #%d\n", cmdname(argv[0]), i); - } + } + } if (!rc) { struct timeval end; @@ -787,7 +1252,6 @@ static int jt_test_brw(int argc, char **argv) int verbose = 1, write = 0, rw; int i, o, p; int len; - int rc; if (argc < 2 || argc > 6) { fprintf(stderr, @@ -834,7 +1298,7 @@ static int jt_test_brw(int argc, char **argv) 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; } @@ -851,6 +1315,10 @@ static int jt_test_brw(int argc, char **argv) * 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) @@ -898,7 +1366,6 @@ static int jt_test_brw(int argc, char **argv) static int jt_test_ldlm(int argc, char **argv) { struct obd_ioctl_data data; - int rc; IOCINIT(data); if (argc != 1) { @@ -916,7 +1383,6 @@ static int jt_test_ldlm(int argc, char **argv) static int jt_newconn(int argc, char **argv) { struct obd_ioctl_data data; - int rc; IOCINIT(data); if (argc != 1) { @@ -924,7 +1390,7 @@ static int jt_newconn(int argc, char **argv) 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)); @@ -932,8 +1398,16 @@ static int jt_newconn(int argc, char **argv) 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 "}, {"--device", jt__device, 0, "--device "}, {"--threads", jt__threads, 0, "--threads "}, @@ -964,15 +1438,15 @@ command_t cmdlist[] = { /* 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 { @@ -983,7 +1457,6 @@ static void signal_server(int sig) int main(int argc, char **argv) { struct sigaction sigact; - int rc = 0; sigact.sa_handler = signal_server; sigfillset(&sigact.sa_mask); @@ -995,7 +1468,7 @@ int main(int argc, char **argv) rc = Parser_execarg(argc - 1, argv + 1, cmdlist); } else { Parser_init("obdctl > ", cmdlist); - Parser_commands(); + rc = Parser_commands(); } do_disconnect(argv[0], 1);