From e9e3f44c43245dc2ab23e6b5d0e8c90e2cd0e48f Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Dec 11 2020 06:11:42 +0000
Subject: import keepalived-2.0.10-11.el8_3.1


---

diff --git a/SOURCES/bz1868077-fix-intermittent-child-lost-messages.patch b/SOURCES/bz1868077-fix-intermittent-child-lost-messages.patch
new file mode 100644
index 0000000..f562eec
--- /dev/null
+++ b/SOURCES/bz1868077-fix-intermittent-child-lost-messages.patch
@@ -0,0 +1,62 @@
+From 21482202567979b8a17cc750b095272b3270ee76 Mon Sep 17 00:00:00 2001
+From: Quentin Armitage <quentin@armitage.org.uk>
+Date: Wed, 13 Nov 2019 10:37:38 +0000
+Subject: [PATCH] Fix intermittent "child lost" messages
+
+Issue #1364 identified that occassionaly a "child lost" message could
+be logged. Although keepalived continued working as expected, the
+"child lost" message indicated that something wasn't working properly.
+
+If a vrrp track script had a timeout in the script that was the
+same as the script timeout configured in keepalived, when the system
+was heavily loaded it was possible for the timeout to occur, followed
+by the termination before the timeout thread was run, in which case
+the termination would be lost because the child thread was no longer
+on the child_pid queue, but on the ready queue.
+
+This commit leaves threads on the child_pid queue after a timeout, and
+only removes it when the timeout thread is run. That means that if the
+termination is received before the timeout thread is run, the thread
+(now on the ready queue) can be updated to be a termination rather than
+a timeout.
+
+Signed-off-by: Quentin Armitage <quentin@armitage.org.uk>
+---
+ lib/scheduler.c | 14 ++++++++++++++
+ 1 file changed, 14 insertions(+)
+
+diff --git a/lib/scheduler.c b/lib/scheduler.c
+index 0a1c334c..f6d9bad1 100644
+--- a/lib/scheduler.c
++++ b/lib/scheduler.c
+@@ -1708,6 +1708,14 @@ process_threads(thread_master_t *m)
+ 		 * We only want timer and signal fd, and don't want inotify, vrrp socket,
+ 		 * snmp_read, bfd_receiver, bfd pipe in vrrp/check, dbus pipe or netlink fds. */
+ 		thread = thread_trim_head(thread_list);
++
++		if (thread && thread->type == THREAD_CHILD_TIMEOUT) {
++			/* We remove the thread from the child_pid queue here so that
++			 * if the termination arrives before we processed the timeout
++			 * we can still handle the termination. */
++			rb_erase(&thread->rb_data, &master->child_pid);
++		}
++
+ 		if (!shutting_down ||
+ 		    (thread->type == THREAD_READY_FD &&
+ 		     (thread->u.fd == m->timer_fd || thread->u.fd == m->signal_fd)) ||
+@@ -1773,6 +1781,12 @@ process_child_termination(pid_t pid, int status)
+ 
+ 		thread_add_terminate_event(m);
+ 	}
++	else if (thread->type == THREAD_CHILD_TIMEOUT) {
++		/* The child had been timed out, but we have not processed the timeout
++		 * and it is still on the thread->ready queue. Since we have now got
++		 * the termination, just handle the termination instead. */
++		thread->type = THREAD_CHILD_TERMINATED;
++	}
+ 	else
+ 		thread_move_ready(m, &m->child, thread, THREAD_CHILD_TERMINATED);
+ }
+-- 
+2.26.2
+
diff --git a/SPECS/keepalived.spec b/SPECS/keepalived.spec
index bb6a6ef..4a6ada6 100644
--- a/SPECS/keepalived.spec
+++ b/SPECS/keepalived.spec
@@ -10,7 +10,7 @@
 Name: keepalived
 Summary: High Availability monitor built upon LVS, VRRP and service pollers
 Version: 2.0.10
-Release: 11%{?dist}
+Release: 11%{?dist}.1
 License: GPLv2+
 URL: http://www.keepalived.org/
 Group: System Environment/Daemons
@@ -26,6 +26,7 @@ Patch5: bz1693706-fix-smtp-alerts-segfault.patch
 Patch6: bz1693706-fix-smtp_helo_name-double-free.patch
 Patch7: bz1792160-fix-fault-rename-interface.patch
 Patch8: bz1683438-fix-vrrp_script-execution.patch
+Patch9: bz1868077-fix-intermittent-child-lost-messages.patch
 
 Requires(post): systemd
 Requires(preun): systemd
@@ -69,6 +70,7 @@ infrastructures.
 %patch6 -p1
 %patch7 -p1
 %patch8 -p1
+%patch9 -p1
 
 %build
 %configure \
@@ -119,6 +121,9 @@ mkdir -p %{buildroot}%{_libexecdir}/keepalived
 %{_mandir}/man8/keepalived.8*
 
 %changelog
+* Fri Oct 23 2020 Ryan O'Hara <rohara@redhat.com> - 2.0.10-11.1
+- Fix intermittent child lost messages (#1890625)
+
 * Tue Jun 16 2020 Ryan O'Hara <rohara@redhat.com> - 2.0.10-11
 - Fix vrrp_script execution (#1683438)