diff options
| author | Martin Schwenke <martin@meltin.net> | 2013-06-30 17:57:33 +1000 |
|---|---|---|
| committer | Amitay Isaacs <amitay@gmail.com> | 2013-07-05 15:52:33 +1000 |
| commit | 15115becefcd3cbffe242ca4283460e8df31e0aa (patch) | |
| tree | 3c3ed8927866aa6f4ec34f6d6a2d9e9c1ab003fe | |
| parent | bfe0b936527812b54b4f407e8d131a4251625871 (diff) | |
| download | samba-15115becefcd3cbffe242ca4283460e8df31e0aa.tar.gz samba-15115becefcd3cbffe242ca4283460e8df31e0aa.tar.xz samba-15115becefcd3cbffe242ca4283460e8df31e0aa.zip | |
recoverd: Fix an unclear log message - "Restart recovery process"
When the recovery master notices a node in recovery mode it starts the
recovery process, it doesn't restart it.
Update documentation to match.
Signed-off-by: Martin Schwenke <martin@meltin.net>
(This used to be ctdb commit 298c4d2c3b4ea3d900c91f5a0a5aca2952a13d61)
| -rw-r--r-- | ctdb/doc/recovery-process.txt | 2 | ||||
| -rw-r--r-- | ctdb/server/ctdb_recoverd.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/ctdb/doc/recovery-process.txt b/ctdb/doc/recovery-process.txt index 7cfc6789f4..333eeb23da 100644 --- a/ctdb/doc/recovery-process.txt +++ b/ctdb/doc/recovery-process.txt @@ -151,7 +151,7 @@ the recovery master also performs the following tests: 16, Verify that all CONNECTED nodes in the cluster are in recovery mode NORMAL. If one of the nodes were in recovery mode ACTIVE, force a new recovery and restart monitoring from 1. - "Node:%u was in recovery mode. Restart recovery process" + "Node:%u was in recovery mode. Start recovery process" 17, Verify that the filehandle to the recovery lock file is valid. If it is not, this may mean a split brain and is a critical error. diff --git a/ctdb/server/ctdb_recoverd.c b/ctdb/server/ctdb_recoverd.c index ca0dced75a..bdf978e6da 100644 --- a/ctdb/server/ctdb_recoverd.c +++ b/ctdb/server/ctdb_recoverd.c @@ -2726,7 +2726,7 @@ static void verify_recmode_normal_callback(struct ctdb_client_control_state *sta status field */ if (state->status != CTDB_RECOVERY_NORMAL) { - DEBUG(DEBUG_NOTICE, (__location__ " Node:%u was in recovery mode. Restart recovery process\n", state->c->hdr.destnode)); + DEBUG(DEBUG_NOTICE, ("Node:%u was in recovery mode. Start recovery process\n", state->c->hdr.destnode)); rmdata->status = MONITOR_RECOVERY_NEEDED; } |