proxmox-mirrors/mirror_corosync
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_corosync synced 2025-07-24 14:04:04 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

defect 1153

Browse Source 
Fix segfault with sync service if syncronization is interrupted during recovery.


git-svn-id: http://svn.fedorahosted.org/svn/corosync/trunk@960 fd59a12c-fef9-0310-b244-a6a79926bd2f
This commit is contained in:
Steven Dake 2006-03-29 19:02:42 +00:00
parent 728b79d7d4
commit f52c38ffac
1 changed files with 29 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
exec/sync.c
View File

@ -53,6 +53,7 @@
#include "sync.h"
#include "totempg.h"
#include "totemip.h"
#include "totem.h"
#include "ykd.h"
#include "print.h"
#include "swab.h"
@ -102,6 +103,13 @@ static void sync_deliver_fn (
int iov_len,
int endian_conversion_required);
void sync_confchg_fn (
enum totem_configuration_type configuration_type,
struct totem_ip_address *member_list, int member_list_entries,
struct totem_ip_address *left_list, int left_list_entries,
struct totem_ip_address *joined_list, int joined_list_entries,
struct memb_ring_id *ring_id);
void sync_primary_callback_fn (
struct totem_ip_address *view_list,
int view_list_entries,
@ -155,7 +163,6 @@ void sync_start_init (struct memb_ring_id *ring_id)
static void sync_service_init (struct memb_ring_id *ring_id)
{
// AA
sync_callbacks.sync_init ();
totempg_callback_token_destroy (&sync_callback_token_handle);
@ -213,6 +220,14 @@ static int sync_service_process (enum totem_callback_token_type type, void *data
struct memb_ring_id *ring_id = (struct memb_ring_id *)data;
/*
* If process operation not from this ring id, then ignore it and stop
* processing
*/
if (memcmp (ring_id, sync_ring_id, sizeof (struct memb_ring_id)) != 0) {
return (0);
}
/*
* If process returns 0, then its time to activate
* and start the next service's synchronization
@ -250,7 +265,7 @@ void sync_register (
totempg_groups_initialize (
&sync_group_handle,
sync_deliver_fn,
NULL);
sync_confchg_fn);
totempg_groups_join (
sync_group_handle,
@ -285,8 +300,6 @@ void sync_primary_callback_fn (
totempg_callback_token_destroy (&sync_callback_token_handle);
sync_ring_id = ring_id;
sync_recovery_index = 0;
sync_callback_loaded = 0;
memset (&barrier_data_confchg, 0, sizeof (barrier_data_confchg));
@ -297,7 +310,7 @@ void sync_primary_callback_fn (
memcpy (barrier_data_process, barrier_data_confchg,
sizeof (barrier_data_confchg));
barrier_data_confchg_entries = view_list_entries;
sync_start_init (ring_id);
sync_start_init (sync_ring_id);
}
static struct memb_ring_id deliver_ring_id;
@ -387,8 +400,18 @@ void sync_deliver_fn (
return;
}
void sync_confchg_fn (
enum totem_configuration_type configuration_type,
struct totem_ip_address *member_list, int member_list_entries,
struct totem_ip_address *left_list, int left_list_entries,
struct totem_ip_address *joined_list, int joined_list_entries,
struct memb_ring_id *ring_id)
{
sync_ring_id = ring_id;
}
int sync_in_process (void)
{
return (sync_processing);
}