use the new connect_wait code in the ctdb_messaging test

(This used to be ctdb commit 36980878141c5e506dd7ee021fba6ca7d0ff5ad3)

diff --git a/ctdb/tests/ctdb_messaging.c b/ctdb/tests/ctdb_messaging.c
index 5ee02c5e400fd1a12996865fd42dd2101e489bbd..11cdd5e6a8a6e73048ee302b580b0716a8944471 100644 (file)
--- a/ctdb/tests/ctdb_messaging.c
+++ b/ctdb/tests/ctdb_messaging.c
@@ -35,7 +35,7 @@ static int num_repeats = 100;
 static void message_handler(struct ctdb_context *ctdb, uint32_t srvid, 
                                 TDB_DATA data, void *private)
 {
-printf("client vnn:%d received a message to srvid:%d\n",ctdb_get_vnn(ctdb),srvid);
+       printf("client vnn:%d received a message to srvid:%d\n",ctdb_get_vnn(ctdb),srvid);
 }
 
 /*
@@ -142,8 +142,6 @@ int main(int argc, const char *argv[])
        /* start the protocol running */
        ret = ctdb_start(ctdb);
 
-/*XXX why does this block forever?     ctdb_connect_wait(ctdb);*/
-
        pid=fork();
        if (pid) {
                srvid=0;
@@ -157,8 +155,11 @@ int main(int argc, const char *argv[])
        data.dsize=0;
        ctdb_set_message_handler(ctdb, srvid, message_handler, NULL);
 
-sleep(3);
-printf("sending message from vnn:%d to vnn:%d/srvid:%d\n",ctdb_get_vnn(ctdb),ctdb_get_vnn(ctdb), 1-srvid);
+       ctdb_connect_wait(ctdb);
+
+       sleep(2);
+
+       printf("sending message from vnn:%d to vnn:%d/srvid:%d\n",ctdb_get_vnn(ctdb),ctdb_get_vnn(ctdb), 1-srvid);
        ctdb_send_message(ctdb, ctdb_get_vnn(ctdb), 1-srvid, data);
 
        while(1){