cluster: RHEL6 - rgmanager: Merge upstream cpglockd
Ryan McCabe
rmccabe at fedoraproject.org
Tue May 1 15:01:34 UTC 2012
Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=b1cc2fd5ce82d5c65ce979c4138aa9087aaf984c
Commit: b1cc2fd5ce82d5c65ce979c4138aa9087aaf984c
Parent: 8c2898779b82f4d09949b6fb78a7d4715125810d
Author: Lon Hohberger <lhh at redhat.com>
AuthorDate: Wed Mar 21 16:35:10 2012 -0400
Committer: Ryan McCabe <rmccabe at redhat.com>
CommitterDate: Tue May 1 10:55:43 2012 -0400
rgmanager: Merge upstream cpglockd
Signed-off-by: Lon Hohberger <lhh at redhat.com>
Reviewed-by: Fabio M. Di Nitto <fdinitto at redhat.com>
Reviewed-by: Ryan McCabe <rmccabe at redhat.com>
---
rgmanager/src/daemons/cpglockd.c | 9 +++------
1 files changed, 3 insertions(+), 6 deletions(-)
diff --git a/rgmanager/src/daemons/cpglockd.c b/rgmanager/src/daemons/cpglockd.c
index 55d832a..3ed132b 100644
--- a/rgmanager/src/daemons/cpglockd.c
+++ b/rgmanager/src/daemons/cpglockd.c
@@ -176,7 +176,7 @@ old_msg(struct cpg_lock_msg *m)
n = do_alloc(sizeof(*n));
memcpy(&n->m, m, sizeof(n->m));
list_append(&messages, n);
- if (message_count < 10) {
+ if (message_count < 20) {
++message_count;
} else {
n = messages;
@@ -781,8 +781,8 @@ process_unlock(struct cpg_lock_msg *m, uint32_t nodeid)
l->l.owner_pid == m->owner_pid) {
printf("UNLOCK %s: %d:%d:%d\n", m->resource, m->owner_nodeid, m->owner_pid, m->owner_tid);
l->l.state = LOCK_FREE;
- if (grant_next(m) != 0)
- l->l.state = LOCK_PENDING;
+ //if (grant_next(m) != 0)
+ //l->l.state = LOCK_PENDING;
}
}
@@ -1055,12 +1055,9 @@ main(int argc, char **argv)
int afd = -1;
int n,x;
- struct cpg_lock l;
struct cpg_lock_msg m;
struct client_node *client;
- l.state = 0;
-
signal(SIGPIPE, SIG_IGN);
fd = sock_listen(CPG_LOCKD_SOCK);
More information about the cluster-commits
mailing list