Attachment 879814 Details for Bug 1080103 – bz1080103-3-cpg-Make-sure-left-nodes-are-really-removed.patch

[patch] bz1080103-3-cpg-Make-sure-left-nodes-are-really-removed.patch

0003.patch (text/plain), 2.38 KB, created by Jan Friesse on 2014-03-28 12:31:11 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jan Friesse

Created: 2014-03-28 12:31:11 UTC

Size: 2.38 KB

patch

obsolete

>commit b55f32fe2e1538db33a1ec584b67744c724328c6
>Author: Jan Friesse <jfriesse@redhat.com>
>Date:   Wed Feb 19 12:25:31 2014 +0100
>
>    cpg: Make sure left nodes are really removed
>    
>    When node is paused and other nodes has in meantime exited cpg process,
>    paused node after resume doesn't update it's membership correctly so on
>    previously paused node exited cpg process is still visible.
>    
>    Solution is to compare join list with cpd and remove all pids which are
>    not included in join list.
>    
>    Signed-off-by: Jan Friesse <jfriesse@redhat.com>
>    Reviewed-by: Christine Caulfield <ccaulfie@redhat.com>
>    (backport from needle)
>
>diff --git a/services/cpg.c b/services/cpg.c
>index ddb447c..9d502e6 100644
>--- a/services/cpg.c
>+++ b/services/cpg.c
>@@ -879,6 +879,56 @@ static void downlist_master_choose_and_send (void)
> 	}
> }
> 
>+/*
>+ * Remove processes that might have left the group while we were suspended.
>+ */
>+static void joinlist_remove_zombie_pi_entries (void)
>+{
>+	struct list_head *pi_iter;
>+	struct list_head *jl_iter;
>+	struct process_info *pi;
>+	struct joinlist_msg *stored_msg;
>+	int found;
>+
>+	for (pi_iter = process_info_list_head.next; pi_iter != &process_info_list_head; ) {
>+		pi = list_entry (pi_iter, struct process_info, list);
>+		pi_iter = pi_iter->next;
>+
>+		/*
>+		 * Ignore local node
>+		 */
>+		if (pi->nodeid == api->totem_nodeid_get()) {
>+			continue ;
>+		}
>+
>+		/*
>+		 * Try to find message in joinlist messages
>+		 */
>+		found = 0;
>+		for (jl_iter = joinlist_messages_head.next;
>+			jl_iter != &joinlist_messages_head;
>+			jl_iter = jl_iter->next) {
>+
>+			stored_msg = list_entry(jl_iter, struct joinlist_msg, list);
>+
>+			if (stored_msg->sender_nodeid == api->totem_nodeid_get()) {
>+				continue ;
>+			}
>+
>+			if (pi->nodeid == stored_msg->sender_nodeid &&
>+			    pi->pid == stored_msg->pid &&
>+			    mar_name_compare (&pi->group, &stored_msg->group_name) == 0) {
>+				found = 1;
>+				break ;
>+			}
>+		}
>+
>+		if (!found) {
>+			do_proc_leave(&pi->group, pi->pid, pi->nodeid, CONFCHG_CPG_REASON_PROCDOWN);
>+		}
>+	}
>+}
>+
> static void joinlist_inform_clients (void)
> {
> 	struct joinlist_msg *stored_msg;
>@@ -905,6 +955,8 @@ static void joinlist_inform_clients (void)
> 		do_proc_join (&stored_msg->group_name, stored_msg->pid, stored_msg->sender_nodeid,
> 			CONFCHG_CPG_REASON_NODEUP);
> 	}
>+
>+	joinlist_remove_zombie_pi_entries ();
> }
> 
> static void downlist_messages_delete (void)

Actions: View | Diff

Attachments on bug 1080103: 879812 | 879813 | 879814