From: Witold Kręcicki <wpk@isc.org>
Date: Mon, 10 Feb 2020 13:00:36 +0000 (+0100)
Subject: Don't limit the size of uvreq/nmhandle pool artificially.
X-Git-Tag: v9.16.0~8^2
X-Git-Url: http://git.ipfire.org/gitweb/index.cgi?a=commitdiff_plain;h=a133239698e27e02e8ee0a60f56a3e5d348dcc52;p=thirdparty%2Fbind9.git

Don't limit the size of uvreq/nmhandle pool artificially.

There was a hard limit set on number of uvreq and nmhandles
that can be allocated by a pool, but we don't handle a situation
where we can't get an uvreq. Don't limit the number at all,
let the OS deal with it.
---

diff --git a/lib/isc/netmgr/netmgr.c b/lib/isc/netmgr/netmgr.c
index 6f929c6d2c8..c66e568dce4 100644
--- a/lib/isc/netmgr/netmgr.c
+++ b/lib/isc/netmgr/netmgr.c
@@ -174,8 +174,7 @@ isc_nm_start(isc_mem_t *mctx, uint32_t workers) {
 	isc_mutex_init(&mgr->reqlock);
 	isc_mempool_create(mgr->mctx, sizeof(isc__nm_uvreq_t), &mgr->reqpool);
 	isc_mempool_setname(mgr->reqpool, "nm_reqpool");
-	isc_mempool_setmaxalloc(mgr->reqpool, 32768);
-	isc_mempool_setfreemax(mgr->reqpool, 32768);
+	isc_mempool_setfreemax(mgr->reqpool, 4096);
 	isc_mempool_associatelock(mgr->reqpool, &mgr->reqlock);
 	isc_mempool_setfillcount(mgr->reqpool, 32);
 
@@ -183,8 +182,7 @@ isc_nm_start(isc_mem_t *mctx, uint32_t workers) {
 	isc_mempool_create(mgr->mctx, sizeof(isc__netievent_storage_t),
 			   &mgr->evpool);
 	isc_mempool_setname(mgr->evpool, "nm_evpool");
-	isc_mempool_setmaxalloc(mgr->evpool, 32768);
-	isc_mempool_setfreemax(mgr->evpool, 32768);
+	isc_mempool_setfreemax(mgr->evpool, 4096);
 	isc_mempool_associatelock(mgr->evpool, &mgr->evlock);
 	isc_mempool_setfillcount(mgr->evpool, 32);