Skip to contentSkip to conversation

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

PATCH New Lon Hohberger 2 participants 2 messages Jan 12, 2011

lore
Share & tools
lore
#0 lore raw

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

This is a clean cherry-pick in to the RHEL6 branch.

Resolves: rhbz#663433

---
 cman/qdisk/main.c |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)
cman/qdisk/main.c +4 -3
index 78dc3f0..73138b2 100644
@@ -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);
 
Signature · 1 line
1.7.1.1
#1 lore raw

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

ACK?ed

Fabio

Quoted 28 lines · Lon Hohberger

This is a clean cherry-pick in to the RHEL6 branch.

Resolves: rhbz#663433

---
 cman/qdisk/main.c |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)
cman/qdisk/main.c +4 -3
index 78dc3f0..73138b2 100644
@@ -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);