Forward port of sync v1 engine from whitetank and rework of quorum

engine to not break syncing.


git-svn-id: http://svn.fedorahosted.org/svn/corosync/trunk@2019 fd59a12c-fef9-0310-b244-a6a79926bd2f

exec/apidef.c

@@ -107,7 +107,7 @@ static struct corosync_api_v1 apidef_corosync_api_v1 = {
 	.tpg_groups_mcast = (typedef_tpg_groups_mcast)totempg_groups_mcast_groups,
 	.tpg_groups_reserve = NULL,
 	.tpg_groups_release = NULL,
-	.sync_request = sync_request,
+	.sync_request = NULL, //sync_request,
 	.quorum_is_quorate = corosync_quorum_is_quorate,
 	.quorum_register_callback = corosync_quorum_register_callback,
 	.quorum_unregister_callback = corosync_quorum_unregister_callback,

exec/quorum.c

@@ -65,7 +65,6 @@
 
 LOGSYS_DECLARE_SUBSYS ("QUORUM", LOG_INFO);
 
-
 static struct quorum_callin_functions *corosync_quorum_fns = NULL;
 
 int corosync_quorum_is_quorate (void)
@@ -98,14 +97,12 @@ int corosync_quorum_unregister_callback (quorum_callback_fn_t fn, void *context)
 	}
 }
 
-int corosync_quorum_initialize (struct quorum_callin_functions *fns,
-				sync_callback_fn_t *sync_callback_fn)
+int corosync_quorum_initialize (struct quorum_callin_functions *fns)
 {
 	if (corosync_quorum_fns)
 		return -1;
 
 	corosync_quorum_fns = fns;
-	*sync_callback_fn = sync_primary_callback_fn;
 	return 0;
 }
 

exec/quorum.h

@@ -39,12 +39,6 @@ struct memb_ring_id;
 
 typedef void (*quorum_callback_fn_t) (int quorate, void *context);
 
