diff options
| author | Volker Lendecke <vlendec@samba.org> | 2007-07-24 11:47:37 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 12:28:58 -0500 |
| commit | 33c57437a497f14c6f554c254cbb00b08f73e382 (patch) | |
| tree | 3b10abe13641aa393e999bc237ac74747b33f2e6 | |
| parent | 7c257b2214805e1ef543c3981b74e19649b234df (diff) | |
| download | samba-33c57437a497f14c6f554c254cbb00b08f73e382.tar.gz samba-33c57437a497f14c6f554c254cbb00b08f73e382.tar.bz2 samba-33c57437a497f14c6f554c254cbb00b08f73e382.zip | |
r24032: It helps testing tremendously if the cluster messaging actually sends
and receives messages to other nodes... :-)
(This used to be commit 3e9e9a3f28763500a1c5e551a808a14661d7d9fa)
| -rw-r--r-- | source3/lib/messages.c | 7 | ||||
| -rw-r--r-- | source3/lib/messages_ctdbd.c | 9 |
2 files changed, 16 insertions, 0 deletions
diff --git a/source3/lib/messages.c b/source3/lib/messages.c index a7925ace7a..c153953fb7 100644 --- a/source3/lib/messages.c +++ b/source3/lib/messages.c @@ -320,6 +320,13 @@ NTSTATUS messaging_send(struct messaging_context *msg_ctx, struct server_id server, uint32_t msg_type, const DATA_BLOB *data) { +#ifdef CLUSTER_SUPPORT + if (!procid_is_local(&server)) { + return msg_ctx->remote->send_fn(msg_ctx, server, + msg_type, data, + msg_ctx->remote); + } +#endif return msg_ctx->local->send_fn(msg_ctx, server, msg_type, data, msg_ctx->local); } diff --git a/source3/lib/messages_ctdbd.c b/source3/lib/messages_ctdbd.c index d048bc9aba..dbdc8db3c1 100644 --- a/source3/lib/messages_ctdbd.c +++ b/source3/lib/messages_ctdbd.c @@ -94,6 +94,15 @@ NTSTATUS messaging_ctdbd_init(struct messaging_context *msg_ctx, return status; } + status = ctdbd_register_msg_ctx(ctx->conn, msg_ctx); + + if (!NT_STATUS_IS_OK(status)) { + DEBUG(10, ("ctdbd_register_msg_ctx failed: %s\n", + nt_errstr(status))); + TALLOC_FREE(result); + return status; + } + global_ctdbd_connection = ctx->conn; talloc_set_destructor(ctx, messaging_ctdbd_destructor); |