summaryrefslogtreecommitdiff
path: root/source4/cluster/ctdb/common
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2007-04-05 03:51:49 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 14:49:48 -0500
commit66156220ebf5dc212e9aa86015b7301d1b665b50 (patch)
tree08bebff7187077845d1a81ae37d14d1bbf10cd3b /source4/cluster/ctdb/common
parent7196090bfd73ab64fd0095ce3ed612bc7978a810 (diff)
downloadsamba-66156220ebf5dc212e9aa86015b7301d1b665b50.tar.gz
samba-66156220ebf5dc212e9aa86015b7301d1b665b50.tar.bz2
samba-66156220ebf5dc212e9aa86015b7301d1b665b50.zip
r22082: merged the ctdb changes from bzr
added opendb ctdb backend from ronnie (This used to be commit b0da25cb79f860bfa14ba7a8419c7996d936292b)
Diffstat (limited to 'source4/cluster/ctdb/common')
-rw-r--r--source4/cluster/ctdb/common/ctdb_call.c93
-rw-r--r--source4/cluster/ctdb/common/ctdb_ltdb.c42
2 files changed, 123 insertions, 12 deletions
diff --git a/source4/cluster/ctdb/common/ctdb_call.c b/source4/cluster/ctdb/common/ctdb_call.c
index 75355f7ae7..0b4195140c 100644
--- a/source4/cluster/ctdb/common/ctdb_call.c
+++ b/source4/cluster/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) {
@@ -329,9 +329,12 @@ void ctdb_request_call(struct ctdb_context *ctdb, struct ctdb_req_header *hdr)
}
/* if this nodes has done enough consecutive calls on the same record
- then give them the record */
- if (header.laccessor == c->hdr.srcnode &&
- header.lacount >= ctdb->max_lacount) {
+ then give them the record
+ or if the node requested an immediate migration
+ */
+ if ( (header.laccessor == c->hdr.srcnode
+ && header.lacount >= ctdb->max_lacount)
+ || c->flags&CTDB_IMMEDIATE_MIGRATION ) {
ctdb_call_send_dmaster(ctdb_db, c, &header, &call.key, &data);
talloc_free(data.dptr);
return;
@@ -373,6 +376,7 @@ struct ctdb_call_state {
struct ctdb_call call;
int redirect_count;
struct ctdb_ltdb_header header;
+ void *fetch_private;
};
@@ -419,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;
@@ -578,6 +581,7 @@ struct ctdb_call_state *ctdb_call_send(struct ctdb_db_context *ctdb_db, struct c
state->c->hdr.srcnode = ctdb->vnn;
/* this limits us to 16k outstanding messages - not unreasonable */
state->c->hdr.reqid = idr_get_new(ctdb->idr, state, 0xFFFF);
+ state->c->flags = call->flags;
state->c->db_id = ctdb_db->db_id;
state->c->callid = call->call_id;
state->c->keylen = call->key.dsize;
@@ -604,6 +608,13 @@ struct ctdb_call_state *ctdb_call_send(struct ctdb_db_context *ctdb_db, struct c
}
+
+struct ctdb_record_handle {
+ struct ctdb_db_context *ctdb_db;
+ TDB_DATA key;
+ TDB_DATA *data;
+};
+
/*
make a remote ctdb call - async recv.
@@ -612,6 +623,8 @@ struct ctdb_call_state *ctdb_call_send(struct ctdb_db_context *ctdb_db, struct c
*/
int ctdb_call_recv(struct ctdb_call_state *state, struct ctdb_call *call)
{
+ struct ctdb_record_handle *rec;
+
while (state->state < CTDB_CALL_DONE) {
event_loop_once(state->node->ctdb->ev);
}
@@ -620,6 +633,18 @@ 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_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;
+ }
+
if (state->call.reply_data.dsize) {
call->reply_data.dptr = talloc_memdup(state->node->ctdb,
state->call.reply_data.dptr,
@@ -643,3 +668,59 @@ int ctdb_call(struct ctdb_db_context *ctdb_db, struct ctdb_call *call)
state = ctdb_call_send(ctdb_db, call);
return ctdb_call_recv(state, call);
}
+
+
+
+
+
+
+struct ctdb_record_handle *ctdb_fetch_lock(struct ctdb_db_context *ctdb_db, TALLOC_CTX *mem_ctx,
+ TDB_DATA key, TDB_DATA *data)
+{
+ struct ctdb_call call;
+ struct ctdb_record_handle *rec;
+ struct ctdb_call_state *state;
+ int ret;
+
+ ZERO_STRUCT(call);
+ call.call_id = CTDB_FETCH_FUNC;
+ call.key = key;
+ call.flags = CTDB_IMMEDIATE_MIGRATION;
+
+ rec = talloc(mem_ctx, struct ctdb_record_handle);
+ CTDB_NO_MEMORY_NULL(ctdb_db->ctdb, rec);
+
+ 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;
+
+ ret = ctdb_call_recv(state, &call);
+ if (ret != 0) {
+ talloc_free(rec);
+ return NULL;
+ }
+
+ return rec;
+}
+
+
+int ctdb_record_store(struct ctdb_record_handle *rec, TDB_DATA data)
+{
+ int ret;
+ 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);
+ if (ret) {
+ ctdb_set_error(rec->ctdb_db->ctdb, "Fetch of locally held record failed");
+ return ret;
+ }
+
+ ret = ctdb_ltdb_store(rec->ctdb_db, rec->key, &header, data);
+
+ return ret;
+}
diff --git a/source4/cluster/ctdb/common/ctdb_ltdb.c b/source4/cluster/ctdb/common/ctdb_ltdb.c
index 189816229f..ceedb6c5ce 100644
--- a/source4/cluster/ctdb/common/ctdb_ltdb.c
+++ b/source4/cluster/ctdb/common/ctdb_ltdb.c
@@ -41,6 +41,17 @@ struct ctdb_db_context *ctdb_db_handle(struct ctdb_context *ctdb, const char *na
return NULL;
}
+
+/*
+ this is the dummy null procedure that all databases support
+*/
+static int ctdb_fetch_func(struct ctdb_call_info *call)
+{
+ call->reply_data = &call->record_data;
+ return 0;
+}
+
+
/*
attach to a specific database
*/
@@ -49,6 +60,7 @@ struct ctdb_db_context *ctdb_attach(struct ctdb_context *ctdb, const char *name,
{
struct ctdb_db_context *ctdb_db, *tmp_db;
TDB_DATA data;
+ int ret;
ctdb_db = talloc_zero(ctdb, struct ctdb_db_context);
CTDB_NO_MEMORY_NULL(ctdb, ctdb_db);
@@ -80,7 +92,18 @@ struct ctdb_db_context *ctdb_attach(struct ctdb_context *ctdb, const char *name,
return NULL;
}
+
+ /*
+ all databases support the "fetch" function. we need this in order to do forced migration of records
+ */
+ ret = ctdb_set_call(ctdb_db, ctdb_fetch_func, CTDB_FETCH_FUNC);
+ if (ret != 0) {
+ talloc_free(ctdb_db);
+ return NULL;
+ }
+
DLIST_ADD(ctdb->db_list, ctdb_db);
+
return ctdb_db;
}
@@ -124,18 +147,25 @@ int ctdb_ltdb_fetch(struct ctdb_db_context *ctdb_db,
/* return an initial header */
free(rec.dptr);
ltdb_initial_header(ctdb_db, key, header);
- data->dptr = NULL;
- data->dsize = 0;
+ if (data) {
+ data->dptr = NULL;
+ data->dsize = 0;
+ }
return 0;
}
*header = *(struct ctdb_ltdb_header *)rec.dptr;
- data->dsize = rec.dsize - sizeof(struct ctdb_ltdb_header);
- data->dptr = talloc_memdup(ctdb_db, sizeof(struct ctdb_ltdb_header)+rec.dptr,
- data->dsize);
+ 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->dsize);
+ }
+
free(rec.dptr);
- CTDB_NO_MEMORY(ctdb, data->dptr);
+ if (data) {
+ CTDB_NO_MEMORY(ctdb, data->dptr);
+ }
return 0;
}