From: Andrew Tridgell Date: Thu, 5 Apr 2007 03:18:31 +0000 (+1000) Subject: merge fetch code from ronnie, and add a simple fetch test X-Git-Tag: tevent-0.9.20~348^2~2962^2 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=230c97b04d7dc0f222ed19554cf76f4614b2b028;p=thirdparty%2Fsamba.git merge fetch code from ronnie, and add a simple fetch test (This used to be ctdb commit 83b794befd8d34b3da544a483f9d39a3fa140655) --- diff --git a/ctdb/Makefile.in b/ctdb/Makefile.in index 764e78a2502..0bb05225d6f 100644 --- a/ctdb/Makefile.in +++ b/ctdb/Makefile.in @@ -30,7 +30,7 @@ CTDB_OBJ = $(CTDB_COMMON_OBJ) $(CTDB_TCP_OBJ) OBJS = @TDBOBJ@ @TALLOCOBJ@ @LIBREPLACEOBJ@ @INFINIBAND_WRAPPER_OBJ@ $(EXTRA_OBJ) $(EVENTS_OBJ) $(CTDB_OBJ) -BINS = bin/ctdb_test bin/ctdb_bench @INFINIBAND_BINS@ +BINS = bin/ctdb_test bin/ctdb_bench bin/ctdb_fetch @INFINIBAND_BINS@ DIRS = lib bin @@ -57,6 +57,10 @@ bin/ctdb_bench: $(OBJS) ctdb_bench.o @echo Linking $@ @$(CC) $(CFLAGS) -o $@ ctdb_bench.o $(OBJS) $(LIB_FLAGS) +bin/ctdb_fetch: $(OBJS) ctdb_fetch.o + @echo Linking $@ + @$(CC) $(CFLAGS) -o $@ ctdb_fetch.o $(OBJS) $(LIB_FLAGS) + bin/ibwrapper_test: $(OBJS) ib/ibwrapper_test.o @echo Linking $@ @$(CC) $(CFLAGS) -o $@ ib/ibwrapper_test.o $(OBJS) $(LIB_FLAGS) diff --git a/ctdb/common/ctdb_call.c b/ctdb/common/ctdb_call.c index b13e2704360..0b4195140cd 100644 --- a/ctdb/common/ctdb_call.c +++ b/ctdb/common/ctdb_call.c @@ -189,7 +189,7 @@ static void ctdb_call_send_dmaster(struct ctdb_db_context *ctdb_db, r->hdr.srcnode = ctdb->vnn; r->hdr.reqid = c->hdr.reqid; r->db_id = c->db_id; - r->dmaster = header->laccessor; + r->dmaster = c->hdr.srcnode; r->keylen = key->dsize; r->datalen = data->dsize; memcpy(&r->data[0], key->dptr, key->dsize); @@ -239,7 +239,7 @@ void ctdb_request_dmaster(struct ctdb_context *ctdb, struct ctdb_req_header *hdr ctdb_send_error(ctdb, hdr, ret, "Unknown database in request. db_id==0x%08x",c->db_id); return; } - + /* fetch the current record */ ret = ctdb_ltdb_fetch(ctdb_db, key, &header, &data2); if (ret != 0) { @@ -423,7 +423,6 @@ void ctdb_reply_dmaster(struct ctdb_context *ctdb, struct ctdb_req_header *hdr) } ctdb_db = state->ctdb_db; - data.dptr = c->data; data.dsize = c->datalen; @@ -624,7 +623,18 @@ struct ctdb_record_handle { */ int ctdb_call_recv(struct ctdb_call_state *state, struct ctdb_call *call) { - struct ctdb_record_handle *rec = state->fetch_private; + struct ctdb_record_handle *rec; + + while (state->state < CTDB_CALL_DONE) { + event_loop_once(state->node->ctdb->ev); + } + if (state->state != CTDB_CALL_DONE) { + ctdb_set_error(state->node->ctdb, "%s", state->errmsg); + talloc_free(state); + return -1; + } + + rec = state->fetch_private; /* ugly hack to manage forced migration */ if (rec != NULL) { @@ -635,14 +645,6 @@ int ctdb_call_recv(struct ctdb_call_state *state, struct ctdb_call *call) return 0; } - while (state->state < CTDB_CALL_DONE) { - event_loop_once(state->node->ctdb->ev); - } - if (state->state != CTDB_CALL_DONE) { - ctdb_set_error(state->node->ctdb, "%s", state->errmsg); - talloc_free(state); - return -1; - } if (state->call.reply_data.dsize) { call->reply_data.dptr = talloc_memdup(state->node->ctdb, state->call.reply_data.dptr, @@ -691,6 +693,7 @@ struct ctdb_record_handle *ctdb_fetch_lock(struct ctdb_db_context *ctdb_db, TALL rec->ctdb_db = ctdb_db; rec->key = key; rec->key.dptr = talloc_memdup(rec, key.dptr, key.dsize); + rec->data = data; state = ctdb_call_send(ctdb_db, &call); state->fetch_private = rec; diff --git a/ctdb/ctdb_fetch.c b/ctdb/ctdb_fetch.c new file mode 100644 index 00000000000..c0491e9bb5a --- /dev/null +++ b/ctdb/ctdb_fetch.c @@ -0,0 +1,286 @@ +/* + simple ctdb benchmark + + Copyright (C) Andrew Tridgell 2006 + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2 of the License, or (at your option) any later version. + + This library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with this library; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +*/ + +#include "includes.h" +#include "lib/events/events.h" +#include "system/filesys.h" +#include "popt.h" + +#include +#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/ctdb/ctdb_test.c b/ctdb/ctdb_test.c index 752acd373de..908a2eaac75 100644 --- a/ctdb/ctdb_test.c +++ b/ctdb/ctdb_test.c @@ -173,7 +173,7 @@ int main(int argc, const char *argv[]) ctdb_connect_wait(ctdb); ZERO_STRUCT(call); - call.key.dptr = "test"; + call.key.dptr = discard_const("test"); call.key.dsize = strlen("test")+1; /* add some random data */ diff --git a/ctdb/tests/bench1.sh b/ctdb/tests/bench1.sh new file mode 100755 index 00000000000..3481d82be29 --- /dev/null +++ b/ctdb/tests/bench1.sh @@ -0,0 +1,8 @@ +#!/bin/sh + +killall -q ctdb_bench + +echo "Trying 1 nodes" +bin/ctdb_bench --nlist tests/1node.txt --listen 127.0.0.2:9001 $* + +killall -q ctdb_bench diff --git a/ctdb/tests/fetch.sh b/ctdb/tests/fetch.sh new file mode 100755 index 00000000000..fd23e67f274 --- /dev/null +++ b/ctdb/tests/fetch.sh @@ -0,0 +1,9 @@ +#!/bin/sh + +killall -q ctdb_fetch + +echo "Trying 2 nodes" +bin/ctdb_fetch --nlist nodes.txt --listen 127.0.0.2:9001 $* & +bin/ctdb_fetch --nlist nodes.txt --listen 127.0.0.1:9001 $* + +killall -q ctdb_fetch