[SCM] Samba Shared Repository - branch master updated

[Volker Lendecke]

The branch, master has been updated
       via  22d1d7d s3-ctdb: Fail CTDB connection only on INACTIVE state
      from  3f36d31 s4:rpc_server: use a variable for the max total reassembled request payload

https://git.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 22d1d7de22635b036671a155c30789344dd24a64
Author: Amitay Isaacs <amitay at gmail.com>
Date:   Thu Jun 23 16:17:51 2016 +1000

    s3-ctdb: Fail CTDB connection only on INACTIVE state
    
    If the node has flag NODE_FLAGS_PERMANENTLY_DISABLED, then it is
    still working.  Only avoid connections if node has any of the flags
    in NODE_FLAGS_INACTIVE.
    
    Signed-off-by: Amitay Isaacs <amitay at gmail.com>
    Reviewed-by: Martin Schwenke <martin at meltin.net>
    Reviewed-by: Volker Lendecke <vl at samba.org>
    
    Autobuild-User(master): Volker Lendecke <vl at samba.org>
    Autobuild-Date(master): Thu Jun 23 23:38:44 CEST 2016 on sn-devel-144

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

Summary of changes:
 source3/lib/ctdbd_conn.c | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/lib/ctdbd_conn.c b/source3/lib/ctdbd_conn.c
index 6cb6814..8403b30 100644
--- a/source3/lib/ctdbd_conn.c
+++ b/source3/lib/ctdbd_conn.c
@@ -198,7 +198,6 @@ static bool ctdbd_working(struct ctdbd_connection *conn, uint32_t vnn)
 	int32_t cstatus=-1;
 	TDB_DATA outdata;
 	struct ctdb_node_map_old *m;
-	uint32_t failure_flags;
 	bool ok = false;
 	uint32_t i;
 	int ret;
@@ -228,10 +227,7 @@ static bool ctdbd_working(struct ctdbd_connection *conn, uint32_t vnn)
 		goto fail;
 	}
 
-	failure_flags = NODE_FLAGS_BANNED | NODE_FLAGS_DISCONNECTED
-		| NODE_FLAGS_PERMANENTLY_DISABLED | NODE_FLAGS_STOPPED;
-
-	if ((m->nodes[i].flags & failure_flags) != 0) {
+	if ((m->nodes[i].flags & NODE_FLAGS_INACTIVE) != 0) {
 		DEBUG(2, ("Node has status %x, not active\n",
 			  (int)m->nodes[i].flags));
 		goto fail;


-- 
Samba Shared Repository