[SCM] CTDB repository - branch master updated - ctdb-1.0.114-219-geededd5
Ronnie Sahlberg
sahlberg at samba.org
Mon Aug 9 17:51:05 MDT 2010
The branch, master has been updated
via eededd592c92c59b435f0046989b2327fcc280b1 (commit)
via dc6b143c4785449e8c4ef7a46bf16adba750ab56 (commit)
from 9ca09ee9129b787428a2ceac9731b12166dc8718 (commit)
http://gitweb.samba.org/?p=sahlberg/ctdb.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit eededd592c92c59b435f0046989b2327fcc280b1
Author: Ronnie Sahlberg <ronniesahlberg at gmail.com>
Date: Tue Aug 10 09:43:17 2010 +1000
Create a new command "ctdb sync" that isd just an alias for "ctdb ipreallocate"
commit dc6b143c4785449e8c4ef7a46bf16adba750ab56
Author: Ronnie Sahlberg <ronniesahlberg at gmail.com>
Date: Tue Aug 10 09:41:41 2010 +1000
Update a log message to reflect that this does no longer only happen
when trying/failing to ban a node.
-----------------------------------------------------------------------
Summary of changes:
tools/ctdb.c | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
Changeset truncated at 500 lines:
diff --git a/tools/ctdb.c b/tools/ctdb.c
index 336c790..76d1feb 100644
--- a/tools/ctdb.c
+++ b/tools/ctdb.c
@@ -97,7 +97,7 @@ static void verify_node(struct ctdb_context *ctdb)
/* verify we can access the node */
ret = ctdb_ctrl_getpnn(ctdb, TIMELIMIT(), options.pnn);
if (ret == -1) {
- DEBUG(DEBUG_ERR,("Can not ban node. Node is not operational.\n"));
+ DEBUG(DEBUG_ERR,("Can not access node. Node is not operational.\n"));
exit(10);
}
}
@@ -4378,6 +4378,7 @@ static const struct {
{ "showban", control_showban, true, false, "show ban information"},
{ "shutdown", control_shutdown, true, false, "shutdown ctdbd" },
{ "recover", control_recover, true, false, "force recovery" },
+ { "sync", control_ipreallocate, true, false, "wait until ctdbd has synced all state changes" },
{ "ipreallocate", control_ipreallocate, true, false, "force the recovery daemon to perform a ip reallocation procedure" },
{ "thaw", control_thaw, true, false, "thaw databases", "[priority:1-3]" },
{ "isnotrecmaster", control_isnotrecmaster, false, false, "check if the local node is recmaster or not" },
@@ -4418,6 +4419,7 @@ static const struct {
{ "getdbprio", control_getdbprio, false, false, "Get DB priority", "<dbid>"},
{ "msglisten", control_msglisten, false, false, "Listen on a srvid port for messages", "<msg srvid>"},
{ "msgsend", control_msgsend, false, false, "Send a message to srvid", "<srvid> <message>"},
+ { "sync", control_ipreallocate, true, false, "wait until ctdbd has synced all state changes" },
};
/*
--
CTDB repository
More information about the samba-cvs
mailing list