FAQ Search Today's Posts Mark Forums Read
» Video Reviews

» Linux Archive

Linux-archive is a website aiming to archive linux email lists and to make them easily accessible for linux users/developers.


» Sponsor

» Partners

» Sponsor

Go Back   Linux Archive > Redhat > Cluster Development

 
 
LinkBack Thread Tools
 
Old 02-04-2011, 03:21 PM
Lon Hohberger
 
Default qdiskd: Fix auto-vote calculation loop

Resolves: rhbz#663433

Signed-off-by: Lon Hohberger <lhh@redhat.com>
---
cman/qdisk/disk.c | 1 +
cman/qdisk/main.c | 31 ++++++++++++++++---------------
2 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/cman/qdisk/disk.c b/cman/qdisk/disk.c
index 1f646ce..9884ea7 100644
--- a/cman/qdisk/disk.c
+++ b/cman/qdisk/disk.c
@@ -24,6 +24,7 @@
#include <platform.h>
#include <unistd.h>
#include <time.h>
+#include <linux/types.h>
#include <linux/fs.h>
#include <liblogthread.h>
#include <zlib.h>
diff --git a/cman/qdisk/main.c b/cman/qdisk/main.c
index ebdb018..9262af2 100644
--- a/cman/qdisk/main.c
+++ b/cman/qdisk/main.c
@@ -1377,32 +1377,33 @@ auto_qdisk_votes(int desc)
{
int ret = 1;
char buf[PATH_MAX];
- char *name;
+ char *v = NULL, *name = NULL;

while (1) {
int votes=0;

+ name = NULL;
+ snprintf(buf, sizeof(buf)-1,
+ "/cluster/clusternodes/clusternode[%d]/@name", ret);
+ if (ccs_get(desc, buf, &name) != 0)
+ break;
+
snprintf(buf, sizeof(buf)-1,
"/cluster/clusternodes/clusternode[%d]/@votes", ret);

- name = NULL;
- if (ccs_get(desc, buf, &name) == 0)
- votes = atoi(name);
- else
+ if (ccs_get(desc, buf, &v) == 0) {
+ votes = atoi(v);
+ free(v);
+ v = NULL;
+ } else {
votes = 1;
+ }

if (votes != 1) {
- free(name);

- snprintf(buf, sizeof(buf)-1,
- "/cluster/clusternodes/clusternode[%d]/@name",
- ret);
-
- if (ccs_get(desc, buf, &name) == 0) {
- logt_print(LOG_ERR, "%s's vote count is %d
",
- name, votes);
- free(name);
- }
+ logt_print(LOG_ERR, "%s's vote count is %d
",
+ name, votes);
+ free(name);

logt_print(LOG_ERR, "Set all node vote counts to 1 "
"or specify qdiskd's votes
");
--
1.7.2.3
 

Thread Tools




All times are GMT. The time now is 01:23 PM.

VBulletin, Copyright ©2000 - 2014, Jelsoft Enterprises Ltd.
Content Relevant URLs by vBSEO ©2007, Crawlability, Inc.
Copyright 2007 - 2008, www.linux-archive.org