diff options
| author | Ronnie Sahlberg <ronniesahlberg@gmail.com> | 2009-06-25 11:41:18 +1000 |
|---|---|---|
| committer | Ronnie Sahlberg <ronniesahlberg@gmail.com> | 2009-06-25 11:41:18 +1000 |
| commit | 180a576f7b5e1392c0a49e9b7804812cafab2a6f (patch) | |
| tree | 4c674fa1684aaaa5f684f0726646442c7019f10b /ctdb/server/ctdb_recover.c | |
| parent | dc17b5f1fe1e553e7fb88a52343c4f204e9ea620 (diff) | |
| download | samba-180a576f7b5e1392c0a49e9b7804812cafab2a6f.tar.gz | |
Dont access the reclock file at all if VerifyRecoveryLock is zero and also
make sure the reclock file is closed if the variable is cleared at runtime
(This used to be ctdb commit a25f4888689a0725971606163d87c39a41669292)
Diffstat (limited to 'ctdb/server/ctdb_recover.c')
| -rw-r--r-- | ctdb/server/ctdb_recover.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/ctdb/server/ctdb_recover.c b/ctdb/server/ctdb_recover.c index 526a310aecc..16545e7c43a 100644 --- a/ctdb/server/ctdb_recover.c +++ b/ctdb/server/ctdb_recover.c @@ -741,7 +741,9 @@ bool ctdb_recovery_lock(struct ctdb_context *ctdb, bool keep) } if (ctdb->recovery_lock_fd != -1) { close(ctdb->recovery_lock_fd); + ctdb->recovery_lock_fd = -1; } + ctdb->recovery_lock_fd = open(ctdb->recovery_lock_file, O_RDWR|O_CREAT, 0600); if (ctdb->recovery_lock_fd == -1) { DEBUG(DEBUG_ERR,("ctdb_recovery_lock: Unable to open %s - (%s)\n", |