diff options
| author | Andrew Tridgell <tridge@samba.org> | 2007-02-09 01:52:13 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 14:44:55 -0500 |
| commit | 8de4c33d8f089f2f47817278f8781f194da898d0 (patch) | |
| tree | 9072b0efe72d2a17ec4b86cab9969c338419227a /source4/cluster/ctdb | |
| parent | 728ff99fe3b06794937f5398bb2512f0b03e7186 (diff) | |
| download | samba-8de4c33d8f089f2f47817278f8781f194da898d0.tar.gz samba-8de4c33d8f089f2f47817278f8781f194da898d0.tar.bz2 samba-8de4c33d8f089f2f47817278f8781f194da898d0.zip | |
r21256: - msg_type is not needed in the cluster messaging API
- merge ctdb_get_num_nodes() from bzr tree
(This used to be commit 3df7527aedeba7ce2f4a6ca2d3b7167f58c6b68a)
Diffstat (limited to 'source4/cluster/ctdb')
| -rw-r--r-- | source4/cluster/ctdb/common/ctdb.c | 9 | ||||
| -rw-r--r-- | source4/cluster/ctdb/common/ctdb_message.c | 2 | ||||
| -rw-r--r-- | source4/cluster/ctdb/ctdb_cluster.c | 5 | ||||
| -rw-r--r-- | source4/cluster/ctdb/include/ctdb.h | 7 |
4 files changed, 18 insertions, 5 deletions
diff --git a/source4/cluster/ctdb/common/ctdb.c b/source4/cluster/ctdb/common/ctdb.c index 9e92059b95..59a14d4dbd 100644 --- a/source4/cluster/ctdb/common/ctdb.c +++ b/source4/cluster/ctdb/common/ctdb.c @@ -162,6 +162,15 @@ uint32_t ctdb_get_vnn(struct ctdb_context *ctdb) } /* + return the number of nodes +*/ +uint32_t ctdb_get_num_nodes(struct ctdb_context *ctdb) +{ + return ctdb->num_nodes; +} + + +/* start the protocol going */ int ctdb_start(struct ctdb_context *ctdb) diff --git a/source4/cluster/ctdb/common/ctdb_message.c b/source4/cluster/ctdb/common/ctdb_message.c index abdf9e6216..ca909f8994 100644 --- a/source4/cluster/ctdb/common/ctdb_message.c +++ b/source4/cluster/ctdb/common/ctdb_message.c @@ -54,7 +54,7 @@ void ctdb_request_message(struct ctdb_context *ctdb, struct ctdb_req_header *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) + uint32_t srvid, TDB_DATA data) { struct ctdb_req_message *r; int len; diff --git a/source4/cluster/ctdb/ctdb_cluster.c b/source4/cluster/ctdb/ctdb_cluster.c index 95adbafadf..917a56d2b8 100644 --- a/source4/cluster/ctdb/ctdb_cluster.c +++ b/source4/cluster/ctdb/ctdb_cluster.c @@ -159,8 +159,7 @@ static NTSTATUS ctdb_message_init(struct cluster_ops *ops, send a ctdb message to another node */ static NTSTATUS ctdb_message_send(struct cluster_ops *ops, - struct server_id server, uint32_t msg_type, - DATA_BLOB *data) + struct server_id server, DATA_BLOB *data) { struct cluster_state *state = ops->private; struct ctdb_context *ctdb = state->ctdb; @@ -170,7 +169,7 @@ static NTSTATUS ctdb_message_send(struct cluster_ops *ops, tdata.dptr = data->data; tdata.dsize = data->length; - ret = ctdb_send_message(ctdb, server.node, server.id, msg_type, tdata); + ret = ctdb_send_message(ctdb, server.node, server.id, tdata); if (ret != 0) { return NT_STATUS_INTERNAL_DB_CORRUPTION; } diff --git a/source4/cluster/ctdb/include/ctdb.h b/source4/cluster/ctdb/include/ctdb.h index 335af83215..efb12c5daa 100644 --- a/source4/cluster/ctdb/include/ctdb.h +++ b/source4/cluster/ctdb/include/ctdb.h @@ -127,6 +127,11 @@ void ctdb_wait_loop(struct ctdb_context *ctdb); /* return vnn of this node */ uint32_t ctdb_get_vnn(struct ctdb_context *ctdb); +/* + return the number of nodes +*/ +uint32_t ctdb_get_num_nodes(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 *); @@ -135,6 +140,6 @@ int ctdb_set_message_handler(struct ctdb_context *ctdb, ctdb_message_fn_t handle /* 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); + uint32_t srvid, TDB_DATA data); #endif |