diff options
| author | Ronnie Sahlberg <sahlberg@ronnie> | 2007-06-09 19:49:28 +1000 |
|---|---|---|
| committer | Ronnie Sahlberg <sahlberg@ronnie> | 2007-06-09 19:49:28 +1000 |
| commit | c873c7d4dab192e139646bd3f20c182e8208b7b0 (patch) | |
| tree | c5336977f369f03789c5a779c7aa549e67326475 /ctdb | |
| parent | 9a0d7a688fe1ff295db96764a7ff3cd306a19dff (diff) | |
| download | samba-c873c7d4dab192e139646bd3f20c182e8208b7b0.tar.gz samba-c873c7d4dab192e139646bd3f20c182e8208b7b0.tar.xz samba-c873c7d4dab192e139646bd3f20c182e8208b7b0.zip | |
remove rht unban code from when we take recmaster role. we can not
send control broadcasts yet
(This used to be ctdb commit 39a05dc1d74d49685e6daf929df169d936585208)
Diffstat (limited to 'ctdb')
| -rw-r--r-- | ctdb/server/ctdb_recover.c | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/ctdb/server/ctdb_recover.c b/ctdb/server/ctdb_recover.c index 0f283279ca..a010d2e168 100644 --- 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; } |