cluster: RHEL6 - cman: Slight fix to message issued for invalid two_node clusters

Christine Caulfield chrissie at fedoraproject.org
Mon Mar 2 16:41:54 UTC 2015


Gitweb:        http://git.fedorahosted.org/git/?p=cluster.git;a=commitdiff;h=ba6fa4d319e633650ce8fcfa300185dc35c0c266
Commit:        ba6fa4d319e633650ce8fcfa300185dc35c0c266
Parent:        d3c462e12472c2c919de7add7a24bfaf42c13c15
Author:        Christine Caulfield <ccaulfie at redhat.com>
AuthorDate:    Mon Mar 2 16:39:29 2015 +0000
Committer:     Christine Caulfield <ccaulfie at redhat.com>
CommitterDate: Mon Mar 2 16:39:29 2015 +0000

cman: Slight fix to message issued for invalid two_node clusters

If two_node is set for a 1 node cluster cman complains that:
"two_node set but there are more than 2 nodes". This just changes the
message to something that also includes 1 node clusters

Signed-off-by: Christine Caulfield <ccaulfie at redhat.com>
---
 cman/daemon/cmanconfig.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/cman/daemon/cmanconfig.c b/cman/daemon/cmanconfig.c
index 16ef65f..7d35bea 100644
--- a/cman/daemon/cmanconfig.c
+++ b/cman/daemon/cmanconfig.c
@@ -262,7 +262,7 @@ static int get_cman_join_info(struct corosync_api_v1 *corosync)
 				   "nodes with one vote each and expected "
 				   "votes of 1 (node_count=%d vote_sum=%d)",
 				   node_count, vote_sum);
-			write_cman_pipe("two_node set but there are more than 2 nodes");
+			write_cman_pipe("two_node is set but there are not 2 nodes in cluster.conf");
 			error = -EINVAL;
 			goto out;
 		}


More information about the cluster-commits mailing list