[SCM] Samba Shared Repository - branch v4-9-test updated

[Karolin Seeger]

The branch, v4-9-test has been updated
       via  9a5bdc6c9e6 ctdb-tools: Stop deleted nodes from influencing ctdb nodestatus exit code
      from  c50486c09a2 s3/4: libsmbclient test. Test using smbc_telldir/smbc_lseekdir with smbc_readdir/smbc_readdirplus/smbc_getdents.

https://git.samba.org/?p=samba.git;a=shortlog;h=v4-9-test


- Log -----------------------------------------------------------------
commit 9a5bdc6c9e6533ed760ad90a449d26b4cb86125a
Author: Martin Schwenke <martin at meltin.net>
Date:   Tue Aug 13 21:42:15 2019 +1000

    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 at meltin.net>
    Reviewed-by: Amitay Isaacs <amitay at gmail.com>
    (cherry picked from commit 32b5ceb31936ec5447362236c1809db003561d29)
    
    Autobuild-User(v4-9-test): Karolin Seeger <kseeger at samba.org>
    Autobuild-Date(v4-9-test): Fri Sep 20 14:09:11 UTC 2019 on sn-devel-144

-----------------------------------------------------------------------

Summary of changes:
 ctdb/tools/ctdb.c | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)


Changeset truncated at 500 lines:

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;


-- 
Samba Shared Repository