Attachment 672501 Details for Bug 888857 – patch

patch

0001-fenced-use-cluster_dead-for-cpg-connections.patch (text/plain), 1.25 KB, created by David Teigland on 2013-01-04 17:50:42 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: David Teigland

Created: 2013-01-04 17:50:42 UTC

Size: 1.25 KB

patch

obsolete

>From 1d9f807c382260596807290805e2fc57f2d43d24 Mon Sep 17 00:00:00 2001
>From: David Teigland <teigland@redhat.com>
>Date: Fri, 4 Jan 2013 11:44:13 -0600
>Subject: [PATCH] fenced: use cluster_dead for cpg connections
>
>corosync connections are supposed to use the
>cluster_dead() function, not the client_dead()
>function.  The client_dead() function closes
>the fd directly, which in the case of corosync
>connections, fouls up the ipc, because the ipc
>is still expecting to use that fd, which fenced
>has reused for something else.  The next time
>that fenced calls into corosync ipc, it gets
>stuck in a poll/futex loop as the lib attempts
>to use the fd that fenced has wrongly closed.
>
>bz 888857
>
>Signed-off-by: David Teigland <teigland@redhat.com>
>---
> fence/fenced/cpg.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
>diff --git a/fence/fenced/cpg.c b/fence/fenced/cpg.c
>index 6634f8c..a5a4208 100644
>--- a/fence/fenced/cpg.c
>+++ b/fence/fenced/cpg.c
>@@ -1748,7 +1748,7 @@ int fd_join(struct fd *fd)
> 
> 	cpg_fd_get(cpg_handle_domain, &cpg_fd_domain);
> 
>-	ci = client_add(cpg_fd_domain, process_cpg_domain, NULL);
>+	ci = client_add(cpg_fd_domain, process_cpg_domain, cluster_dead);
> 
> 	list_add(&fd->list, &domains);
> 	fd->cpg_handle = cpg_handle_domain;
>-- 
>1.8.1.rc1.5.g7e0651a
>

Actions: View

Attachments on bug 888857: 672406 | 672501 | 672503