Attachment 159909 Details for Bug 249509 – patch to fix the problem.

[patch] patch to fix the problem.

ring_id_store_properly.patch (text/plain), 2.39 KB, created by Steven Dake on 2007-07-25 09:48:31 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Steven Dake

Created: 2007-07-25 09:48:31 UTC

Size: 2.39 KB

patch

obsolete

>Index: totemsrp.c
>===================================================================
>--- totemsrp.c	(revision 1400)
>+++ totemsrp.c	(working copy)
>@@ -551,7 +551,8 @@
> 	int fcc_mcasts_allowed);
> static void messages_free (struct totemsrp_instance *instance, unsigned int token_aru);
> 
>-static void memb_ring_id_store (struct totemsrp_instance *instance);
>+static void memb_ring_id_set_and_store (struct totemsrp_instance *instance);
>+	struct memb_ring_id *ring_id);
> static void memb_state_commit_token_update (struct totemsrp_instance *instance, struct memb_commit_token *commit_token);
> static void memb_state_commit_token_target_set (struct totemsrp_instance *instance, struct memb_commit_token *commit_token);
> static int memb_state_commit_token_send (struct totemsrp_instance *instance, struct memb_commit_token *memb_commit_token);
>@@ -1711,10 +1712,10 @@
> 
> 	memb_state_commit_token_target_set (instance, commit_token);
> 
>+	memb_ring_id_set_and_store (instance, &commit_token->ring_id);
>+
> 	memb_state_commit_token_send (instance, commit_token);
> 
>-	memcpy (&instance->my_ring_id, &commit_token->ring_id,
>-		sizeof (struct memb_ring_id));
> 	instance->token_ring_id_seq = instance->my_ring_id.seq;
> 
> 	poll_timer_delete (instance->totemsrp_poll_handle, instance->memb_timer_state_gather_join_timeout);
>@@ -1926,7 +1927,6 @@
> 
> 	reset_token_timeout (instance); // REVIEWED
> 	reset_token_retransmit_timeout (instance); // REVIEWED
>-	memb_ring_id_store (instance);
> 
> 	instance->memb_state = MEMB_STATE_RECOVERY;
> 	return;
>@@ -2835,6 +2835,7 @@
> 		}
> 		res = write (fd, &memb_ring_id->seq, sizeof (unsigned long long));
> 		assert (res == sizeof (unsigned long long));
>+		fsync (fd);
> 		close (fd);
> 	} else {
> 		log_printf (instance->totemsrp_log_level_warning,
>@@ -2846,13 +2847,16 @@
> 	instance->token_ring_id_seq = memb_ring_id->seq;
> }
> 
>-static void memb_ring_id_store (
>-	struct totemsrp_instance *instance)
>+static void memb_ring_id_set_and_store (
>+	struct totemsrp_instance *instance,
>+	struct memb_ring_id *ring_id)
> {
> 	char filename[256];
> 	int fd;
> 	int res;
> 
>+	memcpy (&instance->my_ring_id, ring_id, sizeof (struct memb_ring_id));
>+
> 	sprintf (filename, "%s/ringid_%s",
> 		rundir, totemip_print (&instance->my_id.addr[0]));
> 
>@@ -2872,6 +2876,7 @@
> 	//assert (fd > 0);
> 	res = write (fd, &instance->my_ring_id.seq, sizeof (unsigned long long));
> 	assert (res == sizeof (unsigned long long));
>+	fsync (fd);
> 	close (fd);
> }
>

Actions: View | Diff

Attachments on bug 249509: 159909