qdisk: Assume 1 vote if not specified in cluster.conf
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
Signed-off-by Lon Hohberger <[email protected]>
--- cman/qdisk/main.c | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-)
cman/qdisk/main.c +4 -3
@@ -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
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
Signed-off-by Lon Hohberger <[email protected]>--- cman/qdisk/main.c | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-)cman/qdisk/main.c +4
-3@@ -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);