Wed Aug 1 12:09:52 UTC 2007

Author: sdake

Update of /cvs/dist/rpms/openais/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv5341/devel

Modified Files:
	.cvsignore openais.spec sources 
Added Files:
	revision-1406.patch revision-1407.patch revision-1408.patch 
	revision-1409.patch 
Removed Files:
	revision-1223.patch revision-1230.patch revision-1245.patch 
	revision-1246.patch revision-1248.patch revision-1252.patch 
	revision-1256.patch revision-1257.patch revision-1258.patch 
	revision-1260.patch revision-1261.patch revision-1262.patch 
	revision-1263.patch revision-1264.patch revision-1265.patch 
Log Message:
auto-import openais-0.80.3-2 on branch devel from openais-0.80.3-2.src.rpm

revision-1406.patch:
 totemsrp.c |   30 +++++++++---------------------
 1 files changed, 9 insertions(+), 21 deletions(-)

--- NEW FILE revision-1406.patch ---
Index: exec/totemsrp.c
===================================================================
--- exec/totemsrp.c	(revision 1405)
+++ exec/totemsrp.c	(revision 1406)
@@ -393,8 +393,6 @@
 
 	unsigned int my_token_seq;
 
-	unsigned int my_commit_token_seq;
-
 	/*
 	 * Timers
 	 */
@@ -619,8 +617,6 @@
 
 	instance->my_token_seq = SEQNO_START_TOKEN - 1;
 
-	instance->my_commit_token_seq = SEQNO_START_TOKEN - 1;
-
 	instance->memb_state = MEMB_STATE_OPERATIONAL;
 
 	instance->set_aru = -1;
@@ -1646,8 +1642,6 @@
 	struct totemsrp_instance *instance,
 	int gather_from)
 {
-	instance->my_commit_token_seq = SEQNO_START_TOKEN - 1;
-
 	memb_set_merge (
 		&instance->my_id, 1,
 		instance->my_proc_list, &instance->my_proc_list_entries);
@@ -1733,8 +1727,6 @@
 
 	instance->memb_state = MEMB_STATE_COMMIT;
 
-	instance->my_commit_token_seq = SEQNO_START_TOKEN - 1;
-
 	/*
 	 * reset all flow control variables since we are starting a new ring
 	 */
@@ -3961,16 +3953,6 @@
 	addr = (struct srp_addr *)memb_commit_token->end_of_commit_token;
 	memb_list = (struct memb_commit_token_memb_entry *)(addr + memb_commit_token->addr_entries);
 
-	if (sq_lte_compare (memb_commit_token->token_seq,
-		instance->my_commit_token_seq)) {
-		/*
-		 * discard token
-		 */
-		return (0);
-	}
-	instance->my_commit_token_seq = memb_commit_token->token_seq;
-
-
 #ifdef TEST_DROP_COMMIT_TOKEN_PERCENTAGE
 	if (random()%100 < TEST_DROP_COMMIT_TOKEN_PERCENTAGE) {
 		return (0);
@@ -3998,9 +3980,15 @@
 			break;
 
 		case MEMB_STATE_COMMIT:
-//			if (memcmp (&memb_commit_token->ring_id, &instance->my_ring_id,
-//				sizeof (struct memb_ring_id)) == 0) {
-			 if (memb_commit_token->ring_id.seq == instance->my_ring_id.seq) {
+			/*
+			 * If retransmitted commit tokens are sent on this ring
+			 * filter them out and only enter recovery once the
+			 * commit token has traversed the array.  This is
+			 * determined by :
+		 	 * memb_commit_token->memb_index == memb_commit_token->addr_entries) {
+			 */
+			 if (memb_commit_token->ring_id.seq == instance->my_ring_id.seq &&
+				memb_commit_token->memb_index == memb_commit_token->addr_entries) {
 				memb_state_recovery_enter (instance, memb_commit_token);
 			}
 			break;

revision-1407.patch:
 totemsrp.c |    2 ++
 1 files changed, 2 insertions(+)

--- NEW FILE revision-1407.patch ---
Index: exec/totemsrp.c
===================================================================
--- exec/totemsrp.c	(revision 1406)
+++ exec/totemsrp.c	(revision 1407)
@@ -1548,6 +1548,8 @@
 	unsigned int new_memb_list_totemip[PROCESSOR_COUNT_MAX];
 	unsigned int left_list[PROCESSOR_COUNT_MAX];
 
+	memb_consensus_reset (instance);
+
 	old_ring_state_reset (instance);
 	ring_reset (instance);
 	deliver_messages_from_recovery_to_regular (instance);

revision-1408.patch:
 totemsrp.c |   17 +++++++++++------
 1 files changed, 11 insertions(+), 6 deletions(-)

--- NEW FILE revision-1408.patch ---
Index: exec/totemsrp.c
===================================================================
--- exec/totemsrp.c	(revision 1407)
+++ exec/totemsrp.c	(revision 1408)
@@ -549,7 +549,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);
@@ -1707,10 +1708,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);
@@ -1920,7 +1921,6 @@
 
 	reset_token_timeout (instance); // REVIEWED
 	reset_token_retransmit_timeout (instance); // REVIEWED
-	memb_ring_id_store (instance);
 
 	instance->memb_state = MEMB_STATE_RECOVERY;
 	return;
@@ -2829,6 +2829,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,
@@ -2840,13 +2841,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]));
 
