mirror of
https://github.com/samba-team/samba.git
synced 2025-03-01 04:58:35 +03:00
merge from tridge
(This used to be ctdb commit d7764dec0e9d17290ae310898c147bebe48a0f5c)
This commit is contained in:
commit
b3ca4826f4
@ -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
|
||||
|
||||
@ -49,13 +49,17 @@ showflags:
|
||||
dirs:
|
||||
@mkdir -p $(DIRS)
|
||||
|
||||
bin/ctdb_test: $(OBJS) ctdb_test.o
|
||||
bin/ctdb_test: $(OBJS) tests/ctdb_test.o
|
||||
@echo Linking $@
|
||||
@$(CC) $(CFLAGS) -o $@ ctdb_test.o $(OBJS) $(LIB_FLAGS)
|
||||
@$(CC) $(CFLAGS) -o $@ tests/ctdb_test.o $(OBJS) $(LIB_FLAGS)
|
||||
|
||||
bin/ctdb_bench: $(OBJS) ctdb_bench.o
|
||||
bin/ctdb_bench: $(OBJS) tests/ctdb_bench.o
|
||||
@echo Linking $@
|
||||
@$(CC) $(CFLAGS) -o $@ ctdb_bench.o $(OBJS) $(LIB_FLAGS)
|
||||
@$(CC) $(CFLAGS) -o $@ tests/ctdb_bench.o $(OBJS) $(LIB_FLAGS)
|
||||
|
||||
bin/ctdb_fetch: $(OBJS) tests/ctdb_fetch.o
|
||||
@echo Linking $@
|
||||
@$(CC) $(CFLAGS) -o $@ tests/ctdb_fetch.o $(OBJS) $(LIB_FLAGS)
|
||||
|
||||
bin/ibwrapper_test: $(OBJS) ib/ibwrapper_test.o
|
||||
@echo Linking $@
|
||||
|
@ -205,6 +205,16 @@ static void ctdb_recv_pkt(struct ctdb_context *ctdb, uint8_t *data, uint32_t len
|
||||
return;
|
||||
}
|
||||
|
||||
if (hdr->ctdb_magic != CTDB_MAGIC) {
|
||||
ctdb_set_error(ctdb, "Non CTDB packet rejected\n");
|
||||
return;
|
||||
}
|
||||
|
||||
if (hdr->ctdb_version != CTDB_VERSION) {
|
||||
ctdb_set_error(ctdb, "Bad CTDB version 0x%x rejected\n", hdr->ctdb_version);
|
||||
return;
|
||||
}
|
||||
|
||||
switch (hdr->operation) {
|
||||
case CTDB_REQ_CALL:
|
||||
ctdb_request_call(ctdb, hdr);
|
||||
@ -236,9 +246,9 @@ static void ctdb_recv_pkt(struct ctdb_context *ctdb, uint8_t *data, uint32_t len
|
||||
|
||||
default:
|
||||
printf("Packet with unknown operation %d\n", hdr->operation);
|
||||
talloc_free(hdr);
|
||||
break;
|
||||
}
|
||||
talloc_free(hdr);
|
||||
}
|
||||
|
||||
/*
|
||||
|
@ -56,11 +56,13 @@ static int ctdb_call_local(struct ctdb_db_context *ctdb_db, struct ctdb_call *ca
|
||||
}
|
||||
if (fn == NULL) {
|
||||
ctdb_set_error(ctdb, "Unknown call id %u\n", call->call_id);
|
||||
talloc_free(c);
|
||||
return -1;
|
||||
}
|
||||
|
||||
if (fn->fn(c) != 0) {
|
||||
ctdb_set_error(ctdb, "ctdb_call %u failed\n", call->call_id);
|
||||
talloc_free(c);
|
||||
return -1;
|
||||
}
|
||||
|
||||
@ -79,6 +81,7 @@ static int ctdb_call_local(struct ctdb_db_context *ctdb_db, struct ctdb_call *ca
|
||||
if (c->new_data) {
|
||||
if (ctdb_ltdb_store(ctdb_db, call->key, header, *c->new_data) != 0) {
|
||||
ctdb_set_error(ctdb, "ctdb_call tdb_store failed\n");
|
||||
talloc_free(c);
|
||||
return -1;
|
||||
}
|
||||
}
|
||||
@ -123,8 +126,11 @@ static void ctdb_send_error(struct ctdb_context *ctdb,
|
||||
len = offsetof(struct ctdb_reply_error, msg);
|
||||
r = ctdb->methods->allocate_pkt(ctdb, len + msglen);
|
||||
CTDB_NO_MEMORY_FATAL(ctdb, r);
|
||||
talloc_set_name_const(r, "send_error packet");
|
||||
|
||||
r->hdr.length = len + msglen;
|
||||
r->hdr.ctdb_magic = CTDB_MAGIC;
|
||||
r->hdr.ctdb_version = CTDB_VERSION;
|
||||
r->hdr.operation = CTDB_REPLY_ERROR;
|
||||
r->hdr.destnode = hdr->srcnode;
|
||||
r->hdr.srcnode = ctdb->vnn;
|
||||
@ -152,7 +158,10 @@ static void ctdb_call_send_redirect(struct ctdb_context *ctdb,
|
||||
|
||||
r = ctdb->methods->allocate_pkt(ctdb, sizeof(*r));
|
||||
CTDB_NO_MEMORY_FATAL(ctdb, r);
|
||||
talloc_set_name_const(r, "send_redirect packet");
|
||||
r->hdr.length = sizeof(*r);
|
||||
r->hdr.ctdb_magic = CTDB_MAGIC;
|
||||
r->hdr.ctdb_version = CTDB_VERSION;
|
||||
r->hdr.operation = CTDB_REPLY_REDIRECT;
|
||||
r->hdr.destnode = c->hdr.srcnode;
|
||||
r->hdr.srcnode = ctdb->vnn;
|
||||
@ -183,13 +192,16 @@ static void ctdb_call_send_dmaster(struct ctdb_db_context *ctdb_db,
|
||||
len = offsetof(struct ctdb_req_dmaster, data) + key->dsize + data->dsize;
|
||||
r = ctdb->methods->allocate_pkt(ctdb, len);
|
||||
CTDB_NO_MEMORY_FATAL(ctdb, r);
|
||||
talloc_set_name_const(r, "send_dmaster packet");
|
||||
r->hdr.length = len;
|
||||
r->hdr.ctdb_magic = CTDB_MAGIC;
|
||||
r->hdr.ctdb_version = CTDB_VERSION;
|
||||
r->hdr.operation = CTDB_REQ_DMASTER;
|
||||
r->hdr.destnode = ctdb_lmaster(ctdb, key);
|
||||
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,9 +251,9 @@ 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);
|
||||
ret = ctdb_ltdb_fetch(ctdb_db, key, &header, hdr, &data2);
|
||||
if (ret != 0) {
|
||||
ctdb_fatal(ctdb, "ctdb_req_dmaster failed to fetch record");
|
||||
return;
|
||||
@ -263,7 +275,10 @@ void ctdb_request_dmaster(struct ctdb_context *ctdb, struct ctdb_req_header *hdr
|
||||
len = offsetof(struct ctdb_reply_dmaster, data) + data.dsize;
|
||||
r = ctdb->methods->allocate_pkt(ctdb, len);
|
||||
CTDB_NO_MEMORY_FATAL(ctdb, r);
|
||||
talloc_set_name_const(r, "reply_dmaster packet");
|
||||
r->hdr.length = len;
|
||||
r->hdr.ctdb_magic = CTDB_MAGIC;
|
||||
r->hdr.ctdb_version = CTDB_VERSION;
|
||||
r->hdr.operation = CTDB_REPLY_DMASTER;
|
||||
r->hdr.destnode = c->dmaster;
|
||||
r->hdr.srcnode = ctdb->vnn;
|
||||
@ -314,7 +329,7 @@ void ctdb_request_call(struct ctdb_context *ctdb, struct ctdb_req_header *hdr)
|
||||
fetches the record data (if any), thus avoiding a 2nd fetch of the data
|
||||
if the call will be answered locally */
|
||||
|
||||
ret = ctdb_ltdb_fetch(ctdb_db, call.key, &header, &data);
|
||||
ret = ctdb_ltdb_fetch(ctdb_db, call.key, &header, hdr, &data);
|
||||
if (ret != 0) {
|
||||
ctdb_send_error(ctdb, hdr, ret, "ltdb fetch failed in ctdb_request_call");
|
||||
return;
|
||||
@ -345,7 +360,10 @@ void ctdb_request_call(struct ctdb_context *ctdb, struct ctdb_req_header *hdr)
|
||||
len = offsetof(struct ctdb_reply_call, data) + call.reply_data.dsize;
|
||||
r = ctdb->methods->allocate_pkt(ctdb, len);
|
||||
CTDB_NO_MEMORY_FATAL(ctdb, r);
|
||||
talloc_set_name_const(r, "reply_call packet");
|
||||
r->hdr.length = len;
|
||||
r->hdr.ctdb_magic = CTDB_MAGIC;
|
||||
r->hdr.ctdb_version = CTDB_VERSION;
|
||||
r->hdr.operation = CTDB_REPLY_CALL;
|
||||
r->hdr.destnode = hdr->srcnode;
|
||||
r->hdr.srcnode = hdr->destnode;
|
||||
@ -423,7 +441,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;
|
||||
|
||||
@ -530,6 +547,8 @@ struct ctdb_call_state *ctdb_call_local_send(struct ctdb_db_context *ctdb_db,
|
||||
state = talloc_zero(ctdb_db, struct ctdb_call_state);
|
||||
CTDB_NO_MEMORY_NULL(ctdb, state);
|
||||
|
||||
talloc_steal(state, data->dptr);
|
||||
|
||||
state->state = CTDB_CALL_DONE;
|
||||
state->node = ctdb->nodes[ctdb->vnn];
|
||||
state->call = *call;
|
||||
@ -562,7 +581,7 @@ struct ctdb_call_state *ctdb_call_send(struct ctdb_db_context *ctdb_db, struct c
|
||||
locally. To find out if we are the dmaster we need to look
|
||||
in our ltdb
|
||||
*/
|
||||
ret = ctdb_ltdb_fetch(ctdb_db, call->key, &header, &data);
|
||||
ret = ctdb_ltdb_fetch(ctdb_db, call->key, &header, ctdb_db, &data);
|
||||
if (ret != 0) return NULL;
|
||||
|
||||
if (header.dmaster == ctdb->vnn && !(ctdb->flags & CTDB_FLAG_SELF_CONNECT)) {
|
||||
@ -572,11 +591,17 @@ struct ctdb_call_state *ctdb_call_send(struct ctdb_db_context *ctdb_db, struct c
|
||||
state = talloc_zero(ctdb_db, struct ctdb_call_state);
|
||||
CTDB_NO_MEMORY_NULL(ctdb, state);
|
||||
|
||||
talloc_steal(state, data.dptr);
|
||||
|
||||
len = offsetof(struct ctdb_req_call, data) + call->key.dsize + call->call_data.dsize;
|
||||
state->c = ctdb->methods->allocate_pkt(ctdb, len);
|
||||
CTDB_NO_MEMORY_NULL(ctdb, state->c);
|
||||
talloc_set_name_const(state->c, "req_call packet");
|
||||
talloc_steal(state, state->c);
|
||||
|
||||
state->c->hdr.length = len;
|
||||
state->c->hdr.ctdb_magic = CTDB_MAGIC;
|
||||
state->c->hdr.ctdb_version = CTDB_VERSION;
|
||||
state->c->hdr.operation = CTDB_REQ_CALL;
|
||||
state->c->hdr.destnode = header.dmaster;
|
||||
state->c->hdr.srcnode = ctdb->vnn;
|
||||
@ -624,16 +649,7 @@ 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;
|
||||
|
||||
/* ugly hack to manage forced migration */
|
||||
if (rec != NULL) {
|
||||
rec->data->dptr = talloc_memdup(rec, state->call.reply_data.dptr,
|
||||
state->call.reply_data.dsize);
|
||||
rec->data->dsize = state->call.reply_data.dsize;
|
||||
talloc_free(state);
|
||||
return 0;
|
||||
}
|
||||
struct ctdb_record_handle *rec;
|
||||
|
||||
while (state->state < CTDB_CALL_DONE) {
|
||||
event_loop_once(state->node->ctdb->ev);
|
||||
@ -643,6 +659,17 @@ int ctdb_call_recv(struct ctdb_call_state *state, struct ctdb_call *call)
|
||||
talloc_free(state);
|
||||
return -1;
|
||||
}
|
||||
|
||||
rec = state->fetch_private;
|
||||
|
||||
/* ugly hack to manage forced migration */
|
||||
if (rec != NULL) {
|
||||
rec->data->dptr = talloc_steal(rec, state->call.reply_data.dptr);
|
||||
rec->data->dsize = state->call.reply_data.dsize;
|
||||
talloc_free(state);
|
||||
return 0;
|
||||
}
|
||||
|
||||
if (state->call.reply_data.dsize) {
|
||||
call->reply_data.dptr = talloc_memdup(state->node->ctdb,
|
||||
state->call.reply_data.dptr,
|
||||
@ -691,6 +718,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;
|
||||
@ -711,7 +739,7 @@ int ctdb_record_store(struct ctdb_record_handle *rec, TDB_DATA data)
|
||||
struct ctdb_ltdb_header header;
|
||||
|
||||
/* should be avoided if possible hang header off rec ? */
|
||||
ret = ctdb_ltdb_fetch(rec->ctdb_db, rec->key, &header, NULL);
|
||||
ret = ctdb_ltdb_fetch(rec->ctdb_db, rec->key, &header, NULL, NULL);
|
||||
if (ret) {
|
||||
ctdb_set_error(rec->ctdb_db->ctdb, "Fetch of locally held record failed");
|
||||
return ret;
|
||||
|
@ -137,7 +137,8 @@ static void ltdb_initial_header(struct ctdb_db_context *ctdb_db,
|
||||
returned if the record is not present
|
||||
*/
|
||||
int ctdb_ltdb_fetch(struct ctdb_db_context *ctdb_db,
|
||||
TDB_DATA key, struct ctdb_ltdb_header *header, TDB_DATA *data)
|
||||
TDB_DATA key, struct ctdb_ltdb_header *header,
|
||||
TALLOC_CTX *mem_ctx, TDB_DATA *data)
|
||||
{
|
||||
TDB_DATA rec;
|
||||
struct ctdb_context *ctdb = ctdb_db->ctdb;
|
||||
@ -158,7 +159,8 @@ int ctdb_ltdb_fetch(struct ctdb_db_context *ctdb_db,
|
||||
|
||||
if (data) {
|
||||
data->dsize = rec.dsize - sizeof(struct ctdb_ltdb_header);
|
||||
data->dptr = talloc_memdup(ctdb_db, sizeof(struct ctdb_ltdb_header)+rec.dptr,
|
||||
data->dptr = talloc_memdup(mem_ctx,
|
||||
sizeof(struct ctdb_ltdb_header)+rec.dptr,
|
||||
data->dsize);
|
||||
}
|
||||
|
||||
|
@ -41,13 +41,11 @@ void ctdb_request_message(struct ctdb_context *ctdb, struct ctdb_req_header *hdr
|
||||
if (ctdb->message_handler == NULL) {
|
||||
printf("no msg handler\n");
|
||||
/* no registered message handler */
|
||||
talloc_free(hdr);
|
||||
return;
|
||||
}
|
||||
data.dptr = &c->data[0];
|
||||
data.dsize = c->datalen;
|
||||
ctdb->message_handler(ctdb, c->srvid, data, ctdb->message_private);
|
||||
talloc_free(hdr);
|
||||
}
|
||||
|
||||
|
||||
@ -63,8 +61,11 @@ int ctdb_send_message(struct ctdb_context *ctdb, uint32_t vnn,
|
||||
len = offsetof(struct ctdb_req_message, data) + data.dsize;
|
||||
r = ctdb->methods->allocate_pkt(ctdb, len);
|
||||
CTDB_NO_MEMORY(ctdb, r);
|
||||
talloc_set_name_const(r, "req_message packet");
|
||||
|
||||
r->hdr.length = len;
|
||||
r->hdr.ctdb_magic = CTDB_MAGIC;
|
||||
r->hdr.ctdb_version = CTDB_VERSION;
|
||||
r->hdr.operation = CTDB_REQ_MESSAGE;
|
||||
r->hdr.destnode = vnn;
|
||||
r->hdr.srcnode = ctdb->vnn;
|
||||
|
@ -155,11 +155,16 @@ enum ctdb_operation {
|
||||
CTDB_REQ_MESSAGE = 6
|
||||
};
|
||||
|
||||
#define CTDB_MAGIC 0x43544442 /* CTDB */
|
||||
#define CTDB_VERSION 1
|
||||
|
||||
/*
|
||||
packet structures
|
||||
*/
|
||||
struct ctdb_req_header {
|
||||
uint32_t length;
|
||||
uint32_t ctdb_magic;
|
||||
uint32_t ctdb_version;
|
||||
uint32_t operation;
|
||||
uint32_t destnode;
|
||||
uint32_t srcnode;
|
||||
@ -235,7 +240,8 @@ void ctdb_reply_redirect(struct ctdb_context *ctdb, struct ctdb_req_header *hdr)
|
||||
|
||||
uint32_t ctdb_lmaster(struct ctdb_context *ctdb, const TDB_DATA *key);
|
||||
int ctdb_ltdb_fetch(struct ctdb_db_context *ctdb_db,
|
||||
TDB_DATA key, struct ctdb_ltdb_header *header, TDB_DATA *data);
|
||||
TDB_DATA key, struct ctdb_ltdb_header *header,
|
||||
TALLOC_CTX *mem_ctx, TDB_DATA *data);
|
||||
int ctdb_ltdb_store(struct ctdb_db_context *ctdb_db, TDB_DATA key,
|
||||
struct ctdb_ltdb_header *header, TDB_DATA data);
|
||||
void ctdb_queue_packet(struct ctdb_context *ctdb, struct ctdb_req_header *hdr);
|
||||
|
@ -3,7 +3,7 @@
|
||||
killall -q ctdb_bench
|
||||
|
||||
echo "Trying 2 nodes"
|
||||
bin/ctdb_bench --nlist nodes.txt --listen 127.0.0.2:9001 $* &
|
||||
bin/ctdb_bench --nlist nodes.txt --listen 127.0.0.1:9001 $*
|
||||
bin/ctdb_bench --nlist tests/nodes.txt --listen 127.0.0.2:9001 $* &
|
||||
bin/ctdb_bench --nlist tests/nodes.txt --listen 127.0.0.1:9001 $*
|
||||
|
||||
killall -q ctdb_bench
|
||||
|
8
ctdb/tests/bench1.sh
Executable file
8
ctdb/tests/bench1.sh
Executable file
@ -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
|
286
ctdb/tests/ctdb_fetch.c
Normal file
286
ctdb/tests/ctdb_fetch.c
Normal file
@ -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 <sys/time.h>
|
||||
#include <time.h>
|
||||
|
||||
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;
|
||||
}
|
@ -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 */
|
9
ctdb/tests/fetch.sh
Executable file
9
ctdb/tests/fetch.sh
Executable file
@ -0,0 +1,9 @@
|
||||
#!/bin/sh
|
||||
|
||||
killall -q ctdb_fetch
|
||||
|
||||
echo "Trying 2 nodes"
|
||||
bin/ctdb_fetch --nlist tests/nodes.txt --listen 127.0.0.2:9001 $* &
|
||||
bin/ctdb_fetch --nlist tests/nodes.txt --listen 127.0.0.1:9001 $*
|
||||
|
||||
killall -q ctdb_fetch
|
@ -3,8 +3,8 @@
|
||||
killall -q ctdb_test
|
||||
|
||||
echo "Trying 2 nodes"
|
||||
bin/ctdb_test --nlist nodes.txt --listen 127.0.0.1:9001 &
|
||||
bin/ctdb_test --nlist nodes.txt --listen 127.0.0.2:9001 &
|
||||
bin/ctdb_test --nlist tests/nodes.txt --listen 127.0.0.1:9001 &
|
||||
bin/ctdb_test --nlist tests/nodes.txt --listen 127.0.0.2:9001 &
|
||||
|
||||
sleep 3
|
||||
killall ctdb_test
|
||||
|
Loading…
x
Reference in New Issue
Block a user