diff options
| author | Martin Schwenke <martin@meltin.net> | 2019-08-13 21:42:15 +1000 |
|---|---|---|
| committer | Karolin Seeger <kseeger@samba.org> | 2019-09-20 14:09:11 +0000 |
| commit | 9a5bdc6c9e6533ed760ad90a449d26b4cb86125a (patch) | |
| tree | 7941b116c5bd8ebd5f31127d4132c60c29739f35 /ctdb | |
| parent | c50486c09a2bda0fac5113b869e33521bfe0dcef (diff) | |
| download | samba-9a5bdc6c9e6533ed760ad90a449d26b4cb86125a.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)
Autobuild-User(v4-9-test): Karolin Seeger <kseeger@samba.org>
Autobuild-Date(v4-9-test): Fri Sep 20 14:09:11 UTC 2019 on sn-devel-144
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 71a14d67cb0..2fc57e68d83 100644 --- a/ctdb/tools/ctdb.c +++ b/ctdb/tools/ctdb.c @@ -5557,7 +5557,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; |