This is the mail archive of the
cluster-cvs@sourceware.org
mailing list for the cluster.
Cluster Project branch, master, updated. cluster-2.99.00-35-g44ee0c0
- From: teigland at sourceware dot org
- To: cluster-cvs at sources dot redhat dot com, cluster-devel at redhat dot com
- Date: 12 May 2008 20:45:46 -0000
- Subject: Cluster Project branch, master, updated. cluster-2.99.00-35-g44ee0c0
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Cluster Project".
http://sources.redhat.com/git/gitweb.cgi?p=cluster.git;a=commitdiff;h=44ee0c0cb17e5e319250086d18c6feef98f875ec
The branch, master has been updated
via 44ee0c0cb17e5e319250086d18c6feef98f875ec (commit)
from c23b4e33daf07619736ea55940295c10e9271b7c (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 44ee0c0cb17e5e319250086d18c6feef98f875ec
Author: David Teigland <teigland@redhat.com>
Date: Mon May 12 15:44:42 2008 -0500
dlm_controld: dlm_tool query fixes
Various fixes to make queries, e.g. dlm_tool ls, show the right info.
Signed-off-by: David Teigland <teigland@redhat.com>
-----------------------------------------------------------------------
Summary of changes:
dlm/tool/main.c | 5 +++--
group/dlm_controld/cpg.c | 7 ++++++-
2 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/dlm/tool/main.c b/dlm/tool/main.c
index 3fcf57b..d8cf726 100644
--- a/dlm/tool/main.c
+++ b/dlm/tool/main.c
@@ -589,7 +589,7 @@ static void do_list(char *name)
printf("prev members ");
show_nodeids(node_count, nodes);
- if (!ls->cg_next.seq && verbose)
+ if (!ls->cg_next.seq)
goto show_all;
node_count = 0;
@@ -605,9 +605,10 @@ static void do_list(char *name)
printf("next members ");
show_nodeids(node_count, nodes);
+ show_all:
if (!verbose)
continue;
- show_all:
+
node_count = 0;
memset(&nodes, 0, sizeof(nodes));
diff --git a/group/dlm_controld/cpg.c b/group/dlm_controld/cpg.c
index 6edc893..6fd7a22 100644
--- a/group/dlm_controld/cpg.c
+++ b/group/dlm_controld/cpg.c
@@ -300,7 +300,7 @@ static void node_history_init(struct lockspace *ls, int nodeid,
node = get_node_history(ls, nodeid);
if (node)
- return;
+ goto out;
node = malloc(sizeof(struct node));
if (!node)
@@ -310,6 +310,7 @@ static void node_history_init(struct lockspace *ls, int nodeid,
node->nodeid = nodeid;
node->add_time = 0;
list_add_tail(&node->list, &ls->node_history);
+ out:
node->added_seq = cg->seq; /* for queries */
}
@@ -1588,6 +1589,8 @@ static int _set_node_info(struct lockspace *ls, struct change *cg, int nodeid,
struct member *m = NULL;
struct node *n;
+ node->nodeid = nodeid;
+
if (cg)
m = find_memb(cg, nodeid);
if (!m)
@@ -1645,6 +1648,7 @@ int set_lockspaces(int *count, struct dlmc_lockspace **lss_out)
lss = malloc(ls_count * sizeof(struct dlmc_lockspace));
if (!lss)
return -ENOMEM;
+ memset(lss, 0, ls_count * sizeof(struct dlmc_lockspace));
lsp = lss;
list_for_each_entry(ls, &lockspaces, list) {
@@ -1691,6 +1695,7 @@ int set_lockspace_nodes(struct lockspace *ls, int option, int *node_count,
nodes = malloc(count * sizeof(struct dlmc_node));
if (!nodes)
return -ENOMEM;
+ memset(nodes, 0, count * sizeof(struct dlmc_node));
nodep = nodes;
if (option == DLMC_NODES_ALL) {
hooks/post-receive
--
Cluster Project