Dominique Leuenberger 2019-04-18 11:58:39 +00:00 committed by Git OBS Bridge
commit 726a95b20c
5 changed files with 128 additions and 4 deletions

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:1bf586e56ee38b47b82f2a27b27e04d0e5b23f1810db6a8e801bde9d3eb8617b
size 966917

3
keepalived-2.0.15.tar.gz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:933ee01bc6346aa573453b998f87510d3cce4aba4537c9642b24e6dbfba5c6f4
size 972461

View File

@ -1,3 +1,111 @@
-------------------------------------------------------------------
Tue Apr 16 19:04:13 UTC 2019 - Marcus Rueckert <mrueckert@suse.de>
- added systemd-after-snmp.patch:
If you want to use the snmp support the masterx socket needs be
available otherwise the snmp support is broken
strictly speaking we would need to use BindsTo= here but that
would require that add a Requires for net-snmp to the keepalived
package. to be discussed.
-------------------------------------------------------------------
Tue Apr 16 19:01:38 UTC 2019 - Marcus Rueckert <mrueckert@suse.de>
- update to 2.0.15
- Fix uninitialised variable.
- Fix rpmbuild on CentOS7, and rely on auto-requires.
- Add option to flush lvs on shutdown. Currently all known
virtual servers and their real servers are removed one at a
time at shutdown. With large configurations on a busy system,
this can take some time. Add an option just like the existing
'lvs_flush' which operates on shutdown. Typical environments
with a single keepalived instance can take advantage of this
option to achieve a faster shutdown or restart cycle.
- Make alpha mode checkers on new real servers start down on
reload. Patch #1180 identified that new real servers with
alpha mode checkers were being added online immediately, and if
the checker then failed were being removed. This commit makes
real servers that didn't exist before the reload start in down
state if they have alpha mode checkers.
- Remove duplicate config dump entry.
- Make new real servers at reload start down if have alpha mode
checkers.
- Close checker and smtp_alert sockets on reload. Issue #1177
identified that sockets were being left open (lost) after a
reload. It transpired that these were sockets opened by
TCP_CHECK, HTTP_GET, SSL_GET, DNS_CHECK and SMTP_CHECK
checkers, and by smtp_alerts in the process of being sent.
This commit adds an extra parameter to thread_add_read() and
thread_add_write() to allow indicating that the scheduler
should close the socket when destroying threads.
- Send vrrp group backup notifies at startup.
- Make inhibit_on_failure be inherited by real server from
virtual server.
- Allow real and sorry servers to be configured with port 0 This
is to maintain backwards compatibility with keepalived prior to
commit d87f07c - "Ensure always check return from
inet_stosockaddr when parsing config". The proper way to
configure this is to omit the port, which requires the next
commit.
- Don't setup IPVS config with real and virtual servers ports
different. If the real server is using DR or TUN, the port of
the real server must be the same as the port of the virtual
server. This commit uses the virtual server port for the real
server when configuring IPVS.
- Log warnings if real server and virtual server ports don't
match This commit adds logging warnings if virtual and real
server ports, when using TUN or DR, don't match. It also sets
the real server ports to be the same as the virtual server
ports. Although listing the IPVS configuration with ipvsadm
will look different, the kernel ignored the port of a real
server when using DR or TUN, so the behaviour isn't changed,
but when looking at the configuration it now shows what is
actually happening.
- Fix warning when protocol specified for virtual server with
fwmark.
- Add log message that nb_get_retry is deprecated.
- Fix whitespace in configure.ac.
- Fix configure error when systemd not installed configure was
trying to execute pkg-config --variable=systemdsystemunitdir
systemd even if systemd was not available. This commit makes
configure only execute the above if it has determined that
systemd is the correct init package to use.
- Correct references to RFC6527 (VRRPv3 SNMP RFC).
- nsure checker->has_run is always set once a checker has run.
- Fix some indentation in configure.ac.
- Update fopen_safe() to open temporary file in destination
directory rename() in fopen_safe() was failing if the file
being created was not on the same filesystem as /tmp.
- Add ${_RANDOM} configuration keyword. It might seem strange to
introduce random elements to configuration files, but it can be
useful for testing.
- Fix using ~SEQ() in multiline configuration definitions.
- Make blank lines terminate a multiline definition.
- Minor updates for lvs_flush_on_stop.
- Add option to skip deleting real servers on shutdown or reload
If a virtual server is removed, the kernel will remove its real
servers, so keepalived doesn't explicitly need to do so. The
lvs_flush_onstop option removes all LVS configuration, whereas
this new option will only remove the virtual servers managed by
keepalived.
- Correct error message re checker_log_all_failures.
- Fix syntax error in configure.ac.
- Fix track_process initialisation for processes with PIDs
starting 9.
- Remove debugging log message.
- Remove inappropriate function const attributes They were
causing iptables/ipsets not to be initialised.
- Stop warning: function might be candidate for attribute
‘const’ Depending on what configure options are selected,
gcc can output the above warning for
initialise_debug_options(). This commit ensures that the
warning is not produced.
- Enable strict-config-checks option in keepalived.spec RPM file.
- vrrp: relax attribute 'const' warning at iptables helpers.
- Propagate libm to KA_LIBS.
- Fix building on Alpine Linux. Alpine (musl) doesn't have a
definition of __GNU_PREREQ, so create a dummy definition.
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Apr 3 13:52:51 UTC 2019 - Marcus Rueckert <mrueckert@suse.de> Wed Apr 3 13:52:51 UTC 2019 - Marcus Rueckert <mrueckert@suse.de>

View File

@ -43,7 +43,7 @@
%bcond_without json %bcond_without json
Name: keepalived Name: keepalived
Version: 2.0.14 Version: 2.0.15
Release: 0 Release: 0
Summary: A keepalive facility for Linux Summary: A keepalive facility for Linux
License: GPL-2.0-or-later License: GPL-2.0-or-later
@ -54,6 +54,7 @@ Source2: keepalive-rpmlintrc
Patch1: keepalive-init.patch Patch1: keepalive-init.patch
# PATCH-FIX-UPSTREAM: https://github.com/acassen/keepalived/commit/947248af144bcab6376ccddab8dc40f313b14281.patch # PATCH-FIX-UPSTREAM: https://github.com/acassen/keepalived/commit/947248af144bcab6376ccddab8dc40f313b14281.patch
Patch2: linux-4.15.patch Patch2: linux-4.15.patch
Patch3: systemd-after-snmp.patch
BuildRequires: file-devel BuildRequires: file-devel
BuildRequires: net-snmp-devel BuildRequires: net-snmp-devel
BuildRequires: pkgconfig BuildRequires: pkgconfig
@ -101,6 +102,7 @@ resilient infrastructures.
%setup -q %setup -q
%patch1 -p1 %patch1 -p1
%patch2 -p1 %patch2 -p1
%patch3 -p1
chmod 644 doc/samples/* chmod 644 doc/samples/*
%build %build

14
systemd-after-snmp.patch Normal file
View File

@ -0,0 +1,14 @@
Index: keepalived-2.0.15/keepalived/keepalived.service.in
===================================================================
--- keepalived-2.0.15.orig/keepalived/keepalived.service.in
+++ keepalived-2.0.15/keepalived/keepalived.service.in
@@ -1,7 +1,7 @@
[Unit]
Description=LVS and VRRP High Availability Monitor
-After= network-online.target syslog.target
-Wants=network-online.target
+After= network-online.target syslog.target snmpd.service
+Wants=network-online.target snmpd.service
[Service]
Type=forking