* [Cluster-devel] [PATCH] qdisk: Assume 1 vote if not specified in cluster.conf
@ 2011-01-12 15:01 Lon Hohberger
2011-01-12 15:41 ` Fabio M. Di Nitto
0 siblings, 1 reply; 3+ messages in thread
From: Lon Hohberger @ 2011-01-12 15:01 UTC (permalink / raw)
To: cluster-devel.redhat.com
This is a clean cherry-pick in to the RHEL6 branch.
Resolves: rhbz#663433
Signed-off-by: Lon Hohberger <lhh@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 78dc3f0..73138b2 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);
--
1.7.1.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [Cluster-devel] [PATCH] qdisk: Assume 1 vote if not specified in cluster.conf
@ 2011-01-12 15:09 Lon Hohberger
0 siblings, 0 replies; 3+ messages in thread
From: Lon Hohberger @ 2011-01-12 15:09 UTC (permalink / raw)
To: cluster-devel.redhat.com
This is a clean cherry-pick in to the RHEL6 branch.
Resolves: rhbz#663433
Signed-off-by: Lon Hohberger <lhh@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 78dc3f0..73138b2 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);
--
1.7.1.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [Cluster-devel] [PATCH] qdisk: Assume 1 vote if not specified in cluster.conf
2011-01-12 15:01 [Cluster-devel] [PATCH] qdisk: Assume 1 vote if not specified in cluster.conf Lon Hohberger
@ 2011-01-12 15:41 ` Fabio M. Di Nitto
0 siblings, 0 replies; 3+ messages in thread
From: Fabio M. Di Nitto @ 2011-01-12 15:41 UTC (permalink / raw)
To: cluster-devel.redhat.com
ACK?ed
Fabio
On 1/12/2011 4:01 PM, Lon Hohberger wrote:
> This is a clean cherry-pick in to the RHEL6 branch.
>
> Resolves: rhbz#663433
>
> Signed-off-by: Lon Hohberger <lhh@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 78dc3f0..73138b2 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);
>
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2011-01-12 15:41 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-01-12 15:01 [Cluster-devel] [PATCH] qdisk: Assume 1 vote if not specified in cluster.conf Lon Hohberger
2011-01-12 15:41 ` Fabio M. Di Nitto
-- strict thread matches above, loose matches on Subject: below --
2011-01-12 15:09 Lon Hohberger
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).