cluster: STABLE3 - config: better error report when autodetecting config version errors
Fabio M. Di Nitto
fabbione at fedoraproject.org
Tue Jul 27 08:20:41 UTC 2010
Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=b466d4dd86c6e66ddb81fef5f97ec27d2ee9e94d
Commit: b466d4dd86c6e66ddb81fef5f97ec27d2ee9e94d
Parent: 886ea3f60b91e6ce8bec1cb089a50d674f3d19c3
Author: Fabio M. Di Nitto <fdinitto at redhat.com>
AuthorDate: Tue Jul 27 10:20:15 2010 +0200
Committer: Fabio M. Di Nitto <fdinitto at redhat.com>
CommitterDate: Tue Jul 27 10:20:15 2010 +0200
config: better error report when autodetecting config version errors
Signed-off-by: Fabio M. Di Nitto <fdinitto at redhat.com>
---
cman/daemon/commands.c | 9 +++++++--
1 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/cman/daemon/commands.c b/cman/daemon/commands.c
index 22ba50a..7a922dd 100644
--- a/cman/daemon/commands.c
+++ b/cman/daemon/commands.c
@@ -1190,8 +1190,13 @@ static int reload_config(int new_version, int should_broadcast)
config_error = read_cman_nodes(corosync, &config_version, 0);
if (config_error) {
- log_printf(LOG_ERR, "Can't get updated config version %d: %s.\n",
- wanted_config_version, reload_err?reload_err:"version mismatch on this node");
+ if (wanted_config_version) {
+ log_printf(LOG_ERR, "Can't get updated config version %d: %s.\n",
+ wanted_config_version, reload_err?reload_err:"version mismatch on this node");
+ } else {
+ log_printf(LOG_ERR, "Can't get updated config version: %s.\n",
+ reload_err?reload_err:"version mismatch on this node");
+ }
if (should_broadcast) {
log_printf(LOG_ERR, "Continuing activity with old configuration\n");
More information about the cluster-commits
mailing list