From: Andrew Tridgell <tridge@samba.org>
Date: Sat, 19 May 2007 11:11:06 +0000 (+1000)
Subject: show ctdb control timeout
X-Git-Tag: tevent-0.9.20~348^2~2703
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c02fee6ed33d847abc8a5fefaa5b7bbd2e999d1c;p=thirdparty%2Fsamba.git

show ctdb control timeout
(This used to be ctdb commit 03921eacb942c7aa6b81236c6603dc640cefe2bf)
---

diff --git a/ctdb/common/ctdb_client.c b/ctdb/common/ctdb_client.c
index c51fcd7b05b..c95dc65f183 100644
--- a/ctdb/common/ctdb_client.c
+++ b/ctdb/common/ctdb_client.c
@@ -754,6 +754,11 @@ int ctdb_control(struct ctdb_context *ctdb, uint32_t destnode, uint64_t srvid,
 	}
 	if (timed_out) {
 		talloc_free(state);
+		if (errormsg) {
+			(*errormsg) = talloc_strdup(mem_ctx, "control timed out");
+		} else {
+			DEBUG(0,("ctdb_control timed out\n"));
+		}
 		return -1;
 	}