@@ -2866,6 +2870,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);
 }
 

revision-1409.patch:
 totempg.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletion(-)

--- NEW FILE revision-1409.patch ---
Index: exec/totempg.c
===================================================================
--- exec/totempg.c	(revision 1408)
+++ exec/totempg.c	(revision 1409)
@@ -870,13 +870,14 @@
 /*
  * Determine if a message of msg_size could be queued
  */
+#define FUZZY_AVAIL_SUBTRACT 5
 static int send_ok (
 	int msg_size)
 {
 	int avail = 0;
 	int total;
 
-	avail = totemmrp_avail ();
+	avail = totemmrp_avail () - FUZZY_AVAIL_SUBTRACT;
 	
 	/*
 	 * msg size less then totempg_totem_config->net_mtu - 25 will take up


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/openais/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	16 Aug 2006 04:45:44 -0000	1.7
+++ .cvsignore	1 Aug 2007 12:09:50 -0000	1.8
@@ -1 +1 @@
-openais-0.80.1.tar.gz
+openais-0.80.3.tar.gz


Index: openais.spec
===================================================================
RCS file: /cvs/dist/rpms/openais/devel/openais.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- openais.spec	14 Oct 2006 00:49:26 -0000	1.19
+++ openais.spec	1 Aug 2007 12:09:50 -0000	1.20
@@ -1,29 +1,19 @@
 Name: openais
 Summary: The openais Standards-Based Cluster Framework executive and APIs
-Version: 0.80.1
-Release: 6
+Version: 0.80.3
+Release: 2%{?dist}
 License: BSD
 Group: System Environment/Base
 URL: http://developer.osdl.org/dev/openais/
 Source0: http://developer.osdl.org/dev/openais/downloads/openais-%{version}/openais-%{version}.tar.gz
 Patch0: openais-0.76-defaultconfig.patch
-Patch1: revision-1223.patch
-Patch2: revision-1230.patch
-Patch3: revision-1245.patch
-Patch4: revision-1246.patch
-Patch5: revision-1248.patch
-Patch6: revision-1252.patch
-Patch7: revision-1256.patch
-Patch8: revision-1257.patch
-Patch9: revision-1258.patch
-Patch10: revision-1260.patch
-Patch11: revision-1261.patch
-Patch12: revision-1262.patch
-Patch13: revision-1263.patch
-Patch14: revision-1264.patch
-Patch15: revision-1265.patch
+Patch1: revision-1406.patch
+Patch2: revision-1407.patch
+Patch3: revision-1408.patch
+Patch4: revision-1409.patch
+
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-ExclusiveArch: i386 ppc x86_64 ppc64 ia64 s390 s390x
+ExclusiveArch: i386 ppc x86_64 ppc64 ia64 s390 s390x alpha
 Requires(pre): /usr/sbin/useradd
 Requires(post): /sbin/chkconfig
 Requires(preun): /sbin/chkconfig
@@ -47,20 +37,9 @@
 %setup -q -n openais-%{version}
 %patch0
 %patch1
-%patch2 
+%patch2
 %patch3
 %patch4
-%patch5
-%patch6
-%patch7
-%patch8
-%patch9
-%patch10
-%patch11
-%patch12
-%patch13
-%patch14
-%patch15
 
 %build
 # -O3 required for performance reasons
@@ -103,6 +82,7 @@
 
 %files 
 %defattr(-,root,root,-)
+%dir %{_docdir}/%{name}-%{version}
 %doc %{_docdir}/%{name}-%{version}/LICENSE
 %doc %{_docdir}/%{name}-%{version}/SECURITY
 %doc %{_docdir}/%{name}-%{version}/README.amf
@@ -175,6 +155,7 @@
 %{_includedir}/openais/service/print.h
 %{_includedir}/openais/service/swab.h
 %{_includedir}/openais/service/service.h
+%{_includedir}/openais/service/timer.h
 %{_mandir}/man3/cpg_dispatch.3*
 %{_mandir}/man3/cpg_fd_get.3*
 %{_mandir}/man3/cpg_finalize.3*
@@ -183,6 +164,9 @@
 %{_mandir}/man3/cpg_leave.3*
 %{_mandir}/man3/cpg_mcast_joined.3*
 %{_mandir}/man3/cpg_membership_get.3*
+%{_mandir}/man3/cpg_local_get.3*
+%{_mandir}/man3/cpg_context_get.3*
+%{_mandir}/man3/cpg_context_set.3*
 %{_mandir}/man3/evs_dispatch.3*
 %{_mandir}/man3/evs_fd_get.3*
 %{_mandir}/man3/evs_finalize.3*
@@ -194,6 +178,131 @@
 %{_mandir}/man3/evs_membership_get.3*
 
 %changelog
+* Tue Aug 1 2007 Steven Dake <sdake at redhat.com> - 0.80.3-2
+- Resolves: rhbz#209862
+- Add upstream revision 1406 - Filter commit token when it is retransmitted.
+- Resolves: rhbz#249506
+- Add upstream revision 1407 - Reset consensus array on entering operational mode.
+- Resolves: rhbz#249509
+- Add upstream revision 1408 - Store the ring id information properly when it changes.
+- Resolves: rhbz#247733
+- Add upstream revision 1409 - Add subtractor to availability of message entries for the totem message queue
+- This is the rhel5 version of 0.80.3-0 with some upstream patches.
+
+* Tue Jun 26 2007 Steven Dake <sdake at redhat.com> - 0.80.3-1
+- Resolves: rhbz#243119
+- Resolves: rhbz#221190
+- Resolves: rhbz#224190
+- Resolves: rhbz#233892
+- Resolves: rhbz#236549
+- New upstream version including all previous revisions.
+- This is the fc6 version of 0.80.3-1.
+
+* Tue Jun 26 2007 Steven Dake <sdake at redhat.com> - 0.80.3-0
+- Resolves: rhbz#243119
+- Resolves: rhbz#221190
+- Resolves: rhbz#224190
+- Resolves: rhbz#233892
+- Resolves: rhbz#236549
+- New upstream version including all previous revisions.
+- This is the rhel5 version of 0.80.3-0.
+
+* Mon Dec 18 2006 Steven Dake <sdake at redhat.com> - 0.80.2-1
+- Resolves: rhbz#211357
+- This is the rhel5 version of 0.80.2-0.
+
+* Mon Dec 18 2006 Steven Dake <sdake at redhat.com> - 0.80.2-0
+- Resolves: rhbz#211357
+- New upstream version including all prevision revisions.
+- Fixes cpg ordering problem.
+- Fixes ia64 unaligned problem.
+- This is the fc6 version.
+
+* Tue Dec 5 2006 Steven Dake <sdake at redhat.com> - 0.80.1-22
+- Resolves: rhbz#216492
+- This is the rhel5 version of 0.80.1-21.
+
+* Tue Dec 5 2006 Steven Dake <sdake at redhat.com> - 0.80.1-21
+- Resolves: rhbz#216492
+- Add upstream revision 1319 - Increase outbound buffer size to 5000 messages.
+- Add upstream revision 1316 - Improvements on segfault logging.
+- This is the fc6 version.
+
+* Wed Nov 29 2006 Steven Dake <sdake at redhat.com> - 0.80.1-20
+- Resolves: rhbz#216492
+- Need new res line to commit.  This is the same as 0.80.1-18.
+
+* Wed Nov 29 2006 Steven Dake <sdake at redhat.com> - 0.80.1-19
+- This is the rhel5 version of 0.80.1-18.
+
+* Wed Nov 29 2006 Steven Dake <sdake at redhat.com> - 0.80.1-18
+- Add upstream revision 1315 - Fix compile error in libcpg.
+- Add upstream revision 1314 - Change rundir to /var/openais.
+- Add upstream revision 1313 - Flow control fixes for the CPG service.
+- Add upstream revision 1312 - Correct usage of ERR_LIBRARY to SA_AIS_ERR_LIBRARY.
+- Add upstream revision 1311 - handle case where POLLHUP and POLLERR are not uspported by OS.
+- Add upstream revision 1309 - set default downcheck value to 1000ms.
+- Add upstream revision 1308 - Remove invalid code and warnings detected by Intel compiler.
+- This is the fc6 version.
+
+* Tue Nov 14 2006 Steven Dake <sdake at redhat.com> - 0.80.1-17
+- This is the rhel5 version of 0.80.1-16.
+
+* Tue Nov 14 2006 Steven Dake <sdake at redhat.com> - 0.80.1-16
+- Add upstream revision 1307 - Remove flow control compile warning.
+- Add upstream revision 1306 - Make clean now really makes clean.
+- Add upstream revision 1305 - Set scheduler SCHED_RR to max priority available
+  in system.
+- Add upstream revision 1300 - Improve behavior of flow control of CPG service
+  during configuration changes.
+- This is the fc6 version.
+
+* Thu Nov 9 2006 Steven Dake <sdake at redhat.com> - 0.80.1-15
+- This is the rhel5 version of 0.80.1-14
+
+* Thu Nov 9 2006 Steven Dake <sdake at redhat.com> - 0.80.1-14
+- Add upstream revision 1296 - Remove compile warnings.
+- Add upstream revision 1295 - The totem membership protocol was changed to
+- Add upstream revision 1294 - modify location of ringid file to
+- Add upstream revision 1293 - flush output of debug messages on exit or segv.
+  /var/run/openais and chdir here so cores are saved there.
+  match specifications.
+- This is the fc6 version.
+
+* Fri Nov 3 2006 Steven Dake <sdake at redhat.com> - 0.80.1-13
+- Add upstream revision 1286 - Fix checkpoint unlink operation under certain
+  conditions.  This is the rhel5 version.
+
+* Fri Nov 3 2006 Steven Dake <sdake at redhat.com> - 0.80.1-12
+- Add upstream revision 1286 - Fix checkpoint unlink operation under certain
+  conditions.  This is the fc6 version.
+
+* Tue Oct 24 2006 Steven Dake <sdake at redhat.com> - 0.80.1-11
+- Add upstream revision 1284 - Initialize variables for checkpoint sync.
+
+* Tue Oct 24 2006 Steven Dake <sdake at redhat.com> - 0.80.1-10
+- Add %{?dist} to release field.
+
+* Tue Oct 24 2006 Steven Dake <sdake at redhat.com> - 0.80.1-9
+- Add upstream revision 1270 - Resolve IPC segfault.
+- Add upstream revision 1271 - Fix errors in ia64 alignment.
+- Add upstream revision 1275 - pthread_mutex_destroy cleanup patch.
+- Add upstream revision 1276 - Remove debug from makefile committed in revision 1275.
+- Add upstream revision 1277 - Formatting changes.
+- Add upstream revision 1278 - Patch testckpt to use proper seciton id size.
+- Add upstream revision 1279 - Call abort in sync service when processing is interrupted.
+- Add upstream revision 1282 - New generation checkpoint state machine.
+- Add upstream revision 1283 - Fix memory leaks.
+
+* Wed Oct 18 2006 Steven Dake <sdake at redhat.com> - 0.80.1-8
+- Add upstream revision 1268 - Align data in totem delivery on 4 byte
+  boundaries for ia64.
+- Add upstream revision 1269 - Increase default stack size for IPC connections
+  on ia64.
+
+* Mon Oct 16 2006 Steven Dake <sdake at redhat.com> - 0.80.1-7
+- Add upstream revision 1267 - rework of checkpoint synchronization.
+
 * Thu Oct 12 2006 Steven Dake <sdake at redhat.com> - 0.80.1-6
 - Add upstream revision 1260 - Allocate the retransmission token in
   instance initialize instead of totemsrp_initialize.


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/openais/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	16 Aug 2006 04:45:44 -0000	1.7
+++ sources	1 Aug 2007 12:09:50 -0000	1.8
@@ -1 +1 @@
-7414d683d51cb00c46456125c7e1b2b0  openais-0.80.1.tar.gz
+05ac1e10abd31f500641ff48ecf4238f  openais-0.80.3.tar.gz


--- revision-1223.patch DELETED ---


--- revision-1230.patch DELETED ---


--- revision-1245.patch DELETED ---


--- revision-1246.patch DELETED ---


--- revision-1248.patch DELETED ---


--- revision-1252.patch DELETED ---


--- revision-1256.patch DELETED ---


--- revision-1257.patch DELETED ---


--- revision-1258.patch DELETED ---


--- revision-1260.patch DELETED ---


--- revision-1261.patch DELETED ---


--- revision-1262.patch DELETED ---


--- revision-1263.patch DELETED ---


--- revision-1264.patch DELETED ---


--- revision-1265.patch DELETED ---


