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

Lon Hohberger lon at fedoraproject.org
Wed Dec 15 18:39:43 UTC 2010


Gitweb:        http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=7018f0c23a7782b21be33a4e3eb21b7a60146c1d
Commit:        7018f0c23a7782b21be33a4e3eb21b7a60146c1d
Parent:        e39bb6348295c8d3f69b2d1fd30691a67c40445c
Author:        Lon Hohberger <lhh at redhat.com>
AuthorDate:    Wed Dec 15 13:28:42 2010 -0500
Committer:     Lon Hohberger <lhh at redhat.com>
CommitterDate: Wed Dec 15 13:36:34 2010 -0500

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

Signed-off-by: Lon Hohberger <lhh at redhat.com>
---
 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 6a9b821..617a705 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);
 


More information about the cluster-commits mailing list