Attachment 623347 Details for Bug 856214 – Proposed patch backported to RHEL6

[patch] Proposed patch backported to RHEL6

bz856214_rhel6.patch (text/plain), 1.52 KB, created by Pavel Moravec on 2012-10-08 09:06:05 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Pavel Moravec

Created: 2012-10-08 09:06:05 UTC

Size: 1.52 KB

patch

obsolete

>diff --git a/fence/fenced/fd.h b/fence/fenced/fd.h
>index 0be3332..8423d9d 100644
>--- a/fence/fenced/fd.h
>+++ b/fence/fenced/fd.h
>@@ -270,6 +270,7 @@ int name_to_nodeid(char *name);
> struct node *get_new_node(struct fd *fd, int nodeid);
> void kick_node_from_cluster(int nodeid);
> void set_cman_dirty(void);
>+int get_member_fd(void);
> 
> /* recover.c */
> 
>diff --git a/fence/fenced/main.c b/fence/fenced/main.c
>index 827dab6..66860d5 100644
>--- a/fence/fenced/main.c
>+++ b/fence/fenced/main.c
>@@ -739,6 +739,7 @@ void cluster_dead(int ci)
> static void loop(void)
> {
> 	int rv, i;
>+	int cluster_fd_pos;
> 	void (*workfn) (int ci);
> 	void (*deadfn) (int ci);
> 
>@@ -751,7 +752,7 @@ static void loop(void)
> 		goto out;
> 	client_add(rv, process_listener, NULL);
> 
>-	rv = setup_cluster();
>+	rv = cluster_fd_pos = setup_cluster();
> 	if (rv < 0)
> 		goto out;
> 	client_add(rv, process_cluster, cluster_dead);
>@@ -804,6 +805,8 @@ static void loop(void)
> 	}
> 
> 	for (;;) {
>+		/* We need to re-get the cluster FD each time */
>+		pollfd[cluster_fd_pos].fd = get_member_fd();
> 		rv = poll(pollfd, client_maxi + 1, -1);
> 		if (rv == -1 && errno == EINTR) {
> 			if (daemon_quit && list_empty(&domains))
>diff --git a/fence/fenced/member_cman.c b/fence/fenced/member_cman.c
>index ee879be..061136e 100644
>--- a/fence/fenced/member_cman.c
>+++ b/fence/fenced/member_cman.c
>@@ -375,6 +375,11 @@ void close_cluster(void)
> 	cman_finish(ch_admin);
> }
> 
>+int get_member_fd()
>+{
>+	return cman_get_fd(ch);
>+}
>+
> struct node *get_new_node(struct fd *fd, int nodeid)
> {
> 	cman_node_t cn;

Actions: View | Diff

Attachments on bug 856214: 612391 | 623347