diff options
| author | Martin Schwenke <martin@meltin.net> | 2014-05-06 11:08:57 +1000 |
|---|---|---|
| committer | Amitay Isaacs <amitay@samba.org> | 2014-05-28 02:27:48 +0200 |
| commit | c1deb87fb78b84a551ad8dc1004247d8a836f9bc (patch) | |
| tree | b5a6c9621e2c4f23cab2dcb66ed9ff80bff8d17a /ctdb | |
| parent | f1d4b274eee4e36731c37dc218b3c4aec8842c87 (diff) | |
| download | samba-c1deb87fb78b84a551ad8dc1004247d8a836f9bc.tar.gz samba-c1deb87fb78b84a551ad8dc1004247d8a836f9bc.tar.xz samba-c1deb87fb78b84a551ad8dc1004247d8a836f9bc.zip | |
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
Diffstat (limited to 'ctdb')
| -rw-r--r-- | ctdb/tools/ctdb.c | 8 |
1 files changed, 7 insertions, 1 deletions
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++) { |