The branch, master has been updated
via af1f6cf7561fe9cb5c97f940d4458c83bdd8e2a0 (commit)
from f86551580349b7f662f9a07e4eb0c1189e38e429 (commit)
http://gitweb.samba.org/?p=sahlberg/ctdb.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit af1f6cf7561fe9cb5c97f940d4458c83bdd8e2a0
Author: Ronnie Sahlberg <[EMAIL PROTECTED]>
Date: Thu Jul 3 12:46:09 2008 +1000
we dont need to explicitely thaw the databases from the recovery daemon
since this is already done implicitely when we changed recovery mode
back to normal
-----------------------------------------------------------------------
Summary of changes:
server/ctdb_recoverd.c | 12 ------------
1 files changed, 0 insertions(+), 12 deletions(-)
Changeset truncated at 500 lines:
diff --git a/server/ctdb_recoverd.c b/server/ctdb_recoverd.c
index 16068aa..f161e7c 100644
--- a/server/ctdb_recoverd.c
+++ b/server/ctdb_recoverd.c
@@ -361,18 +361,6 @@ static int set_recovery_mode(struct ctdb_context *ctdb,
struct ctdb_node_map *no
return -1;
}
- if (rec_mode == CTDB_RECOVERY_NORMAL) {
- if (ctdb_client_async_control(ctdb, CTDB_CONTROL_THAW,
- nodes, CONTROL_TIMEOUT(),
- false, tdb_null,
- NULL, NULL,
- NULL) != 0) {
- DEBUG(DEBUG_ERR, (__location__ " Unable to thaw nodes.
Recovery failed.\n"));
- talloc_free(tmp_ctx);
- return -1;
- }
- }
-
talloc_free(tmp_ctx);
return 0;
}
--
CTDB repository
