From: Martin Schwenke <martin@meltin.net>
Date: Tue, 6 May 2014 01:08:57 +0000 (+1000)
Subject: ctdb-tools-ctdb: scriptstatus should not count disabled scripts
X-Git-Tag: tdb-1.3.1~1191
X-Git-Url: http://git.samba.org/?p=samba.git;a=commitdiff_plain;h=c1deb87fb78b84a551ad8dc1004247d8a836f9bc

ctdb-tools-ctdb: scriptstatus should not count disabled scripts

script_status->num_scripts is used as the count in this message:

  "%d scripts were executed last %s cycle\n"

However, script_status->num_scripts includes disabled scripts, which
are never actually executed.

Instead, count the number of scripts that aren't disabled and make the
message print that.

Signed-off-by: Martin Schwenke <martin@meltin.net>
Reviewed-by: Amitay Isaacs <amitay@gmail.com>

Autobuild-User(master): Amitay Isaacs <amitay@samba.org>
Autobuild-Date(master): Wed May 28 02:27:48 CEST 2014 on sn-devel-104
---

diff --git a/ctdb/tools/ctdb.c b/ctdb/tools/ctdb.c
index 624c61c2f80..8033fcb7ae2 100644
--- a/ctdb/tools/ctdb.c
+++ b/ctdb/tools/ctdb.c
@@ -1377,8 +1377,14 @@ static int control_one_scriptstatus(struct ctdb_context *ctdb,
 	}
 
 	if (!options.machinereadable) {
+		int num_run = 0;
+		for (i=0; i<script_status->num_scripts; i++) {
+			if (script_status->scripts[i].status != -ENOEXEC) {
+				num_run++;
+			}
+		}
 		printf("%d scripts were executed last %s cycle\n",
-		       script_status->num_scripts,
+		       num_run,
 		       ctdb_eventscript_call_names[type]);
 	}
 	for (i=0; i<script_status->num_scripts; i++) {