Merge lp:~andreserl/ubuntu/natty/keepalived/lp619712 into lp:ubuntu/natty/keepalived

[Andres Rodriguez]

Unmerged revisions

14. By Andres Rodriguez on 2011-03-22

debian/patches/fix_vrrp_race_condition.patch: Fix infinite loop in master
transition with sync groups. Patch taken from upstream (LP: #619712)

=== modified file 'debian/changelog'
--- debian/changelog	2010-10-30 20:01:07 +0000
+++ debian/changelog	2011-03-22 19:01:05 +0000
@@ -1,3 +1,10 @@
+keepalived (1:1.1.20-1ubuntu2) natty; urgency=low
+
+  * debian/patches/fix_vrrp_race_condition.patch: Fix infinite loop in master
+    transition with sync groups. Patch taken from upstream (LP: #619712)
+
+ -- Andres Rodriguez <[e-mail]>  Tue, 22 Mar 2011 14:46:18 -0400
+
 keepalived (1:1.1.20-1ubuntu1) natty; urgency=low
 
   * Merge from debian unstable (LP: #668818), remaining changes:
 
=== added file 'debian/patches/fix_vrrp_race_condition.patch'
--- debian/patches/fix_vrrp_race_condition.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/fix_vrrp_race_condition.patch	2011-03-22 19:01:05 +0000
@@ -0,0 +1,21 @@
+Description: Fix VRRP Race Condition
+ Patch fixes an infinite loop in master transition with sync groups.
+ When transitioning to master state, keepalived might try to force
+ transition to master state of other VRRP instances into the same group
+ before their transition is complete. This leads to an infinite loop
+ with huge VRRP trafic.
+Author: Arjan Filius
+Origin: http://git.formilux.org/?p=people/alex/keepalived.git;a=commit;h=c75f8f16d9094f605f4cfffbc5b29e0d547f307b
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/keepalived/+bug/619712
+diff -Nur -x '*.orig' -x '*~' keepalived//keepalived/vrrp/vrrp_sync.c keepalived.new//keepalived/vrrp/vrrp_sync.c
+--- keepalived//keepalived/vrrp/vrrp_sync.c	2011-03-22 14:34:29.207856000 -0400
++++ keepalived.new//keepalived/vrrp/vrrp_sync.c	2011-03-22 14:35:02.398020751 -0400
+@@ -154,7 +154,7 @@
+ 	/* Perform sync index */
+ 	for (e = LIST_HEAD(l); e; ELEMENT_NEXT(e)) {
+ 		isync = ELEMENT_DATA(e);
+-		if (isync != vrrp) {
++		if (isync != vrrp && isync->wantstate != VRRP_STATE_GOTO_MASTER) {
+ 			/* Force a new protocol master election */
+ 			isync->wantstate = VRRP_STATE_GOTO_MASTER;
+ 			log_message(LOG_INFO,