From 1f6835c73245366111946b92605315c0cac84295 Mon Sep 17 00:00:00 2001 From: Martin Schwenke Date: Fri, 5 Aug 2016 11:27:14 +1000 Subject: [PATCH] ctdb-tools: Add early return for empty connection list BUG: https://bugzilla.samba.org/show_bug.cgi?id=12121 If the connection list is empty then process_clist_send() still creates a request. However, since no subrequests are created for controls sent, tevent_req_poll() waits forever for an event. Signed-off-by: Martin Schwenke Reviewed-by: Amitay Isaacs --- ctdb/tools/ctdb.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/ctdb/tools/ctdb.c b/ctdb/tools/ctdb.c index 075b3547933..b00c3fc0436 100644 --- a/ctdb/tools/ctdb.c +++ b/ctdb/tools/ctdb.c @@ -3230,6 +3230,9 @@ static int control_addtickle(TALLOC_CTX *mem_ctx, struct ctdb_context *ctdb, if (ret != 0) { return ret; } + if (count == 0) { + return 0; + } req = process_clist_send(mem_ctx, ctdb, clist, count, ctdb_req_control_tcp_add_delayed_update, @@ -3288,6 +3291,9 @@ static int control_deltickle(TALLOC_CTX *mem_ctx, struct ctdb_context *ctdb, if (ret != 0) { return ret; } + if (count == 0) { + return 0; + } req = process_clist_send(mem_ctx, ctdb, clist, count, ctdb_req_control_tcp_remove, -- 2.47.2