From 1b02e88aaf193179d2b1bd30e5ea07bf965bd853 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Sat, 7 Apr 2007 00:03:09 +0000 Subject: r22114: merge from bzr tree (This used to be commit e60a485ff5c5d8deb7c0aea5e49d0c1d0ea4fa37) --- source4/cluster/ctdb/tests/ctdb_bench.c | 113 ++++++++++--- source4/cluster/ctdb/tests/ctdb_fetch.c | 286 ++++++++++++++++++++++++++++++++ source4/cluster/ctdb/tests/ctdb_test.c | 45 +++-- 3 files changed, 407 insertions(+), 37 deletions(-) create mode 100644 source4/cluster/ctdb/tests/ctdb_fetch.c (limited to 'source4') diff --git a/source4/cluster/ctdb/tests/ctdb_bench.c b/source4/cluster/ctdb/tests/ctdb_bench.c index 01a8cc0f15..023c76e7f9 100644 --- a/source4/cluster/ctdb/tests/ctdb_bench.c +++ b/source4/cluster/ctdb/tests/ctdb_bench.c @@ -43,6 +43,7 @@ static double end_timer(void) static int timelimit = 10; static int num_records = 10; +static int num_msgs = 1; static int num_repeats = 100; enum my_functions {FUNC_INCR=1, FUNC_FETCH=2}; @@ -50,7 +51,7 @@ enum my_functions {FUNC_INCR=1, FUNC_FETCH=2}; /* ctdb call function to increment an integer */ -static int incr_func(struct ctdb_call *call) +static int incr_func(struct ctdb_call_info *call) { if (call->record_data.dsize == 0) { call->new_data = talloc(call, TDB_DATA); @@ -70,7 +71,7 @@ static int incr_func(struct ctdb_call *call) /* ctdb call function to fetch a record */ -static int fetch_func(struct ctdb_call *call) +static int fetch_func(struct ctdb_call_info *call) { call->reply_data = &call->record_data; return 0; @@ -79,20 +80,25 @@ static int fetch_func(struct ctdb_call *call) /* benchmark incrementing an integer */ -static void bench_incr(struct ctdb_context *ctdb) +static void bench_incr(struct ctdb_context *ctdb, struct ctdb_db_context *ctdb_db) { - TDB_DATA key, data; int loops=0; int ret, i; + struct ctdb_call call; + + ZERO_STRUCT(call); start_timer(); while (1) { uint32_t v = loops % num_records; - key.dptr = &v; - key.dsize = 4; + + call.call_id = FUNC_INCR; + call.key.dptr = (uint8_t *)&v; + call.key.dsize = 4; + for (i=0;i +#include + +static struct timeval tp1,tp2; + +static void start_timer(void) +{ + gettimeofday(&tp1,NULL); +} + +static double end_timer(void) +{ + gettimeofday(&tp2,NULL); + return (tp2.tv_sec + (tp2.tv_usec*1.0e-6)) - + (tp1.tv_sec + (tp1.tv_usec*1.0e-6)); +} + + +static int timelimit = 10; +static int num_records = 10; +static int num_msgs = 1; + +static int msg_count; + +#define TESTKEY "testkey" + +/* + fetch a record + store a expanded record + send a message to next node to tell it to do the same +*/ +static void bench_fetch_1node(struct ctdb_context *ctdb) +{ + TDB_DATA key, data, nulldata; + struct ctdb_record_handle *rec; + struct ctdb_db_context *ctdb_db; + TALLOC_CTX *tmp_ctx = talloc_new(ctdb); + int dest, ret; + + key.dptr = discard_const("testkey"); + key.dsize = strlen((const char *)key.dptr); + + ctdb_db = ctdb_db_handle(ctdb, "test.tdb"); + + rec = ctdb_fetch_lock(ctdb_db, tmp_ctx, key, &data); + if (rec == NULL) { + printf("Failed to fetch record '%s' on node %d\n", + (const char *)key.dptr, ctdb_get_vnn(ctdb)); + talloc_free(tmp_ctx); + return; + } + + if (data.dsize > 1000) { + data.dsize = 0; + } + + if (data.dsize == 0) { + data.dptr = (uint8_t *)talloc_asprintf(tmp_ctx, "Test data\n"); + } + data.dptr = (uint8_t *)talloc_asprintf_append((char *)data.dptr, + "msg_count=%d on node %d\n", + msg_count, ctdb_get_vnn(ctdb)); + data.dsize = strlen((const char *)data.dptr)+1; + + ret = ctdb_record_store(rec, data); + if (ret != 0) { + printf("Failed to store record\n"); + } + + talloc_free(tmp_ctx); + + /* tell the next node to do the same */ + nulldata.dptr = NULL; + nulldata.dsize = 0; + + dest = (ctdb_get_vnn(ctdb) + 1) % ctdb_get_num_nodes(ctdb); + ctdb_send_message(ctdb, dest, 0, nulldata); +} + +/* + handler for messages in bench_ring() +*/ +static void message_handler(struct ctdb_context *ctdb, uint32_t srvid, + TDB_DATA data, void *private) +{ + msg_count++; + bench_fetch_1node(ctdb); +} + + +/* + benchmark the following: + + fetch a record + store a expanded record + send a message to next node to tell it to do the same + +*/ +static void bench_fetch(struct ctdb_context *ctdb, struct event_context *ev) +{ + int vnn=ctdb_get_vnn(ctdb); + + if (vnn == ctdb_get_num_nodes(ctdb)-1) { + bench_fetch_1node(ctdb); + } + + start_timer(); + + while (end_timer() < timelimit) { + if (vnn == 0 && msg_count % 100 == 0) { + printf("Fetch: %.2f msgs/sec\r", msg_count/end_timer()); + fflush(stdout); + } + if (event_loop_once(ev) != 0) { + printf("Event loop failed!\n"); + break; + } + } + + printf("Fetch: %.2f msgs/sec\n", msg_count/end_timer()); +} + +enum my_functions {FUNC_FETCH=1}; + +/* + ctdb call function to fetch a record +*/ +static int fetch_func(struct ctdb_call_info *call) +{ + call->reply_data = &call->record_data; + return 0; +} + +/* + main program +*/ +int main(int argc, const char *argv[]) +{ + struct ctdb_context *ctdb; + struct ctdb_db_context *ctdb_db; + const char *nlist = NULL; + const char *transport = "tcp"; + const char *myaddress = NULL; + int self_connect=0; + + struct poptOption popt_options[] = { + POPT_AUTOHELP + { "nlist", 0, POPT_ARG_STRING, &nlist, 0, "node list file", "filename" }, + { "listen", 0, POPT_ARG_STRING, &myaddress, 0, "address to listen on", "address" }, + { "transport", 0, POPT_ARG_STRING, &transport, 0, "protocol transport", NULL }, + { "self-connect", 0, POPT_ARG_NONE, &self_connect, 0, "enable self connect", "boolean" }, + { "timelimit", 't', POPT_ARG_INT, &timelimit, 0, "timelimit", "integer" }, + { "num-records", 'r', POPT_ARG_INT, &num_records, 0, "num_records", "integer" }, + { "num-msgs", 'n', POPT_ARG_INT, &num_msgs, 0, "num_msgs", "integer" }, + POPT_TABLEEND + }; + int opt; + const char **extra_argv; + int extra_argc = 0; + int ret; + poptContext pc; + struct event_context *ev; + struct ctdb_call call; + + pc = poptGetContext(argv[0], argc, argv, popt_options, POPT_CONTEXT_KEEP_FIRST); + + while ((opt = poptGetNextOpt(pc)) != -1) { + switch (opt) { + default: + fprintf(stderr, "Invalid option %s: %s\n", + poptBadOption(pc, 0), poptStrerror(opt)); + exit(1); + } + } + + /* setup the remaining options for the main program to use */ + extra_argv = poptGetArgs(pc); + if (extra_argv) { + extra_argv++; + while (extra_argv[extra_argc]) extra_argc++; + } + + if (nlist == NULL || myaddress == NULL) { + printf("You must provide a node list with --nlist and an address with --listen\n"); + exit(1); + } + + ev = event_context_init(NULL); + + /* initialise ctdb */ + ctdb = ctdb_init(ev); + if (ctdb == NULL) { + printf("Failed to init ctdb\n"); + exit(1); + } + + if (self_connect) { + ctdb_set_flags(ctdb, CTDB_FLAG_SELF_CONNECT); + } + + ret = ctdb_set_transport(ctdb, transport); + if (ret == -1) { + printf("ctdb_set_transport failed - %s\n", ctdb_errstr(ctdb)); + exit(1); + } + + /* tell ctdb what address to listen on */ + ret = ctdb_set_address(ctdb, myaddress); + if (ret == -1) { + printf("ctdb_set_address failed - %s\n", ctdb_errstr(ctdb)); + exit(1); + } + + /* tell ctdb what nodes are available */ + ret = ctdb_set_nlist(ctdb, nlist); + if (ret == -1) { + printf("ctdb_set_nlist failed - %s\n", ctdb_errstr(ctdb)); + exit(1); + } + + /* attach to a specific database */ + ctdb_db = ctdb_attach(ctdb, "test.tdb", TDB_DEFAULT, O_RDWR|O_CREAT|O_TRUNC, 0666); + if (!ctdb_db) { + printf("ctdb_attach failed - %s\n", ctdb_errstr(ctdb)); + exit(1); + } + + ret = ctdb_set_call(ctdb_db, fetch_func, FUNC_FETCH); + + ctdb_set_message_handler(ctdb, message_handler, &msg_count); + + /* start the protocol running */ + ret = ctdb_start(ctdb); + + /* wait until all nodes are connected (should not be needed + outside of test code) */ + ctdb_connect_wait(ctdb); + + bench_fetch(ctdb, ev); + + ZERO_STRUCT(call); + call.key.dptr = discard_const(TESTKEY); + call.key.dsize = strlen(TESTKEY); + + /* fetch the record */ + call.call_id = FUNC_FETCH; + call.call_data.dptr = NULL; + call.call_data.dsize = 0; + + ret = ctdb_call(ctdb_db, &call); + if (ret == -1) { + printf("ctdb_call FUNC_FETCH failed - %s\n", ctdb_errstr(ctdb)); + exit(1); + } + + printf("DATA:\n%s\n", (char *)call.reply_data.dptr); + + /* shut it down */ + talloc_free(ctdb); + return 0; +} diff --git a/source4/cluster/ctdb/tests/ctdb_test.c b/source4/cluster/ctdb/tests/ctdb_test.c index 5bc35ad332..908a2eaac7 100644 --- a/source4/cluster/ctdb/tests/ctdb_test.c +++ b/source4/cluster/ctdb/tests/ctdb_test.c @@ -33,7 +33,7 @@ static int int_compare(int *i1, int *i2) /* add an integer into a record in sorted order */ -static int sort_func(struct ctdb_call *call) +static int sort_func(struct ctdb_call_info *call) { if (call->call_data == NULL || call->call_data->dsize != sizeof(int)) { @@ -64,7 +64,7 @@ static int sort_func(struct ctdb_call *call) /* ctdb call function to fetch a record */ -static int fetch_func(struct ctdb_call *call) +static int fetch_func(struct ctdb_call_info *call) { call->reply_data = &call->record_data; return 0; @@ -76,6 +76,7 @@ static int fetch_func(struct ctdb_call *call) int main(int argc, const char *argv[]) { struct ctdb_context *ctdb; + struct ctdb_db_context *ctdb_db; const char *nlist = NULL; const char *transport = "tcp"; const char *myaddress = NULL; @@ -93,9 +94,9 @@ int main(int argc, const char *argv[]) const char **extra_argv; int extra_argc = 0; int i, ret; - TDB_DATA key, data; poptContext pc; struct event_context *ev; + struct ctdb_call call; pc = poptGetContext(argv[0], argc, argv, popt_options, POPT_CONTEXT_KEEP_FIRST); @@ -153,17 +154,17 @@ int main(int argc, const char *argv[]) exit(1); } - /* setup a ctdb call function */ - ret = ctdb_set_call(ctdb, sort_func, FUNC_SORT); - ret = ctdb_set_call(ctdb, fetch_func, FUNC_FETCH); - /* attach to a specific database */ - ret = ctdb_attach(ctdb, "test.tdb", TDB_DEFAULT, O_RDWR|O_CREAT|O_TRUNC, 0666); - if (ret == -1) { + ctdb_db = ctdb_attach(ctdb, "test.tdb", TDB_DEFAULT, O_RDWR|O_CREAT|O_TRUNC, 0666); + if (!ctdb_db) { printf("ctdb_attach failed - %s\n", ctdb_errstr(ctdb)); exit(1); } + /* setup a ctdb call function */ + ret = ctdb_set_call(ctdb_db, sort_func, FUNC_SORT); + ret = ctdb_set_call(ctdb_db, fetch_func, FUNC_FETCH); + /* start the protocol running */ ret = ctdb_start(ctdb); @@ -171,15 +172,19 @@ int main(int argc, const char *argv[]) outide of test code) */ ctdb_connect_wait(ctdb); - key.dptr = "test"; - key.dsize = strlen("test")+1; + ZERO_STRUCT(call); + call.key.dptr = discard_const("test"); + call.key.dsize = strlen("test")+1; /* add some random data */ for (i=0;i<10;i++) { int v = random() % 1000; - data.dptr = (uint8_t *)&v; - data.dsize = sizeof(v); - ret = ctdb_call(ctdb, key, FUNC_SORT, &data, NULL); + + call.call_id = FUNC_SORT; + call.call_data.dptr = (uint8_t *)&v; + call.call_data.dsize = sizeof(v); + + ret = ctdb_call(ctdb_db, &call); if (ret == -1) { printf("ctdb_call FUNC_SORT failed - %s\n", ctdb_errstr(ctdb)); exit(1); @@ -187,16 +192,20 @@ int main(int argc, const char *argv[]) } /* fetch the record */ - ret = ctdb_call(ctdb, key, FUNC_FETCH, NULL, &data); + call.call_id = FUNC_FETCH; + call.call_data.dptr = NULL; + call.call_data.dsize = 0; + + ret = ctdb_call(ctdb_db, &call); if (ret == -1) { printf("ctdb_call FUNC_FETCH failed - %s\n", ctdb_errstr(ctdb)); exit(1); } - for (i=0;i