it now works to talloc_free() the timed event if we no longer want it to

trigger

this must have been a sideeffect of a different bug in the recoverd.c
code that has now been fixed

(This used to be ctdb commit 676446fd1083c371ad0ff72dd8c636ec8e6d1423)

diff --git a/ctdb/common/ctdb_client.c b/ctdb/common/ctdb_client.c
index ccfe6234a686abecffeb4cc0fc60036d9eef07a5..e51c31bc2d318586e51acf1287000941da6b51b7 100644 (file)
--- a/ctdb/common/ctdb_client.c
+++ b/ctdb/common/ctdb_client.c
@@ -678,7 +678,7 @@ int ctdb_control(struct ctdb_context *ctdb, uint32_t destnode, uint64_t srvid,
        struct ctdb_req_control *c;
        size_t len;
        int ret;
-       static uint32_t timed_out;
+       uint32_t timed_out;
        struct timed_event *te=NULL;
 
        /* if the domain socket is not yet open, open it */
@@ -733,12 +733,10 @@ int ctdb_control(struct ctdb_context *ctdb, uint32_t destnode, uint64_t srvid,
                talloc_free(state);
                return -1;
        }
-#if 0
+
        if ((timed_out==0) && te) {
-/*why does this call here block forever?*/
                talloc_free(te);
        }
-#endif
 
        if (outdata) {
                *outdata = state->outdata;