-typedef void (*sync_callback_fn_t) (
-	unsigned int *view_list,
-	int view_list_entries,
-	int primary_designated,
-	struct memb_ring_id *ring_id);
-
 struct quorum_callin_functions
 {
 	int (*quorate) (void);
@@ -58,8 +52,7 @@ extern int corosync_quorum_register_callback (quorum_callback_fn_t fn, void *con
 
 extern int corosync_quorum_unregister_callback (quorum_callback_fn_t fn, void *context);
 
-extern int corosync_quorum_initialize (struct quorum_callin_functions *fns,
-				       sync_callback_fn_t *sync_callback_fn);
+extern int corosync_quorum_initialize (struct quorum_callin_functions *fns);
 
 
 extern int quorum_none(void);

exec/sync.c

@@ -32,9 +32,6 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
-
-#include <config.h>
-
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <sys/un.h>
@@ -52,22 +49,21 @@
 #include <netinet/in.h>
 #include <arpa/inet.h>
 
+#include <config.h>
+ 
 #include <corosync/corotypes.h>
 #include <corosync/swab.h>
 #include <corosync/totem/totempg.h>
 #include <corosync/totem/totem.h>
 #include <corosync/lcr/lcr_ifact.h>
 #include <corosync/engine/logsys.h>
+#include <corosync/ipc_gen.h>
 #include "quorum.h"
-
-#include "main.h"
 #include "sync.h"
 
-
 LOGSYS_DECLARE_SUBSYS ("SYNC", LOG_INFO);
 
 #define MESSAGE_REQ_SYNC_BARRIER 0
-#define MESSAGE_REQ_SYNC_REQUEST 1
 
 struct barrier_data {
 	unsigned int nodeid;
@@ -76,6 +72,8 @@ struct barrier_data {
 
 static struct memb_ring_id *sync_ring_id;
 
+static int vsf_none = 0;
+
 static int (*sync_callbacks_retrieve) (int sync_id, struct sync_callbacks *callack);
 
 static struct sync_callbacks sync_callbacks;
@@ -87,7 +85,6 @@ static void (*sync_synchronization_completed) (void);
 static int sync_recovery_index = 0;
 
 static void *sync_callback_token_handle = 0;
-static void *sync_request_token_handle;
 
 static struct barrier_data barrier_data_confchg[PROCESSOR_COUNT_MAX];
 
@@ -95,6 +92,8 @@ static int barrier_data_confchg_entries;
 
 static struct barrier_data barrier_data_process[PROCESSOR_COUNT_MAX];
 
+static struct openais_vsf_iface_ver0 *vsf_iface;
+
 static int sync_barrier_send (struct memb_ring_id *ring_id);
 
 static int sync_start_process (enum totem_callback_token_type type, void *data);
@@ -116,33 +115,25 @@ static void sync_confchg_fn (
 	unsigned int *joined_list, int joined_list_entries,
 	struct memb_ring_id *ring_id);
 
+static void sync_primary_callback_fn (
+        unsigned int *view_list,
+        int view_list_entries,
+        int primary_designated,
+        struct memb_ring_id *ring_id);
+
+
 static struct totempg_group sync_group = {
     .group      = "sync",
     .group_len  = 4
 };
 
 static hdb_handle_t sync_group_handle;
-static char *service_name;
-static unsigned int current_members[PROCESSOR_COUNT_MAX];
-static unsigned int current_members_cnt;
 
 struct req_exec_sync_barrier_start {
 	mar_req_header_t header;
 	struct memb_ring_id ring_id;
 };
 
-struct sync_request {
-	uint32_t name_len;
-	char name[0] __attribute__((aligned(8)));
-};
-
-typedef struct sync_msg {
-	mar_req_header_t header;
-	struct memb_ring_id ring_id;
-	struct sync_request sync_request;
-} sync_msg_t;
-
-
 /*
  * Send a barrier data structure
  */
@@ -261,7 +252,6 @@ static int sync_service_process (enum totem_callback_token_type type, void *data
 int sync_register (
 	int (*callbacks_retrieve) (int sync_id, struct sync_callbacks *callack),
 	void (*synchronization_completed) (void))
-
 {
 	unsigned int res;
 
@@ -283,13 +273,14 @@ int sync_register (
 		log_printf (LOG_LEVEL_ERROR, "Couldn't join group.\n");
 		return (-1);
 	}
-
+		
 	sync_callbacks_retrieve = callbacks_retrieve;
 	sync_synchronization_completed = synchronization_completed;
 	return (0);
 }
 
-void sync_primary_callback_fn (
+
+static void sync_primary_callback_fn (
 	unsigned int *view_list,
 	int view_list_entries,
 	int primary_designated,
@@ -297,6 +288,13 @@ void sync_primary_callback_fn (
 {
 	int i;
 
+	if (primary_designated) {
+		log_printf (LOG_LEVEL_DEBUG, "This node is within the primary component and will provide service.\n");
+	} else {
+		log_printf (LOG_LEVEL_DEBUG, "This node is within the non-primary component and will NOT provide any services.\n");
+		return;
+	}
+
 	/*
 	 * Execute configuration change for synchronization service
 	 */
@@ -335,15 +333,15 @@ static void sync_deliver_fn (
 {
 	struct req_exec_sync_barrier_start *req_exec_sync_barrier_start =
 		(struct req_exec_sync_barrier_start *)iovec[0].iov_base;
-	sync_msg_t *msg = (sync_msg_t *)iovec[0].iov_base;
-
+	unsigned int barrier_completed;
 	int i;
 
+log_printf (LOG_LEVEL_DEBUG, "confchg entries %d\n", barrier_data_confchg_entries);
 	if (endian_conversion_required) {
 		sync_endian_convert (req_exec_sync_barrier_start);
 	}
 
-	int barrier_completed = 1;
+	barrier_completed = 1;
 
 	memcpy (&deliver_ring_id, &req_exec_sync_barrier_start->ring_id,
 		sizeof (struct memb_ring_id));
@@ -356,36 +354,6 @@ static void sync_deliver_fn (
 		return;
 	}
 
-	if (msg->header.id == MESSAGE_REQ_SYNC_REQUEST) {
-		if (endian_conversion_required) {
-			swab_mar_uint32_t (&msg->sync_request.name_len);
-		}	
-		/*
-		 * If there is an ongoing sync, abort it. A requested sync is
-		 * only allowed to abort other requested synchronizations,
-		 * not full synchronizations.
-		 */
-		if (sync_processing && sync_callbacks.sync_abort) {
-			sync_callbacks.sync_abort();
-			sync_callbacks.sync_activate = NULL;
-			sync_processing = 0;
-			assert (service_name != NULL);
-			free (service_name);
-			service_name = NULL;
-		}
-
-		service_name = malloc (msg->sync_request.name_len);
-		strcpy (service_name, msg->sync_request.name);
-
-		/*
-		 * Start requested synchronization
-		 */
-		sync_primary_callback_fn (current_members, current_members_cnt,	1,
-			sync_ring_id);
-
-		return;
-	}
-
 	/*
 	 * Set completion for source_addr's address
 	 */
@@ -455,7 +423,6 @@ static void sync_confchg_fn (
 	unsigned int *joined_list, int joined_list_entries,
 	struct memb_ring_id *ring_id)
 {
-	int i;
 	sync_ring_id = ring_id;
 
 	if (configuration_type != TOTEM_CONFIGURATION_REGULAR) {
@@ -465,79 +432,12 @@ static void sync_confchg_fn (
 		sync_callbacks.sync_abort ();
 		sync_callbacks.sync_activate = NULL;
 	}
-	/*
-	 * Save current members and ring ID for later use
-	 */
-	for (i = 0; i < member_list_entries; i++) {
-		current_members[i] = member_list[i];
-	}
-	current_members_cnt = member_list_entries;
-
-	/*
-	 * If no virtual synchrony filter configured, then start
-	 * synchronization process
-	 */
-	if (quorum_none() == 1) {
-		sync_primary_callback_fn (
-			member_list,
-			member_list_entries,
-			1,
-			ring_id);
-	}
-}
-/**
- * TOTEM callback function used to multicast a sync_request
- * message
- * @param type
- * @param _name
- *
- * @return int
- */
-static int sync_request_send (
-	enum totem_callback_token_type type, void *_name)
-{
-	int res;
-	char *name = _name;
-	sync_msg_t msg;
-	struct iovec iovec[2];
-	int name_len;
-
-	ENTER();
-
-	name_len = strlen (name) + 1;
-	msg.header.size = sizeof (msg) + name_len;
-	msg.header.id = MESSAGE_REQ_SYNC_REQUEST;
-
-	if (sync_ring_id == NULL) {
-		log_printf (LOG_LEVEL_ERROR,
-			"%s sync_ring_id is NULL.\n", __func__);
-		return 1;
-	}
-	memcpy (&msg.ring_id, sync_ring_id,	sizeof (struct memb_ring_id));
-	msg.sync_request.name_len = name_len;
-
-	iovec[0].iov_base = (char *)&msg;
-	iovec[0].iov_len = sizeof (msg);
-	iovec[1].iov_base = _name;
-	iovec[1].iov_len = name_len;
 
-	res = totempg_groups_mcast_joined (
-		sync_group_handle, iovec, 2, TOTEMPG_AGREED);
-
-	if (res == 0) {
-		/*
-		 * We managed to multicast the message so delete the token callback
-		 * for the sync request.
-		 */
-		totempg_callback_token_destroy (&sync_request_token_handle);
-	}
-
-	/*
-	 * if we failed to multicast the message, this function will be called
-	 * again.
-	 */
-
-	return (0);
+	sync_primary_callback_fn (
+		member_list,
+		member_list_entries,
+		1,
+		ring_id);
 }
 
 int sync_in_process (void)
@@ -545,27 +445,7 @@ int sync_in_process (void)
 	return (sync_processing);
 }
 
-/**
- * Execute synchronization upon request for the named service
- * @param name
- *
- * @return int
- */
-int sync_request (char *name)
+int sync_primary_designated (void)
 {
-	assert (name != NULL);
-
-	ENTER();
-
-	if (sync_processing) {
-		return -1;
-	}
-
-	totempg_callback_token_create (&sync_request_token_handle,
-		TOTEM_CALLBACK_TOKEN_SENT, 0, /* don't delete after callback */
-		sync_request_send, name);
-
-	LEAVE();
-
-	return 0;
+	return (1);
 }

exec/sync.h

@@ -64,11 +64,4 @@ int sync_primary_designated (void);
  */
 extern int sync_request (char *name);
 
-extern void sync_primary_callback_fn (
-	unsigned int *view_list,
-	int view_list_entries,
-	int primary_designated,
-	struct memb_ring_id *ring_id);
-
-
 #endif /* SYNC_H_DEFINED */

exec/vsf_quorum.c

@@ -269,7 +269,7 @@ static int quorum_exec_init_fn (struct corosync_api_v1 *api)
 	/*
 	 * Tell corosync we have a quorum engine.
 	 */
-	api->quorum_initialize(&callins, &sync_primary_callback_fn);
+	api->quorum_initialize(&callins);
 
 	/*
 	 * Look for a quorum provider

include/corosync/engine/coroapi.h

@@ -512,8 +512,7 @@ struct corosync_api_v1 {
 	/*
 	 * This one is for the quorum management plugin's use
 	 */
-	int (*quorum_initialize)(struct quorum_callin_functions *fns,
-				 sync_callback_fn_t *sync_callback_fn);
+	int (*quorum_initialize)(struct quorum_callin_functions *fns);
 
 	/*
 	 * Plugin loading and unloading