remove rht unban code from when we take recmaster role. we can not

send control broadcasts yet

(This used to be ctdb commit 39a05dc1d74d49685e6daf929df169d936585208)

diff --git a/ctdb/server/ctdb_recover.c b/ctdb/server/ctdb_recover.c
index 0f283279ca5c75c2f593aeadb7f1dea05b53a3d0..a010d2e168545da9b1a85dc92c92b32f5ada405e 100644 (file)
--- a/ctdb/server/ctdb_recover.c
+++ b/ctdb/server/ctdb_recover.c
@@ -645,11 +645,9 @@ int32_t ctdb_control_delete_low_rsn(struct ctdb_context *ctdb, TDB_DATA indata,
 bool ctdb_recovery_lock(struct ctdb_context *ctdb, bool keep)
 {
        struct flock lock;
-       bool lock_already_held = false;
 
        if (ctdb->recovery_lock_fd != -1) {
                close(ctdb->recovery_lock_fd);
-               lock_already_held = true;
        }
        ctdb->recovery_lock_fd = open(ctdb->recovery_lock_file, O_RDWR|O_CREAT, 0600);
        if (ctdb->recovery_lock_fd == -1) {
@@ -673,12 +671,5 @@ bool ctdb_recovery_lock(struct ctdb_context *ctdb, bool keep)
                ctdb->recovery_lock_fd = -1;
        }
 
-       if ( (!lock_already_held) && (ctdb->recovery_lock_fd != -1) ) {
-               /* we have just become the recmaster, we must now unban all
-                  nodes
-                */
-               ctdb_ctrl_modflags(ctdb, timeval_current_ofs(ctdb->tunable.recover_timeout, 0), CTDB_BROADCAST_ALL, 0, NODE_FLAGS_BANNED);
-       }
-
        return true;
 }