rpms/keepalived
5
0
Fork 0
Code Issues Pull Requests Releases Activity

Update to 1.2.16

Browse Source
This commit is contained in:
Ryan O'Hara 2015-04-01 08:53:14 -05:00
parent 7424b42dcf
commit f825d83dce
5 changed files with 7 additions and 98 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -5,3 +5,4 @@
/keepalived-1.2.13.tar.gz
/keepalived-1.2.14.tar.gz
/keepalived-1.2.15.tar.gz
/keepalived-1.2.16.tar.gz

25
0001-Fix-format-of-long-int.patch
View File

@ -1,25 +0,0 @@
From 03451c7f5be641d89c63dec8ee07ab4f9e275ebb Mon Sep 17 00:00:00 2001
From: Ryan O'Hara <rohara@redhat.com>
Date: Tue, 16 Dec 2014 13:25:55 -0600
Subject: [PATCH] Fix format of long int in log_message call
---
keepalived/vrrp/vrrp_snmp.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/keepalived/vrrp/vrrp_snmp.c b/keepalived/vrrp/vrrp_snmp.c
index 6df7795..ef8ef97 100644
--- a/keepalived/vrrp/vrrp_snmp.c
+++ b/keepalived/vrrp/vrrp_snmp.c
@@ -541,7 +541,7 @@ vrrp_snmp_instance_priority(int action,
/* Commit: change values. There is no way to fail. */
log_message(LOG_INFO,
"VRRP_Instance(%s) base priority changed from"
- " %d to %d via SNMP.",
+ " %d to %ld via SNMP.",
vrrp->iname, vrrp->base_priority, (long)(*var_val));
vrrp->base_priority = (long)(*var_val);
/* If we the instance is not part of a sync group, the
--
1.9.3

10
keepalived.spec
View File

@ -8,8 +8,8 @@
Name: keepalived
Summary: High Availability monitor built upon LVS, VRRP and service pollers
Version: 1.2.15
Release: 3%{?dist}
Version: 1.2.16
Release: 1%{?dist}
License: GPLv2+
URL: http://www.keepalived.org/
Group: System Environment/Daemons
@ -17,8 +17,6 @@ Group: System Environment/Daemons
Source0: http://www.keepalived.org/software/keepalived-%{version}.tar.gz
Source1: keepalived.service
Patch0: vrrp-revert-previous-preempt-extension.patch
Requires(post): systemd
Requires(preun): systemd
Requires(postun): systemd
@ -49,7 +47,6 @@ infrastructures.
%prep
%setup -q
%patch0 -p1
%build
%configure \
@ -104,6 +101,9 @@ rm -rf %{buildroot}
%{_mandir}/man8/keepalived.8*
%changelog
* Wed Apr 01 2015 Ryan O'Hara <rohara@redhat.com> - 1.2.16-1
- Update to 1.2.16
* Wed Mar 18 2015 Ryan O'Hara <rohara@redhat.com> - 1.2.15-3
- Revert previous preempt extension (#1202584)

2
sources
View File

@ -1 +1 @@
d85fcb8e564ea03b0ca7b2357bf30c51 keepalived-1.2.15.tar.gz
f834ab2cfc2e7300edf1bafaf4a5d83e keepalived-1.2.16.tar.gz

67
vrrp-revert-previous-preempt-extension.patch
View File

@ -1,67 +0,0 @@
From 2bab517b2b50c1e784e79a082d971f4855e9e0ab Mon Sep 17 00:00:00 2001
From: Alexandre Cassen <acassen@gmail.com>
Date: Tue, 17 Mar 2015 21:07:36 +0100
Subject: [PATCH] vrrp: revert previous preempt extension
Well, nothing more to add ;)
---
keepalived/vrrp/vrrp.c | 22 ++++++----------------
1 file changed, 6 insertions(+), 16 deletions(-)
diff --git a/keepalived/vrrp/vrrp.c b/keepalived/vrrp/vrrp.c
index 21481f4..db43f8f 100644
--- a/keepalived/vrrp/vrrp.c
+++ b/keepalived/vrrp/vrrp.c
@@ -819,8 +819,7 @@ vrrp_state_goto_master(vrrp_t * vrrp)
return;
}
- if (!vrrp->nopreempt)
- vrrp_send_adv(vrrp, vrrp->effective_priority);
+ vrrp_send_adv(vrrp, vrrp->effective_priority);
vrrp->state = VRRP_STATE_MAST;
log_message(LOG_INFO, "VRRP_Instance(%s) Transition to MASTER STATE"
@@ -999,19 +998,7 @@ vrrp_state_master_rx(vrrp_t * vrrp, char *buf, int buflen)
"VRRP_Instance(%s) Dropping received VRRP packet...",
vrrp->iname);
return 0;
- } else if (hd->priority == 0) {
- vrrp_send_adv(vrrp, vrrp->effective_priority);
- return 0;
- } else if (hd->priority < vrrp->effective_priority ||
- (hd->priority == vrrp->effective_priority &&
- vrrp_saddr_cmp(&vrrp->pkt_saddr, vrrp) < 0)) {
- /* In nopreempt mode, just switch to BACKUP */
- if (vrrp->nopreempt) {
- log_message(LOG_INFO, "VRRP_Instance(%s) Received lower prio advert"
- " in nopreempt mode", vrrp->iname);
- goto backup;
- }
-
+ } else if (hd->priority < vrrp->effective_priority) {
/* We receive a lower prio adv we just refresh remote ARP cache */
log_message(LOG_INFO, "VRRP_Instance(%s) Received lower prio advert"
", forcing new election", vrrp->iname);
@@ -1026,6 +1013,9 @@ vrrp_state_master_rx(vrrp_t * vrrp, char *buf, int buflen)
vrrp_send_adv(vrrp, vrrp->effective_priority);
vrrp_send_link_update(vrrp, vrrp->garp_rep);
return 0;
+ } else if (hd->priority == 0) {
+ vrrp_send_adv(vrrp, vrrp->effective_priority);
+ return 0;
} else if (hd->priority > vrrp->effective_priority ||
(hd->priority == vrrp->effective_priority &&
vrrp_saddr_cmp(&vrrp->pkt_saddr, vrrp) > 0)) {
@@ -1044,7 +1034,7 @@ vrrp_state_master_rx(vrrp_t * vrrp, char *buf, int buflen)
vrrp->ipsecah_counter->seq_number = ntohl(ah->seq_number) - 1;
vrrp->ipsecah_counter->cycle = 0;
}
- backup:
+
vrrp->ms_down_timer = 3 * vrrp->adver_int + VRRP_TIMER_SKEW(vrrp);
vrrp->wantstate = VRRP_STATE_BACK;
vrrp->state = VRRP_STATE_BACK;
--
1.9.3