[SCM] Samba Shared Repository - branch master updated

[Martin Schwenke]

The branch, master has been updated
       via  d8f3b49 ctdb-banning: Do not set recovery mode to ACTIVE in daemon
      from  30a6a22 ctdb-include: Order function prototypes as per ctdb_client.c

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


- Log -----------------------------------------------------------------
commit d8f3b490bbb691c9916eed0df5b980c1aef23c85
Author: Amitay Isaacs <amitay at gmail.com>
Date:   Fri Oct 30 14:25:50 2015 +1100

    ctdb-banning: Do not set recovery mode to ACTIVE in daemon
    
    When a node gets banned, it should go into recovery and freeze all
    databases.  We rely on the recovery daemon to detect the banned state
    and put the node in recovery and freeze all databases.
    
    Recent change in b4357a79d916b1f8ade8fa78563fbef0ce670aa9 took explicit
    freezing out of banning code but left the setting of recovery mode
    to ACTIVE.  Recovery daemon will freeze databases only if the recovery
    mode is NORMAL.  Recovery mode set to ACTIVE is an indication that the
    freeze has started.
    
    Do not set the recovery mode to ACTIVE in banning.  Let recovery daemon
    take care of it.
    
    Signed-off-by: Amitay Isaacs <amitay at gmail.com>
    Reviewed-by: Martin Schwenke <martin at meltin.net>
    
    Autobuild-User(master): Martin Schwenke <martins at samba.org>
    Autobuild-Date(master): Fri Oct 30 10:32:38 CET 2015 on sn-devel-104

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

Summary of changes:
 ctdb/server/ctdb_banning.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

diff --git a/ctdb/server/ctdb_banning.c b/ctdb/server/ctdb_banning.c
index 3c5f885..ed85076 100644
--- a/ctdb/server/ctdb_banning.c
+++ b/ctdb/server/ctdb_banning.c
@@ -72,8 +72,9 @@ void ctdb_local_node_got_banned(struct ctdb_context *ctdb)
 		ctdb_db->generation = INVALID_GENERATION;
 	}
 
-	/* make sure we get frozen */
-	ctdb->recovery_mode = CTDB_RECOVERY_ACTIVE;
+	/* Recovery daemon will set the recovery mode ACTIVE and freeze
+	 * databases.
+	 */
 
 	ctdb_release_all_ips(ctdb);
 }


-- 
Samba Shared Repository