cluster: RHEL6 - qdisk: Assume 1 vote if not specified in cluster.conf

Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=... Commit: f83663ae3b0a9ac2e0c6a5fd7e52e7af88ec0ab2 Parent: d1a690206bfbf29ff9149fbfef7d9010606e8d1f Author: Lon Hohberger <lhh(a)redhat.com&gt; AuthorDate: Wed Dec 15 13:28:42 2010 -0500 Committer: Lon Hohberger <lhh(a)redhat.com&gt; CommitterDate: Wed Jan 12 10:51:05 2011 -0500 qdisk: Assume 1 vote if not specified in cluster.conf Resolves: rhbz#663433 Signed-off-by: Lon Hohberger <lhh(a)redhat.com&gt; Reviewed-by: Fabio M. Di Nitto <fdinitto(a)redhat.com&gt; --- cman/qdisk/main.c | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/cman/qdisk/main.c b/cman/qdisk/main.c index 4bb2b16..8ca99f7 100644 --- a/cman/qdisk/main.c +++ b/cman/qdisk/main.c @@ -1386,10 +1386,11 @@ auto_qdisk_votes(int desc) "/cluster/clusternodes/clusternode[%d]/@votes", ret); name = NULL; - if (ccs_get(desc, buf, &name) != 0) - break; + if (ccs_get(desc, buf, &name) == 0) + votes = atoi(name); + else + votes = 1; - votes=atoi(name); if (votes != 1) { free(name);