rename ctdb_set_message_handler to ctdb_client_set_message_handler

to avoid a colission with the function of the same name in libctdb
(cherry picked from commit 41dbdd4fc0ab560420fb0e24a3179ff7c94c5bb7)

Conflicts:

	include/ctdb_client.h
	tests/src/ctdb_fetch.c

diff --git a/client/ctdb_client.c b/client/ctdb_client.c
index 45c9fad3dd003a06ae964672378229aa4c21525d..e78c60a34efbc45df0d3a72d15c66eca1ea90f5a 100644 (file)
--- a/client/ctdb_client.c
+++ b/client/ctdb_client.c
@@ -466,7 +466,7 @@ int ctdb_call(struct ctdb_db_context *ctdb_db, struct ctdb_call *call)
   tell the daemon what messaging srvid we will use, and register the message
   handler function in the client
 */
-int ctdb_set_message_handler(struct ctdb_context *ctdb, uint64_t srvid, 
+int ctdb_client_set_message_handler(struct ctdb_context *ctdb, uint64_t srvid, 
                             ctdb_message_fn_t handler,
                             void *private_data)
                                    
@@ -1857,7 +1857,7 @@ static int ctdb_traverse_ext(struct ctdb_db_context *ctdb_db,
        state.fn = fn;
        state.listemptyrecords = withemptyrecords;
 
-       ret = ctdb_set_message_handler(ctdb_db->ctdb, srvid, traverse_handler, &state);
+       ret = ctdb_client_set_message_handler(ctdb_db->ctdb, srvid, traverse_handler, &state);
        if (ret != 0) {
                DEBUG(DEBUG_ERR,("Failed to setup traverse handler\n"));
                return -1;

diff --git a/include/ctdb.h b/include/ctdb.h
index ff798c8e72e45861e6f88f5b0f4fe92112146901..ec1e5e66af045caa1375d9b72030f8b893470dc1 100644 (file)
--- a/include/ctdb.h
+++ b/include/ctdb.h
@@ -265,7 +265,7 @@ 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 *, uint64_t srvid, 
                                  TDB_DATA data, void *);
-int ctdb_set_message_handler(struct ctdb_context *ctdb, uint64_t srvid, 
+int ctdb_client_set_message_handler(struct ctdb_context *ctdb, uint64_t srvid,
                             ctdb_message_fn_t handler,
                             void *private_data);
 

diff --git a/server/ctdb_recoverd.c b/server/ctdb_recoverd.c
index f91bcd0a1a2d37e5204807c22885509ea47b1015..b1f13d222251f756af3b76e876b5a4a721d039fd 100644 (file)
--- a/server/ctdb_recoverd.c
+++ b/server/ctdb_recoverd.c
@@ -2870,31 +2870,31 @@ static void monitor_cluster(struct ctdb_context *ctdb)
        rec->priority_time = timeval_current();
 
        /* register a message port for sending memory dumps */
-       ctdb_set_message_handler(ctdb, CTDB_SRVID_MEM_DUMP, mem_dump_handler, rec);
+       ctdb_client_set_message_handler(ctdb, CTDB_SRVID_MEM_DUMP, mem_dump_handler, rec);
 
        /* register a message port for recovery elections */
-       ctdb_set_message_handler(ctdb, CTDB_SRVID_RECOVERY, election_handler, rec);
+       ctdb_client_set_message_handler(ctdb, CTDB_SRVID_RECOVERY, election_handler, rec);
 
        /* when nodes are disabled/enabled */
-       ctdb_set_message_handler(ctdb, CTDB_SRVID_SET_NODE_FLAGS, monitor_handler, rec);
+       ctdb_client_set_message_handler(ctdb, CTDB_SRVID_SET_NODE_FLAGS, monitor_handler, rec);
 
        /* when we are asked to puch out a flag change */
-       ctdb_set_message_handler(ctdb, CTDB_SRVID_PUSH_NODE_FLAGS, push_flags_handler, rec);
+       ctdb_client_set_message_handler(ctdb, CTDB_SRVID_PUSH_NODE_FLAGS, push_flags_handler, rec);
 
        /* register a message port for vacuum fetch */
-       ctdb_set_message_handler(ctdb, CTDB_SRVID_VACUUM_FETCH, vacuum_fetch_handler, rec);
+       ctdb_client_set_message_handler(ctdb, CTDB_SRVID_VACUUM_FETCH, vacuum_fetch_handler, rec);
 
        /* register a message port for reloadnodes  */
-       ctdb_set_message_handler(ctdb, CTDB_SRVID_RELOAD_NODES, reload_nodes_handler, rec);
+       ctdb_client_set_message_handler(ctdb, CTDB_SRVID_RELOAD_NODES, reload_nodes_handler, rec);
 
        /* register a message port for performing a takeover run */
-       ctdb_set_message_handler(ctdb, CTDB_SRVID_TAKEOVER_RUN, ip_reallocate_handler, rec);
+       ctdb_client_set_message_handler(ctdb, CTDB_SRVID_TAKEOVER_RUN, ip_reallocate_handler, rec);
 
        /* register a message port for disabling the ip check for a short while */
-       ctdb_set_message_handler(ctdb, CTDB_SRVID_DISABLE_IP_CHECK, disable_ip_check_handler, rec);
+       ctdb_client_set_message_handler(ctdb, CTDB_SRVID_DISABLE_IP_CHECK, disable_ip_check_handler, rec);
 
        /* register a message port for updating the recovery daemons node assignment for an ip */
-       ctdb_set_message_handler(ctdb, CTDB_SRVID_RECD_UPDATE_IP, recd_update_ip_handler, rec);
+       ctdb_client_set_message_handler(ctdb, CTDB_SRVID_RECD_UPDATE_IP, recd_update_ip_handler, rec);
 
 again:
        if (mem_ctx) {

diff --git a/tests/src/ctdb_bench.c b/tests/src/ctdb_bench.c
index 52e5b509a0b5437438b7b11065da86e3b23cdffd..59495438034c1c522ece17c75b9f8ba2ae2308bf 100644 (file)
--- a/tests/src/ctdb_bench.c
+++ b/tests/src/ctdb_bench.c
@@ -230,7 +230,7 @@ int main(int argc, const char *argv[])
        ret = ctdb_set_call(ctdb_db, incr_func,  FUNC_INCR);
        ret = ctdb_set_call(ctdb_db, fetch_func, FUNC_FETCH);
 
-       if (ctdb_set_message_handler(ctdb, 0, ring_message_handler,&msg_count))
+       if (ctdb_client_set_message_handler(ctdb, 0, ring_message_handler,&msg_count))
                goto error;
 
        printf("Waiting for cluster\n");

diff --git a/tests/src/ctdb_fetch.c b/tests/src/ctdb_fetch.c
index 6487dc0a595aedfd54b63c7d0be7529eeb4c41b4..2f4b2b4c9ab86d5b7c9461d1b944b7d5a4587329 100644 (file)
--- a/tests/src/ctdb_fetch.c
+++ b/tests/src/ctdb_fetch.c
@@ -219,7 +219,7 @@ int main(int argc, const char *argv[])
                exit(1);
        }
 
-       ctdb_set_message_handler(ctdb, CTDB_SRVID_RECONFIGURE, reconfigure_handler, 
+       ctdb_client_set_message_handler(ctdb, CTDB_SRVID_RECONFIGURE, reconfigure_handler, 
                                 &cluster_ready);
 
        /* attach to a specific database */
@@ -229,7 +229,7 @@ int main(int argc, const char *argv[])
                exit(1);
        }
 
-       ctdb_set_message_handler(ctdb, 0, message_handler, &msg_count);
+       ctdb_client_set_message_handler(ctdb, 0, message_handler, &msg_count);
 
        printf("Waiting for cluster\n");
        while (1) {

diff --git a/tools/ctdb.c b/tools/ctdb.c
index ada9b47e5e1675c235b30bdcf3237429f3c0870b..cb4e240647df5c1985dfdc860717c28f1da8156f 100644 (file)
--- a/tools/ctdb.c
+++ b/tools/ctdb.c
@@ -2022,7 +2022,7 @@ static int control_ipreallocate(struct ctdb_context *ctdb, int argc, const char
        /* register a message port for receiveing the reply so that we
           can receive the reply
        */
-       ctdb_set_message_handler(ctdb, rd.srvid, ip_reallocate_handler, NULL);
+       ctdb_client_set_message_handler(ctdb, rd.srvid, ip_reallocate_handler, NULL);
 
        data.dptr = (uint8_t *)&rd;
        data.dsize = sizeof(rd);
@@ -2819,7 +2819,7 @@ static int control_getlog(struct ctdb_context *ctdb, int argc, const char **argv
 
        DEBUG(DEBUG_ERR, ("Pulling logs from node %u\n", options.pnn));
 
-       ctdb_set_message_handler(ctdb, log_addr.srvid, log_handler, NULL);
+       ctdb_client_set_message_handler(ctdb, log_addr.srvid, log_handler, NULL);
        sleep(1);
 
        DEBUG(DEBUG_ERR,("Listen for response on %d\n", (int)log_addr.srvid));
@@ -4198,7 +4198,7 @@ static int control_rddumpmemory(struct ctdb_context *ctdb, int argc, const char
        /* register a message port for receiveing the reply so that we
           can receive the reply
        */
-       ctdb_set_message_handler(ctdb, rd.srvid, mem_dump_handler, NULL);
+       ctdb_client_set_message_handler(ctdb, rd.srvid, mem_dump_handler, NULL);
 
 
        data.dptr = (uint8_t *)&rd;
@@ -4271,7 +4271,7 @@ static int control_msglisten(struct ctdb_context *ctdb, int argc, const char **a
 
        /* register a message port and listen for messages
        */
-       ctdb_set_message_handler(ctdb, srvid, msglisten_handler, NULL);
+       ctdb_client_set_message_handler(ctdb, srvid, msglisten_handler, NULL);
        printf("Listening for messages on srvid:%d\n", (int)srvid);
 
        while (1) {