From 38fb8bed49192784903e5550f15a95f0aa52c6a0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicki=20K=C5=99=C3=AD=C5=BEek?= Date: Fri, 20 Sep 2024 14:31:25 +0200 Subject: [PATCH 1/2] Revert "Double the number of threadpool threads" This reverts commit 6857df20a40f4e05f465a7a3f5d24eeedce8fc6c. (cherry picked from commit 842abe9fbf99d6b14912182811830a3c6564da5c) --- lib/isc/loop.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/lib/isc/loop.c b/lib/isc/loop.c index 2872ed6ba2..2e09a37e72 100644 --- a/lib/isc/loop.c +++ b/lib/isc/loop.c @@ -351,10 +351,7 @@ threadpool_initialize(uint32_t workers) { int r = uv_os_getenv("UV_THREADPOOL_SIZE", buf, &(size_t){ sizeof(buf) }); if (r == UV_ENOENT) { - /* FIXME The number of threadpool threads has been temporarily - * doubled to work around the issue [GL #4898] until a proper - * solution is implemented. */ - snprintf(buf, sizeof(buf), "%" PRIu32, 2 * workers); + snprintf(buf, sizeof(buf), "%" PRIu32, workers); uv_os_setenv("UV_THREADPOOL_SIZE", buf); } } From a2a4eef5b0786bbb8b1709164bea0e0e3fef4c64 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicki=20K=C5=99=C3=AD=C5=BEek?= Date: Fri, 20 Sep 2024 14:31:57 +0200 Subject: [PATCH 2/2] Remove fixed known issue [GL #4898] (cherry picked from commit 9fc773ce4c8d3c6ffbddf05ed2dccf7c225009c6) --- doc/notes/notes-known-issues.rst | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/doc/notes/notes-known-issues.rst b/doc/notes/notes-known-issues.rst index bc6832eced..3ee1928522 100644 --- a/doc/notes/notes-known-issues.rst +++ b/doc/notes/notes-known-issues.rst @@ -14,12 +14,4 @@ Known Issues ------------ -- Long-running tasks in offloaded threads (e.g. loading RPZ zones or - processing zone transfers) may block the resolution of queries during - these operations and cause the queries to time out. - - To work around the issue, the ``UV_THREADPOOL_SIZE`` environment - variable can be set to a larger value before starting :iscman:`named`. - The recommended value is the number of RPZ zones (or number of - transfers) plus the number of threads BIND should use, which is - typically the number of CPUs. :gl:`#4898` +- There are no known issues affecting this BIND 9 branch.