svn commit: samba r21232 - in
branches/SAMBA_4_0/source/cluster/ctdb: . common include
tridge at samba.org
tridge at samba.org
Thu Feb 8 02:57:10 GMT 2007
Author: tridge
Date: 2007-02-08 02:57:08 +0000 (Thu, 08 Feb 2007)
New Revision: 21232
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=21232
Log:
added a raw ctdb messaging api - allowing ctdb applications to take
advantage of the ctdb messaging layer for their own data
Added:
branches/SAMBA_4_0/source/cluster/ctdb/common/ctdb_message.c
Modified:
branches/SAMBA_4_0/source/cluster/ctdb/common/ctdb.c
branches/SAMBA_4_0/source/cluster/ctdb/common/ctdb_call.c
branches/SAMBA_4_0/source/cluster/ctdb/config.mk
branches/SAMBA_4_0/source/cluster/ctdb/include/ctdb.h
branches/SAMBA_4_0/source/cluster/ctdb/include/ctdb_private.h
Changeset:
Modified: branches/SAMBA_4_0/source/cluster/ctdb/common/ctdb.c
===================================================================
--- branches/SAMBA_4_0/source/cluster/ctdb/common/ctdb.c 2007-02-08 02:17:29 UTC (rev 21231)
+++ branches/SAMBA_4_0/source/cluster/ctdb/common/ctdb.c 2007-02-08 02:57:08 UTC (rev 21232)
@@ -212,6 +212,10 @@
ctdb_reply_dmaster(ctdb, hdr);
break;
+ case CTDB_REQ_MESSAGE:
+ ctdb_request_message(ctdb, hdr);
+ break;
+
default:
printf("Packet with unknown operation %d\n", hdr->operation);
talloc_free(hdr);
@@ -267,6 +271,20 @@
}
}
+
+/*
+ queue a packet or die
+*/
+void ctdb_queue_packet(struct ctdb_context *ctdb, struct ctdb_req_header *hdr)
+{
+ struct ctdb_node *node;
+ node = ctdb->nodes[hdr->destnode];
+ if (ctdb->methods->queue_pkt(node, (uint8_t *)hdr, hdr->length) != 0) {
+ ctdb_fatal(ctdb, "Unable to queue packet\n");
+ }
+}
+
+
static const struct ctdb_upcalls ctdb_upcalls = {
.recv_pkt = ctdb_recv_pkt,
.node_dead = ctdb_node_dead,
Modified: branches/SAMBA_4_0/source/cluster/ctdb/common/ctdb_call.c
===================================================================
--- branches/SAMBA_4_0/source/cluster/ctdb/common/ctdb_call.c 2007-02-08 02:17:29 UTC (rev 21231)
+++ branches/SAMBA_4_0/source/cluster/ctdb/common/ctdb_call.c 2007-02-08 02:57:08 UTC (rev 21232)
@@ -29,19 +29,6 @@
#include "../include/ctdb_private.h"
/*
- queue a packet or die
-*/
-static void ctdb_queue_packet(struct ctdb_context *ctdb, struct ctdb_req_header *hdr)
-{
- struct ctdb_node *node;
- node = ctdb->nodes[hdr->destnode];
- if (ctdb->methods->queue_pkt(node, (uint8_t *)hdr, hdr->length) != 0) {
- ctdb_fatal(ctdb, "Unable to queue packet\n");
- }
-}
-
-
-/*
local version of ctdb_call
*/
static int ctdb_call_local(struct ctdb_context *ctdb, struct ctdb_call *call,
Added: branches/SAMBA_4_0/source/cluster/ctdb/common/ctdb_message.c
===================================================================
--- branches/SAMBA_4_0/source/cluster/ctdb/common/ctdb_message.c 2007-02-08 02:17:29 UTC (rev 21231)
+++ branches/SAMBA_4_0/source/cluster/ctdb/common/ctdb_message.c 2007-02-08 02:57:08 UTC (rev 21232)
@@ -0,0 +1,91 @@
+/*
+ ctdb_message protocol code
+
+ Copyright (C) Andrew Tridgell 2007
+
+ 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
+*/
+/*
+ see http://wiki.samba.org/index.php/Samba_%26_Clustering for
+ protocol design and packet details
+*/
+#include "includes.h"
+#include "lib/events/events.h"
+#include "lib/tdb/include/tdb.h"
+#include "system/network.h"
+#include "system/filesys.h"
+#include "../include/ctdb_private.h"
+
+
+/*
+ called when a CTDB_REQ_MESSAGE packet comes in
+
+ this dispatches the messages to the registered ctdb message handler
+*/
+void ctdb_request_message(struct ctdb_context *ctdb, struct ctdb_req_header *hdr)
+{
+ struct ctdb_req_message *c = (struct ctdb_req_message *)hdr;
+ TDB_DATA data;
+ if (ctdb->message_handler == NULL) {
+ /* 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);
+}
+
+
+/*
+ send a ctdb message
+*/
+int ctdb_send_message(struct ctdb_context *ctdb, uint32_t vnn,
+ uint32_t srvid, uint32_t msg_type, TDB_DATA data)
+{
+ struct ctdb_req_message *r;
+ int len;
+
+ len = offsetof(struct ctdb_req_message, data) + data.dsize;
+ r = ctdb->methods->allocate_pkt(ctdb, len);
+ CTDB_NO_MEMORY(ctdb, r);
+
+ r->hdr.length = len;
+ r->hdr.operation = CTDB_REQ_MESSAGE;
+ r->hdr.destnode = vnn;
+ r->hdr.srcnode = ctdb->vnn;
+ r->hdr.reqid = 0;
+ r->srvid = srvid;
+ r->datalen = data.dsize;
+ memcpy(&r->data[0], data.dptr, data.dsize);
+
+ ctdb_queue_packet(ctdb, &r->hdr);
+
+ talloc_free(r);
+ return 0;
+}
+
+/*
+ setup handler for receipt of ctdb messages from ctdb_send_message()
+*/
+int ctdb_set_message_handler(struct ctdb_context *ctdb, ctdb_message_fn_t handler,
+ void *private)
+{
+ ctdb->message_handler = handler;
+ ctdb->message_private = private;
+ return 0;
+}
+
Modified: branches/SAMBA_4_0/source/cluster/ctdb/config.mk
===================================================================
--- branches/SAMBA_4_0/source/cluster/ctdb/config.mk 2007-02-08 02:17:29 UTC (rev 21231)
+++ branches/SAMBA_4_0/source/cluster/ctdb/config.mk 2007-02-08 02:57:08 UTC (rev 21232)
@@ -18,6 +18,7 @@
ctdb_cluster.o \
common/ctdb.o \
common/ctdb_call.o \
+ common/ctdb_message.o \
common/ctdb_ltdb.o \
common/ctdb_util.o
PRIVATE_DEPENDENCIES = ctdb_tcp
Modified: branches/SAMBA_4_0/source/cluster/ctdb/include/ctdb.h
===================================================================
--- branches/SAMBA_4_0/source/cluster/ctdb/include/ctdb.h 2007-02-08 02:17:29 UTC (rev 21231)
+++ branches/SAMBA_4_0/source/cluster/ctdb/include/ctdb.h 2007-02-08 02:57:08 UTC (rev 21232)
@@ -127,4 +127,14 @@
/* return vnn of this node */
uint32_t ctdb_get_vnn(struct ctdb_context *ctdb);
+/* setup a handler for ctdb messages */
+typedef void (*ctdb_message_fn_t)(struct ctdb_context *, uint32_t srvid,
+ TDB_DATA data, void *);
+int ctdb_set_message_handler(struct ctdb_context *ctdb, ctdb_message_fn_t handler,
+ void *private);
+
+/* send a ctdb message */
+int ctdb_send_message(struct ctdb_context *ctdb, uint32_t vnn,
+ uint32_t srvid, uint32_t msg_type, TDB_DATA data);
+
#endif
Modified: branches/SAMBA_4_0/source/cluster/ctdb/include/ctdb_private.h
===================================================================
--- branches/SAMBA_4_0/source/cluster/ctdb/include/ctdb_private.h 2007-02-08 02:17:29 UTC (rev 21231)
+++ branches/SAMBA_4_0/source/cluster/ctdb/include/ctdb_private.h 2007-02-08 02:57:08 UTC (rev 21232)
@@ -94,6 +94,8 @@
const struct ctdb_upcalls *upcalls; /* transport upcalls */
void *private; /* private to transport */
unsigned max_lacount;
+ ctdb_message_fn_t message_handler;
+ void *message_private;
};
#define CTDB_NO_MEMORY(ctdb, p) do { if (!(p)) { \
@@ -138,7 +140,8 @@
CTDB_REPLY_REDIRECT = 2,
CTDB_REQ_DMASTER = 3,
CTDB_REPLY_DMASTER = 4,
- CTDB_REPLY_ERROR = 5
+ CTDB_REPLY_ERROR = 5,
+ CTDB_REQ_MESSAGE = 6
};
/*
@@ -193,6 +196,13 @@
uint8_t data[1];
};
+struct ctdb_req_message {
+ struct ctdb_req_header hdr;
+ uint32_t srvid;
+ uint32_t datalen;
+ uint8_t data[1];
+};
+
/* internal prototypes */
void ctdb_set_error(struct ctdb_context *ctdb, const char *fmt, ...) PRINTF_ATTRIBUTE(2,3);
void ctdb_fatal(struct ctdb_context *ctdb, const char *msg);
@@ -203,6 +213,7 @@
uint32_t ctdb_hash(const TDB_DATA *key);
void ctdb_request_call(struct ctdb_context *ctdb, struct ctdb_req_header *hdr);
void ctdb_request_dmaster(struct ctdb_context *ctdb, struct ctdb_req_header *hdr);
+void ctdb_request_message(struct ctdb_context *ctdb, struct ctdb_req_header *hdr);
void ctdb_reply_dmaster(struct ctdb_context *ctdb, struct ctdb_req_header *hdr);
void ctdb_reply_call(struct ctdb_context *ctdb, struct ctdb_req_header *hdr);
void ctdb_reply_error(struct ctdb_context *ctdb, struct ctdb_req_header *hdr);
@@ -213,6 +224,7 @@
TDB_DATA key, struct ctdb_ltdb_header *header, TDB_DATA *data);
int ctdb_ltdb_store(struct ctdb_context *ctdb, TDB_DATA key,
struct ctdb_ltdb_header *header, TDB_DATA data);
+void ctdb_queue_packet(struct ctdb_context *ctdb, struct ctdb_req_header *hdr);
#endif
More information about the samba-cvs
mailing list