Attachment 313972 Details for Bug 458665 – Patch

[patch] Patch

cman_sync.diff (text/plain), 5.22 KB, created by Christine Caulfield on 2008-08-11 14:57:40 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Christine Caulfield

Created: 2008-08-11 14:57:40 UTC

Size: 5.22 KB

patch

obsolete

>diff --git a/cman/daemon/ais.c b/cman/daemon/ais.c
>index e89790b..fd1e31d 100644
>--- a/cman/daemon/ais.c
>+++ b/cman/daemon/ais.c
>@@ -86,6 +86,12 @@ static void cman_confchg_fn(enum totem_configuration_type configuration_type,
> static void cman_deliver_fn(unsigned int nodeid, struct iovec *iovec, int iov_len,
> 			    int endian_conversion_required);
> 
>+
>+static void cman_sync_init (void);
>+static int cman_sync_process (void);
>+static void cman_sync_activate (void);
>+static void cman_sync_abort (void);
>+
> /*
>  * Exports the interface for the service
>  */
>@@ -95,8 +101,10 @@ static struct corosync_service_engine cman_service_handler = {
> 	.flow_control			= COROSYNC_LIB_FLOW_CONTROL_NOT_REQUIRED,
> 	.lib_exit_fn		       	= cman_exit_fn,
> 	.exec_init_fn		       	= cman_exec_init_fn,
>-	.config_init_fn                 = NULL,
>-	.confchg_fn                     = cman_confchg_fn,
>+	.sync_init                      = cman_sync_init,
>+	.sync_process                   = cman_sync_process,
>+	.sync_activate                  = cman_sync_activate,
>+	.sync_abort                     = cman_sync_abort
> };
> 
> static struct corosync_service_engine *cman_get_handler_ver0(void)
>@@ -136,6 +144,23 @@ __attribute__ ((constructor)) static void cman_comp_register(void) {
> 
> /* ------------------------------- */
> 
>+static void cman_sync_init (void)
>+{
>+}
>+
>+static int cman_sync_process (void)
>+{
>+	return send_transition_msg(first_trans);
>+}
>+
>+static void cman_sync_activate (void)
>+{
>+	recalculate_quorum(0,0);
>+}
>+static void cman_sync_abort (void)
>+{
>+
>+}
> 
> static int cman_exec_init_fn(struct corosync_api_v1 *api)
> {
>@@ -298,10 +323,8 @@ static void cman_confchg_fn(enum totem_configuration_type configuration_type,
> 
> 	if (configuration_type == TOTEM_CONFIGURATION_REGULAR) {
> 		P_AIS("last memb_count = %d, current = %d\n", last_memb_count, member_list_entries);
>-		send_transition_msg(last_memb_count, first_trans);
> 		last_memb_count = member_list_entries;
> 		first_trans = 0;
>-
> 		cman_send_confchg(member_list,  member_list_entries,
> 				  saved_left_list, saved_left_list_entries,
> 				  joined_list, joined_list_entries);
>diff --git a/cman/daemon/commands.c b/cman/daemon/commands.c
>index f2236cb..bcf7d3b 100644
>--- a/cman/daemon/commands.c
>+++ b/cman/daemon/commands.c
>@@ -87,7 +87,6 @@ static int get_highest_nodeid(void);
> static int send_port_open_msg(unsigned char port);
> static int send_port_enquire(int nodeid);
> static void process_internal_message(char *data, int nodeid, int byteswap);
>-static void recalculate_quorum(int allow_decrease, int by_current_nodes);
> static void send_kill(int nodeid, uint16_t reason);
> static char *killmsg_reason(int reason);
> 
>@@ -355,7 +354,7 @@ static int calculate_quorum(int allow_decrease, int max_expected, unsigned int *
> }
> 
> /* Recalculate cluster quorum, set quorate and notify changes */
>-static void recalculate_quorum(int allow_decrease, int by_current_nodes)
>+void recalculate_quorum(int allow_decrease, int by_current_nodes)
> {
> 	unsigned int total_votes;
> 
>@@ -1610,7 +1609,7 @@ static int valid_transition_msg(int nodeid, struct cl_transmsg *msg)
> }
> 
> 
>-void send_transition_msg(int last_memb_count, int first_trans)
>+int send_transition_msg(int first_trans)
> {
> 	char buf[sizeof(struct cl_transmsg)+1024] __attribute__((aligned(8)));
> 	struct cl_transmsg *msg = (struct cl_transmsg *)buf;
>@@ -1646,10 +1645,10 @@ void send_transition_msg(int last_memb_count, int first_trans)
> 	if (have_disallowed())
> 		msg->flags |= NODE_FLAGS_SEESDISALLOWED;
> 
>-	comms_send_message(msg, len,
>-			   0,0,
>-			   0,  /* multicast */
>-			   0); /* flags */
>+	return comms_send_message(msg, len,
>+				  0,0,
>+				  0,  /* multicast */
>+				  0); /* flags */
> }
> 
> static void byteswap_internal_message(char *data)
>@@ -1865,7 +1864,6 @@ static void do_process_transition(int nodeid, char *data)
> 
> 	/* Take into account any new expected_votes value that the new node has */
> 	node->expected_votes = msg->expected_votes;
>-	recalculate_quorum(0, 0);
> 
> 	if (node->fence_agent && msg->fence_agent[0] && strcmp(node->fence_agent, msg->fence_agent))
> 	{
>@@ -2074,7 +2072,7 @@ void add_ais_node(int nodeid, uint64_t incarnation, int total_members)
> 		node->incarnation = incarnation;
> 		node->state = NODESTATE_MEMBER;
> 		cluster_members++;
>-		recalculate_quorum(0, 0);
>+	//CC	recalculate_quorum(0, 0);
> 	}
> }
> 
>diff --git a/cman/daemon/commands.h b/cman/daemon/commands.h
>index 5d325ad..5294158 100644
>--- a/cman/daemon/commands.h
>+++ b/cman/daemon/commands.h
>@@ -12,7 +12,7 @@ extern void unbind_con(struct connection *con);
> extern void commands_init(void);
> extern int process_command(struct connection *con, int cmd, char *cmdbuf,
> 			   char **retbuf, int *retlen, int retsize, int offset);
>-extern void send_transition_msg(int last_memb_count, int first_trans);
>+extern int send_transition_msg(int first_trans);
> 
> extern void add_ais_node(int nodeid, uint64_t incarnation, int total_members);
> extern void del_ais_node(int nodeid);
>@@ -32,6 +32,8 @@ extern int cman_set_nodeid(int nodeid);
> extern int cman_join_cluster(struct corosync_api_v1 *api,
> 			     char *name, unsigned short cluster_id, int two_node,
> 			     int votes, int expected_votes);
>+void recalculate_quorum(int allow_decrease, int by_current_nodes);
>+
> 
> extern int cluster_members;
> extern uint32_t max_outstanding_messages;

Actions: View | Diff

Attachments on bug 458665: 313972