git: b6f31ce42c6e - main - mail/exim: fix queue runners that are not starting
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Tue, 02 Jan 2024 12:50:26 UTC
The branch main has been updated by pi:
URL: https://cgit.FreeBSD.org/ports/commit/?id=b6f31ce42c6e27b91a666f0a7a550e945124f3b5
commit b6f31ce42c6e27b91a666f0a7a550e945124f3b5
Author: Niels Kobschätzki <niels@kobschaetzki.net>
AuthorDate: 2024-01-02 11:49:10 +0000
Commit: Kurt Jaeger <pi@FreeBSD.org>
CommitDate: 2024-01-02 11:49:10 +0000
mail/exim: fix queue runners that are not starting
upstream:
- https://bugs.exim.org/show_bug.cgi?id=3046
- https://github.com/Exim/exim/commit/ced0bbf43860a2e4ddc88e3ba20ae731324586c5
PR: 275635
Author: Niels Kobschätzki <niels@kobschaetzki.net>
Approved-by: fluffy (implicit)
---
mail/exim/Makefile | 2 +-
mail/exim/files/patch-periodic-queue-runs | 212 ++++++++++++++++++++++++++++++
2 files changed, 213 insertions(+), 1 deletion(-)
diff --git a/mail/exim/Makefile b/mail/exim/Makefile
index d23dec014c7e..c74df7d216b6 100644
--- a/mail/exim/Makefile
+++ b/mail/exim/Makefile
@@ -1,6 +1,6 @@
PORTNAME= exim
PORTVERSION?= ${EXIM_VERSION}
-PORTREVISION?= 0
+PORTREVISION?= 1
CATEGORIES= mail
MASTER_SITES= EXIM:exim
MASTER_SITE_SUBDIR= /exim4/:exim \
diff --git a/mail/exim/files/patch-periodic-queue-runs b/mail/exim/files/patch-periodic-queue-runs
new file mode 100644
index 000000000000..b19336269151
--- /dev/null
+++ b/mail/exim/files/patch-periodic-queue-runs
@@ -0,0 +1,212 @@
+From ced0bbf43860a2e4ddc88e3ba20ae731324586c5 Mon Sep 17 00:00:00 2001
+From: Jeremy Harris <jgh146exb@wizmail.org>
+Date: Fri, 15 Dec 2023 21:05:32 +0000
+Subject: [PATCH] Fix periodic queue runs. Bug 3046
+
+Broken-by: 7d5055276a22
+---
+ doc/ChangeLog | 5 ++++
+ src/daemon.c | 58 ++++++++++++++++++++++++++++---------------
+ src/structs.h | 2 +-
+ 3 files changed, 44 insertions(+), 21 deletions(-)
+
+diff --git a/doc/doc-txt/ChangeLog b/doc/doc-txt/ChangeLog
+index 85064cc8d..c46f3b8c0 100644
+--- doc/ChangeLog
++++ doc/ChangeLog
+@@ -53,6 +53,11 @@ JH/10 Bug 3058: Ensure that a failing expansion in a router "set" option defers
+ the routing operation. Previously it would silently stop routing the
+ message.
+
++JH/11 Bug 3046: Fix queue-runs. Previously, the arrivel of a notification or
++ info-request event close in time to a scheduled run timer could result in
++ the latter being missed, and no further queue scheduled runs being
++ initiated. This ouwld be more likely on high-load systems.
++
+
+
+ Exim version 4.97
+diff --git a/src/src/daemon.c b/src/src/daemon.c
+index f2183c735..aff05120a 100644
+--- src/daemon.c
++++ src/daemon.c
+@@ -1258,10 +1258,9 @@ static const uschar * queuerun_msg_qname;
+
+ /* The notifier socket has something to read. Pull the message from it, decode
+ and do the action.
++*/
+
+-Return TRUE if a sigalrm should be emulated */
+-
+-static BOOL
++static void
+ daemon_notification(void)
+ {
+ uschar buf[256], cbuf[256];
+@@ -1277,8 +1276,8 @@ struct msghdr msg = { .msg_name = &sa_un,
+ ssize_t sz;
+
+ buf[sizeof(buf)-1] = 0;
+-if ((sz = recvmsg(daemon_notifier_fd, &msg, 0)) <= 0) return FALSE;
+-if (sz >= sizeof(buf)) return FALSE;
++if ((sz = recvmsg(daemon_notifier_fd, &msg, 0)) <= 0) return;
++if (sz >= sizeof(buf)) return;
+
+ #ifdef notdef
+ debug_printf("addrlen %d\n", msg.msg_namelen);
+@@ -1351,7 +1350,7 @@ switch (buf[0])
+ : !buf[1+MESSAGE_ID_LENGTH+1]
+ )
+ { queuerun_msg_qname = q->name; break; }
+- return TRUE;
++ return;
+ #endif
+
+ case NOTIFY_QUEUE_SIZE_REQ:
+@@ -1373,7 +1372,7 @@ switch (buf[0])
+ regex_at_daemon(buf);
+ break;
+ }
+-return FALSE;
++return;
+ }
+
+
+@@ -1432,7 +1431,7 @@ for (qrunner * q = qrunners, * next; q; q = next)
+ if (sorted)
+ {
+ qrunner ** p = &sorted;
+- for (qrunner * qq; qq = *p; p = &(qq->next))
++ for (qrunner * qq; qq = *p; p = &qq->next)
+ if ( q->next_tick < qq->next_tick
+ || q->next_tick == qq->next_tick && q->interval < qq->interval
+ )
+@@ -1451,6 +1450,13 @@ qrunners = sorted;
+ return qrunners ? qrunners->next_tick - time(NULL) : 0;
+ }
+
++/* See if we can do a queue run. If policy limit permit, kick one off.
++If both notification and timer events are present, handle the former
++and leave the timer outstanding.
++
++Return the number of seconds until the next due runner.
++*/
++
+ static int
+ daemon_qrun(int local_queue_run_max, struct pollfd * fd_polls, int listen_socket_count)
+ {
+@@ -1464,13 +1470,16 @@ DEBUG(D_any) debug_printf("%s received\n",
+ enough queue runners on the go. If we are not running as root, a re-exec is
+ required. In the calling process, restart the alamr timer for the next run. */
+
+-if (is_multiple_qrun())
++if (is_multiple_qrun()) /* we are managing periodic runs */
+ if (local_queue_run_max <= 0 || queue_run_count < local_queue_run_max)
+ {
+ qrunner * q = NULL;
+
+ #ifndef DISABLE_QUEUE_RAMP
+- if (*queuerun_msgid) /* See if we can start another runner for this queue */
++ /* If this is a triggered run for a specific message, see if we can start
++ another runner for this queue. */
++
++ if (*queuerun_msgid)
+ {
+ for (qrunner * qq = qrunners; qq; qq = qq->next)
+ if (qq->name == queuerun_msg_qname)
+@@ -1481,13 +1490,13 @@ if (is_multiple_qrun())
+ }
+ else
+ #endif
+- /* In order of run priority, find the first queue for which we can start
+- a runner */
++ /* Normal periodic runL in order of run priority, find the first queue
++ for which we can start a runner */
+
+ for (q = qrunners; q; q = q->next)
+ if (q->run_count < q->run_max) break;
+
+- if (q)
++ if (q) /* found a queue to run */
+ {
+ pid_t pid;
+
+@@ -1619,19 +1628,23 @@ if (is_multiple_qrun())
+ }
+ }
+
+-sigalrm_seen = FALSE;
++/* The queue run has been initiated (unless we were already running enough) */
++
+ #ifndef DISABLE_QUEUE_RAMP
+-if (*queuerun_msgid) /* it was a fast-ramp kick */
++if (*queuerun_msgid) /* it was a fast-ramp kick; dealt with */
+ *queuerun_msgid = 0;
+ else /* periodic or one-time queue run */
+ #endif
+- { /* Impose a minimum 1s tick, even when a run was outstanding */
++ /* Set up next timer callback. Impose a minimum 1s tick,
++ even when a run was outstanding */
++ {
+ int interval = next_qrunner_interval();
+ if (interval <= 0) interval = 1;
+
++ sigalrm_seen = FALSE;
+ if (qrunners) /* there are still periodic qrunners */
+ {
+- ALARM(interval);
++ ALARM(interval); /* set up next qrun tick */
+ return interval;
+ }
+ }
+@@ -2612,7 +2625,7 @@ for (;;)
+
+ The other option is that we have an inetd wait timeout specified to -bw. */
+
+- if (sigalrm_seen)
++ if (sigalrm_seen || *queuerun_msgid)
+ if (inetd_wait_timeout > 0)
+ daemon_inetd_wtimeout(last_connection_time); /* Might not return */
+ else
+@@ -2641,7 +2654,9 @@ for (;;)
+ select() was interrupted so that we reap the child. This might still leave
+ a small window when a SIGCHLD could get lost. However, since we use SIGCHLD
+ only to do the reaping more quickly, it shouldn't result in anything other
+- than a delay until something else causes a wake-up. */
++ than a delay until something else causes a wake-up.
++ For the normal case, wait for either a pollable fd (eg. new connection) or
++ or a SIGALRM (for a periodic queue run) */
+
+ if (sigchld_seen)
+ {
+@@ -2706,10 +2721,13 @@ for (;;)
+ break; /* to top of daemon loop */
+ }
+ #endif
++ /* Handle the daemon-notifier socket. If it was a fast-ramp
++ notification then queuerun_msgid will have a nonzerolength string. */
++
+ if (dnotify_poll && dnotify_poll->revents & POLLIN)
+ {
+ dnotify_poll->revents = 0;
+- sigalrm_seen = daemon_notification();
++ daemon_notification();
+ break; /* to top of daemon loop */
+ }
+ for (struct pollfd * p = fd_polls; p < fd_polls + listen_socket_count;
+diff --git a/src/src/structs.h b/src/src/structs.h
+index 209d657c6..256560ef8 100644
+--- src/structs.h
++++ src/structs.h
+@@ -964,7 +964,7 @@ typedef struct qrunner {
+ struct qrunner * next; /* list sorted by next tick */
+
+ uschar * name; /* NULL for the default queue */
+- unsigned interval; /* tick rate, seconds */
++ unsigned interval; /* tick rate, seconds. Zero for a one-time run */
+ time_t next_tick; /* next run should, or should have, start(ed) */
+ unsigned run_max; /* concurrent queue runner limit */
+ unsigned run_count; /* current runners */
+--
+2.30.2
+