[PATCH] ctdb: fix timedout -> timed out in debug messages

[Michael Adam]

The verb is to time out, not to timeout, afaict.
Review appreciated.

Michael
-------------- next part --------------
From c685c1c40387d7e7b315e90b8933dfc4bc8ed831 Mon Sep 17 00:00:00 2001
From: Michael Adam <obnox at samba.org>
Date: Wed, 1 Jun 2016 00:43:38 +0200
Subject: [PATCH 1/3] ctdb:banning: timedout->timed out in dbg messages in
 ctdb_ban_node_event()

Signed-off-by: Michael Adam <obnox at samba.org>
---
 ctdb/server/ctdb_banning.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ctdb/server/ctdb_banning.c b/ctdb/server/ctdb_banning.c
index 56d3b29..a4c56f5 100644
--- a/ctdb/server/ctdb_banning.c
+++ b/ctdb/server/ctdb_banning.c
@@ -42,12 +42,12 @@ static void ctdb_ban_node_event(struct tevent_context *ev,
 
 	/* Make sure we were able to freeze databases during banning */
 	if (!ctdb_db_all_frozen(ctdb)) {
-		DEBUG(DEBUG_ERR, ("Banning timedout, but still unable to freeze databases\n"));
+		DEBUG(DEBUG_ERR, ("Banning timed out, but still unable to freeze databases\n"));
 		ctdb_ban_self(ctdb);
 		return;
 	}
 
-	DEBUG(DEBUG_ERR,("Banning timedout\n"));
+	DEBUG(DEBUG_ERR,("Banning timed out\n"));
 	ctdb->nodes[ctdb->pnn]->flags &= ~NODE_FLAGS_BANNED;
 
 	if (ctdb->banning_ctx != NULL) {
-- 
2.5.5


From d59e483e27345e650f0bf58c74522bbbbcab82ff Mon Sep 17 00:00:00 2001
From: Michael Adam <obnox at samba.org>
Date: Wed, 1 Jun 2016 00:44:21 +0200
Subject: [PATCH 2/3] ctdb:eventscript: timedout->timed out in
 ctdb_event_script_args()

Signed-off-by: Michael Adam <obnox at samba.org>
---
 ctdb/server/eventscript.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ctdb/server/eventscript.c b/ctdb/server/eventscript.c
index 5bc2ee8..17e4f35 100644
--- a/ctdb/server/eventscript.c
+++ b/ctdb/server/eventscript.c
@@ -906,7 +906,7 @@ int ctdb_event_script_args(struct ctdb_context *ctdb, enum ctdb_event call,
 	while (status.done == false && tevent_loop_once(ctdb->ev) == 0) /* noop */;
 
 	if (status.status == -ETIME) {
-		DEBUG(DEBUG_ERR, (__location__ " eventscript for '%s' timedout."
+		DEBUG(DEBUG_ERR, (__location__ " eventscript for '%s' timed out."
 				  " Immediately banning ourself for %d seconds\n",
 				  ctdb_eventscript_call_names[call],
 				  ctdb->tunable.recovery_ban_period));
-- 
2.5.5


From 321f8eeea709d0f1dd66f95ff887c47d71a1802c Mon Sep 17 00:00:00 2001
From: Michael Adam <obnox at samba.org>
Date: Wed, 1 Jun 2016 00:45:00 +0200
Subject: [PATCH 3/3] ctdb:tests: timedout->timed out in 60.nfs.multi.004 test

Signed-off-by: Michael Adam <obnox at samba.org>
---
 ctdb/tests/eventscripts/60.nfs.multi.004.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ctdb/tests/eventscripts/60.nfs.multi.004.sh b/ctdb/tests/eventscripts/60.nfs.multi.004.sh
index e07f8d5..d01f96b 100755
--- a/ctdb/tests/eventscripts/60.nfs.multi.004.sh
+++ b/ctdb/tests/eventscripts/60.nfs.multi.004.sh
@@ -2,7 +2,7 @@
 
 . "${TEST_SCRIPTS_DIR}/unit.sh"
 
-define_test "takeip, take reconfigure lock, monitor -> reconfigure, replay timedout"
+define_test "takeip, take reconfigure lock, monitor -> reconfigure, replay timed out"
 
 setup_nfs
 
-- 
2.5.5

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 198 bytes
Desc: not available
URL: <http://lists.samba.org/pipermail/samba-technical/attachments/20160601/affa6c6b/signature.sig>