diff options
| author | Martin Schwenke <martin@meltin.net> | 2019-08-13 21:42:15 +1000 |
|---|---|---|
| committer | Karolin Seeger <kseeger@samba.org> | 2019-09-20 19:20:25 +0000 |
| commit | 361f4f5d24721d54558144a5905657d5cc7281a3 (patch) | |
| tree | 1e867282d9da8b771ef237e27e456d1a285bfd31 /ctdb | |
| parent | 4d41dc32653bd1ae7d87dcd5779c3586ae6561d3 (diff) | |
| download | samba-361f4f5d24721d54558144a5905657d5cc7281a3.tar.gz | |
ctdb-tools: Stop deleted nodes from influencing ctdb nodestatus exit code
Deleted nodes should simply be ignored.
BUG: https://bugzilla.samba.org/show_bug.cgi?id=14129
RN: Stop deleted nodes from influencing ctdb nodestatus exit code
Signed-off-by: Martin Schwenke <martin@meltin.net>
Reviewed-by: Amitay Isaacs <amitay@gmail.com>
(cherry picked from commit 32b5ceb31936ec5447362236c1809db003561d29)
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 2cc72eedc76..6a15b61ccd1 100644 --- a/ctdb/tools/ctdb.c +++ b/ctdb/tools/ctdb.c @@ -5611,7 +5611,13 @@ static int control_nodestatus(TALLOC_CTX *mem_ctx, struct ctdb_context *ctdb, ret = 0; for (i=0; i<nodemap->num; i++) { - ret |= nodemap->node[i].flags; + uint32_t flags = nodemap->node[i].flags; + + if ((flags & NODE_FLAGS_DELETED) != 0) { + continue; + } + + ret |= flags; } return ret; |