From 9ac1f6a9bce355948f413de60a74cbded0f6a2be Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20K=C4=99pie=C5=84?= <michal@isc.org>
Date: Mon, 31 Aug 2020 13:15:33 +0200
Subject: [PATCH 1/2] Add "-T maxcachesize=..." command line option

An implicit default of "max-cache-size 90%;" may cause memory use issues
on hosts which run numerous named instances in parallel (e.g. GitLab CI
runners) due to the cache RBT hash table now being pre-allocated [1] at
startup.  Add a new command line option, "-T maxcachesize=...", to allow
the default value of "max-cache-size" to be overridden at runtime.  When
this new option is in effect, it overrides any other "max-cache-size"
setting in the configuration, either implicit or explicit.  This
approach was chosen because it is arguably the simplest one to
implement.

The following alternative approaches to solving this problem were
considered and ultimately rejected (after it was decided they were not
worth the extra code complexity):

  - adding the same command line option, but making explicit
    configuration statements have priority over it,

  - adding a build-time option that allows the implicit default of
    "max-cache-size 90%;" to be overridden.

[1] see commit e24bc324b455d9cad7b51acd3d5c7b4e40c66187
---
 bin/named/include/named/globals.h |  1 +
 bin/named/main.c                  |  2 ++
 bin/named/server.c                | 11 ++++++++++-
 3 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/bin/named/include/named/globals.h b/bin/named/include/named/globals.h
index 3b6e8d7d65..c923d7c6e5 100644
--- a/bin/named/include/named/globals.h
+++ b/bin/named/include/named/globals.h
@@ -143,6 +143,7 @@ EXTERN bool named_g_memstatistics INIT(false);
 EXTERN bool named_g_keepstderr	  INIT(false);
 
 EXTERN unsigned int named_g_tat_interval INIT(24 * 3600);
+EXTERN unsigned int named_g_maxcachesize INIT(0);
 
 #if defined(HAVE_GEOIP2)
 EXTERN dns_geoip_databases_t *named_g_geoip INIT(NULL);
diff --git a/bin/named/main.c b/bin/named/main.c
index b369eed069..d6b7154246 100644
--- a/bin/named/main.c
+++ b/bin/named/main.c
@@ -650,6 +650,8 @@ parse_T_opt(char *option) {
 		named_g_nosyslog = true;
 	} else if (!strcmp(option, "notcp")) {
 		notcp = true;
+	} else if (!strncmp(option, "maxcachesize=", 13)) {
+		named_g_maxcachesize = atoi(option + 13);
 	} else if (!strcmp(option, "maxudp512")) {
 		maxudp = 512;
 	} else if (!strcmp(option, "maxudp1460")) {
diff --git a/bin/named/server.c b/bin/named/server.c
index 547df1147a..ec66cbcc9e 100644
--- a/bin/named/server.c
+++ b/bin/named/server.c
@@ -4114,7 +4114,16 @@ configure_view(dns_view_t *view, dns_viewlist_t *viewlist, cfg_obj_t *config,
 	obj = NULL;
 	result = named_config_get(maps, "max-cache-size", &obj);
 	INSIST(result == ISC_R_SUCCESS);
-	if (cfg_obj_isstring(obj)) {
+	/*
+	 * If "-T maxcachesize=..." is in effect, it overrides any other
+	 * "max-cache-size" setting found in configuration, either implicit or
+	 * explicit.  For simplicity, the value passed to that command line
+	 * option is always treated as the number of bytes to set
+	 * "max-cache-size" to.
+	 */
+	if (named_g_maxcachesize != 0) {
+		max_cache_size = named_g_maxcachesize;
+	} else if (cfg_obj_isstring(obj)) {
 		str = cfg_obj_asstring(obj);
 		INSIST(strcasecmp(str, "unlimited") == 0);
 		max_cache_size = 0;

From dad6572093aa17cd6c5ea96b939dde8ad7ed3b78 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20K=C4=99pie=C5=84?= <michal@isc.org>
Date: Mon, 31 Aug 2020 13:15:33 +0200
Subject: [PATCH 2/2] Use "-T maxcachesize=2097152" in all system tests

In order to lower the amount of memory allocated at startup by named
instances used in the BIND system test suite, set the default value of
"max-cache-size" for these to 2 megabytes.  The purpose of this change
is to prevent named instances (or even entire virtual machines) from
getting killed by the operating system on the test host due to excessive
memory use.

Remove all "max-cache-size" statements from named configuration files
used in system tests ("checkconf" notwithstanding) to prevent confusion
as the "-T maxcachesize=..." command line option takes precedence over
configuration files.
---
 bin/tests/system/additional/ns1/named.args    | 2 +-
 bin/tests/system/allow-query/ns3/named.args   | 2 +-
 bin/tests/system/cacheclean/ns2/named.conf.in | 1 -
 bin/tests/system/delzone/ns2/named.args       | 2 +-
 bin/tests/system/dnssec/ns6/named.args        | 2 +-
 bin/tests/system/dnstap/ns3/named.args        | 2 +-
 bin/tests/system/dscp/ns1/named.args          | 2 +-
 bin/tests/system/dscp/ns2/named.args          | 2 +-
 bin/tests/system/dscp/ns3/named.args          | 2 +-
 bin/tests/system/dscp/ns4/named.args          | 2 +-
 bin/tests/system/dscp/ns5/named.args          | 2 +-
 bin/tests/system/dscp/ns6/named.args          | 2 +-
 bin/tests/system/dscp/ns7/named.args          | 2 +-
 bin/tests/system/dupsigs/ns1/named.args       | 2 +-
 bin/tests/system/geoip2/ns2/named1.conf.in    | 1 -
 bin/tests/system/geoip2/ns2/named10.conf.in   | 1 -
 bin/tests/system/geoip2/ns2/named11.conf.in   | 1 -
 bin/tests/system/geoip2/ns2/named12.conf.in   | 1 -
 bin/tests/system/geoip2/ns2/named2.conf.in    | 1 -
 bin/tests/system/geoip2/ns2/named3.conf.in    | 1 -
 bin/tests/system/geoip2/ns2/named4.conf.in    | 1 -
 bin/tests/system/geoip2/ns2/named5.conf.in    | 1 -
 bin/tests/system/geoip2/ns2/named6.conf.in    | 1 -
 bin/tests/system/geoip2/ns2/named7.conf.in    | 1 -
 bin/tests/system/geoip2/ns2/named8.conf.in    | 1 -
 bin/tests/system/geoip2/ns2/named9.conf.in    | 1 -
 bin/tests/system/legacy/ns4/named.args        | 2 +-
 bin/tests/system/legacy/ns5/named.args        | 2 +-
 bin/tests/system/legacy/ns6/named.args        | 2 +-
 bin/tests/system/legacy/ns7/named.args        | 2 +-
 bin/tests/system/mirror/ns3/named.args        | 2 +-
 bin/tests/system/mkeys/ns2/named.args         | 2 +-
 bin/tests/system/mkeys/ns3/named.args         | 2 +-
 bin/tests/system/mkeys/ns5/named1.args        | 2 +-
 bin/tests/system/mkeys/ns5/named2.args        | 2 +-
 bin/tests/system/mkeys/ns6/named.args         | 2 +-
 bin/tests/system/nsupdate/ns5/named.args      | 2 +-
 bin/tests/system/nsupdate/ns6/named.args      | 2 +-
 bin/tests/system/rndc/ns6/named.args          | 2 +-
 bin/tests/system/rpz/ns5/named.args           | 2 +-
 bin/tests/system/rpzextra/ns1/named.args      | 2 +-
 bin/tests/system/start.pl                     | 2 +-
 42 files changed, 29 insertions(+), 42 deletions(-)

diff --git a/bin/tests/system/additional/ns1/named.args b/bin/tests/system/additional/ns1/named.args
index 0db1ead834..15aa849355 100644
--- a/bin/tests/system/additional/ns1/named.args
+++ b/bin/tests/system/additional/ns1/named.args
@@ -1,2 +1,2 @@
 # this server runs named with only one worker thread
--m record,size,mctx -c named.conf -d 99 -D additional-ns1 -X named.lock -g -n 1
+-m record,size,mctx -c named.conf -d 99 -D additional-ns1 -X named.lock -g -n 1 -T maxcachesize=2097152
diff --git a/bin/tests/system/allow-query/ns3/named.args b/bin/tests/system/allow-query/ns3/named.args
index 5dd675d0fd..35e99d8dd8 100644
--- a/bin/tests/system/allow-query/ns3/named.args
+++ b/bin/tests/system/allow-query/ns3/named.args
@@ -1,2 +1,2 @@
 # this server only has 127.0.0.1 in its localhost/localnets ACLs
--m record,size,mctx -c named.conf -d 99 -D allow-query-ns3 -X named.lock -g -T fixedlocal
+-m record,size,mctx -c named.conf -d 99 -D allow-query-ns3 -X named.lock -g -T maxcachesize=2097152 -T fixedlocal
diff --git a/bin/tests/system/cacheclean/ns2/named.conf.in b/bin/tests/system/cacheclean/ns2/named.conf.in
index 4979f325d0..520264876b 100644
--- a/bin/tests/system/cacheclean/ns2/named.conf.in
+++ b/bin/tests/system/cacheclean/ns2/named.conf.in
@@ -18,7 +18,6 @@ options {
 	listen-on { 10.53.0.2; };
 	listen-on-v6 { none; };
 	notify yes;
-	max-cache-size 80%;
 	disable-empty-zone 127.IN-ADDR.ARPA;
 	recursion yes;
 	dnssec-validation yes;
diff --git a/bin/tests/system/delzone/ns2/named.args b/bin/tests/system/delzone/ns2/named.args
index b3028b1d29..be9241ed54 100644
--- a/bin/tests/system/delzone/ns2/named.args
+++ b/bin/tests/system/delzone/ns2/named.args
@@ -1 +1 @@
--D delzone-ns2 -X named.lock -m record,size,mctx -c named.conf -g -U 4
+-D delzone-ns2 -X named.lock -m record,size,mctx -c named.conf -g -U 4 -T maxcachesize=2097152
diff --git a/bin/tests/system/dnssec/ns6/named.args b/bin/tests/system/dnssec/ns6/named.args
index 21242f17ff..65b7dbcc93 100644
--- a/bin/tests/system/dnssec/ns6/named.args
+++ b/bin/tests/system/dnssec/ns6/named.args
@@ -1 +1 @@
--m record,size,mctx -c named.conf -d 99 -D dnssec-ns6 -X named.lock -g -T nonearest -T tat=1
+-m record,size,mctx -c named.conf -d 99 -D dnssec-ns6 -X named.lock -g -T maxcachesize=2097152 -T nonearest -T tat=1
diff --git a/bin/tests/system/dnstap/ns3/named.args b/bin/tests/system/dnstap/ns3/named.args
index b746de58fe..fb42af211a 100644
--- a/bin/tests/system/dnstap/ns3/named.args
+++ b/bin/tests/system/dnstap/ns3/named.args
@@ -1,2 +1,2 @@
 # Using "-n 1" allows GL #1795 to be reliably reproduced
--D dnstap-ns3 -X named.lock -m record,size,mctx -c named.conf -d 99 -g -U 4 -n 1
+-D dnstap-ns3 -X named.lock -m record,size,mctx -c named.conf -d 99 -g -U 4 -n 1 -T maxcachesize=2097152
diff --git a/bin/tests/system/dscp/ns1/named.args b/bin/tests/system/dscp/ns1/named.args
index 4986abce05..0c955c704a 100644
--- a/bin/tests/system/dscp/ns1/named.args
+++ b/bin/tests/system/dscp/ns1/named.args
@@ -1 +1 @@
--m record,size,mctx -c named.conf -d 99 -D dscp-ns1 -X named.lock -g -U 4 -T dscp=46
+-m record,size,mctx -c named.conf -d 99 -D dscp-ns1 -X named.lock -g -U 4 -T maxcachesize=2097152 -T dscp=46
diff --git a/bin/tests/system/dscp/ns2/named.args b/bin/tests/system/dscp/ns2/named.args
index 91635e8c04..ff501a812c 100644
--- a/bin/tests/system/dscp/ns2/named.args
+++ b/bin/tests/system/dscp/ns2/named.args
@@ -1 +1 @@
--m record,size,mctx -c named.conf -d 99 -D dscp-ns2 -X named.lock -g -U 4 -T dscp=46
+-m record,size,mctx -c named.conf -d 99 -D dscp-ns2 -X named.lock -g -U 4 -T maxcachesize=2097152 -T dscp=46
diff --git a/bin/tests/system/dscp/ns3/named.args b/bin/tests/system/dscp/ns3/named.args
index ec9b5934da..3d1981fb59 100644
--- a/bin/tests/system/dscp/ns3/named.args
+++ b/bin/tests/system/dscp/ns3/named.args
@@ -1 +1 @@
--m record,size,mctx -c named.conf -d 99 -D dscp-ns3 -X named.lock -g -U 4 -T dscp=46
+-m record,size,mctx -c named.conf -d 99 -D dscp-ns3 -X named.lock -g -U 4 -T maxcachesize=2097152 -T dscp=46
diff --git a/bin/tests/system/dscp/ns4/named.args b/bin/tests/system/dscp/ns4/named.args
index 6da9eff607..277a47b628 100644
--- a/bin/tests/system/dscp/ns4/named.args
+++ b/bin/tests/system/dscp/ns4/named.args
@@ -1 +1 @@
--m record,size,mctx -c named.conf -d 99 -D dscp-ns4 -X named.lock -g -U 4 -T dscp=46
+-m record,size,mctx -c named.conf -d 99 -D dscp-ns4 -X named.lock -g -U 4 -T maxcachesize=2097152 -T dscp=46
diff --git a/bin/tests/system/dscp/ns5/named.args b/bin/tests/system/dscp/ns5/named.args
index dc556e7e86..c678163f37 100644
--- a/bin/tests/system/dscp/ns5/named.args
+++ b/bin/tests/system/dscp/ns5/named.args
@@ -1 +1 @@
--m record,size,mctx -c named.conf -d 99 -D dscp-ns5 -X named.lock -g -U 4 -T dscp=46
+-m record,size,mctx -c named.conf -d 99 -D dscp-ns5 -X named.lock -g -U 4 -T maxcachesize=2097152 -T dscp=46
diff --git a/bin/tests/system/dscp/ns6/named.args b/bin/tests/system/dscp/ns6/named.args
index c7389076ba..283cf22011 100644
--- a/bin/tests/system/dscp/ns6/named.args
+++ b/bin/tests/system/dscp/ns6/named.args
@@ -1 +1 @@
--m record,size,mctx -c named.conf -d 99 -D dscp-ns6 -X named.lock -g -U 4 -T dscp=46
+-m record,size,mctx -c named.conf -d 99 -D dscp-ns6 -X named.lock -g -U 4 -T maxcachesize=2097152 -T dscp=46
diff --git a/bin/tests/system/dscp/ns7/named.args b/bin/tests/system/dscp/ns7/named.args
index 39ccaa4bbf..4ccf38ea05 100644
--- a/bin/tests/system/dscp/ns7/named.args
+++ b/bin/tests/system/dscp/ns7/named.args
@@ -1 +1 @@
--m record,size,mctx -c named.conf -d 99 -D dscp-ns7 -X named.lock -g -U 4 -T dscp=46
+-m record,size,mctx -c named.conf -d 99 -D dscp-ns7 -X named.lock -g -U 4 -T maxcachesize=2097152 -T dscp=46
diff --git a/bin/tests/system/dupsigs/ns1/named.args b/bin/tests/system/dupsigs/ns1/named.args
index 2eed0529a7..231eed4902 100644
--- a/bin/tests/system/dupsigs/ns1/named.args
+++ b/bin/tests/system/dupsigs/ns1/named.args
@@ -1 +1 @@
--D dupsigs-ns1 -X named.lock -m record,size,mctx -c named.conf -d 99 -g -U 4 -T sigvalinsecs
+-D dupsigs-ns1 -X named.lock -m record,size,mctx -c named.conf -d 99 -g -U 4 -T maxcachesize=2097152 -T sigvalinsecs
diff --git a/bin/tests/system/geoip2/ns2/named1.conf.in b/bin/tests/system/geoip2/ns2/named1.conf.in
index dfb6f0e86b..2838b28fce 100644
--- a/bin/tests/system/geoip2/ns2/named1.conf.in
+++ b/bin/tests/system/geoip2/ns2/named1.conf.in
@@ -22,7 +22,6 @@ options {
 	recursion no;
 	dnssec-validation no;
 	geoip-directory "../data";
-	max-cache-size 1M;
 };
 
 key rndc_key {
diff --git a/bin/tests/system/geoip2/ns2/named10.conf.in b/bin/tests/system/geoip2/ns2/named10.conf.in
index 15b23c4dec..f809d04d99 100644
--- a/bin/tests/system/geoip2/ns2/named10.conf.in
+++ b/bin/tests/system/geoip2/ns2/named10.conf.in
@@ -22,7 +22,6 @@ options {
 	recursion no;
 	dnssec-validation no;
 	geoip-directory "../data";
-	max-cache-size 1M;
 };
 
 key rndc_key {
diff --git a/bin/tests/system/geoip2/ns2/named11.conf.in b/bin/tests/system/geoip2/ns2/named11.conf.in
index d1c5fa0afe..0a4892599c 100644
--- a/bin/tests/system/geoip2/ns2/named11.conf.in
+++ b/bin/tests/system/geoip2/ns2/named11.conf.in
@@ -22,7 +22,6 @@ options {
 	recursion no;
 	dnssec-validation no;
 	geoip-directory "../data";
-	max-cache-size 1M;
 };
 
 key rndc_key {
diff --git a/bin/tests/system/geoip2/ns2/named12.conf.in b/bin/tests/system/geoip2/ns2/named12.conf.in
index 3fd54cb274..a968c8a91e 100644
--- a/bin/tests/system/geoip2/ns2/named12.conf.in
+++ b/bin/tests/system/geoip2/ns2/named12.conf.in
@@ -27,7 +27,6 @@ options {
 	dnssec-validation no;
 	geoip-directory "../data";
 	blackhole { blocking; };
-	max-cache-size 1M;
 };
 
 key rndc_key {
diff --git a/bin/tests/system/geoip2/ns2/named2.conf.in b/bin/tests/system/geoip2/ns2/named2.conf.in
index df1656f733..8794cbbd95 100644
--- a/bin/tests/system/geoip2/ns2/named2.conf.in
+++ b/bin/tests/system/geoip2/ns2/named2.conf.in
@@ -22,7 +22,6 @@ options {
 	recursion no;
 	dnssec-validation no;
 	geoip-directory "../data";
-	max-cache-size 1M;
 };
 
 key rndc_key {
diff --git a/bin/tests/system/geoip2/ns2/named3.conf.in b/bin/tests/system/geoip2/ns2/named3.conf.in
index 0aed3b5f34..ecd758c1a6 100644
--- a/bin/tests/system/geoip2/ns2/named3.conf.in
+++ b/bin/tests/system/geoip2/ns2/named3.conf.in
@@ -22,7 +22,6 @@ options {
 	recursion no;
 	dnssec-validation no;
 	geoip-directory "../data";
-	max-cache-size 1M;
 };
 
 key rndc_key {
diff --git a/bin/tests/system/geoip2/ns2/named4.conf.in b/bin/tests/system/geoip2/ns2/named4.conf.in
index a6a6ff69bd..e5c88284fd 100644
--- a/bin/tests/system/geoip2/ns2/named4.conf.in
+++ b/bin/tests/system/geoip2/ns2/named4.conf.in
@@ -22,7 +22,6 @@ options {
 	recursion no;
 	dnssec-validation no;
 	geoip-directory "../data";
-	max-cache-size 1M;
 };
 
 key rndc_key {
diff --git a/bin/tests/system/geoip2/ns2/named5.conf.in b/bin/tests/system/geoip2/ns2/named5.conf.in
index cd37c95eea..0b53520018 100644
--- a/bin/tests/system/geoip2/ns2/named5.conf.in
+++ b/bin/tests/system/geoip2/ns2/named5.conf.in
@@ -22,7 +22,6 @@ options {
 	recursion no;
 	dnssec-validation no;
 	geoip-directory "../data";
-	max-cache-size 1M;
 };
 
 key rndc_key {
diff --git a/bin/tests/system/geoip2/ns2/named6.conf.in b/bin/tests/system/geoip2/ns2/named6.conf.in
index aa1afd6ff4..56e17b3820 100644
--- a/bin/tests/system/geoip2/ns2/named6.conf.in
+++ b/bin/tests/system/geoip2/ns2/named6.conf.in
@@ -22,7 +22,6 @@ options {
 	recursion no;
 	dnssec-validation no;
 	geoip-directory "../data";
-	max-cache-size 1M;
 };
 
 key rndc_key {
diff --git a/bin/tests/system/geoip2/ns2/named7.conf.in b/bin/tests/system/geoip2/ns2/named7.conf.in
index e39ef106e5..93e6a2c712 100644
--- a/bin/tests/system/geoip2/ns2/named7.conf.in
+++ b/bin/tests/system/geoip2/ns2/named7.conf.in
@@ -22,7 +22,6 @@ options {
 	recursion no;
 	dnssec-validation no;
 	geoip-directory "../data";
-	max-cache-size 1M;
 };
 
 key rndc_key {
diff --git a/bin/tests/system/geoip2/ns2/named8.conf.in b/bin/tests/system/geoip2/ns2/named8.conf.in
index 2e83531089..ebf17659d6 100644
--- a/bin/tests/system/geoip2/ns2/named8.conf.in
+++ b/bin/tests/system/geoip2/ns2/named8.conf.in
@@ -22,7 +22,6 @@ options {
 	recursion no;
 	dnssec-validation no;
 	geoip-directory "../data";
-	max-cache-size 1M;
 };
 
 key rndc_key {
diff --git a/bin/tests/system/geoip2/ns2/named9.conf.in b/bin/tests/system/geoip2/ns2/named9.conf.in
index f86583bf48..a9161c0f75 100644
--- a/bin/tests/system/geoip2/ns2/named9.conf.in
+++ b/bin/tests/system/geoip2/ns2/named9.conf.in
@@ -22,7 +22,6 @@ options {
 	recursion no;
 	dnssec-validation no;
 	geoip-directory "../data";
-	max-cache-size 1M;
 };
 
 key rndc_key {
diff --git a/bin/tests/system/legacy/ns4/named.args b/bin/tests/system/legacy/ns4/named.args
index 24af8c1127..0fe6774329 100644
--- a/bin/tests/system/legacy/ns4/named.args
+++ b/bin/tests/system/legacy/ns4/named.args
@@ -1 +1 @@
--m record,size,mctx -c named.conf -d 99 -D legacy-ns4 -X named.lock -g -U 4 -T noedns
+-m record,size,mctx -c named.conf -d 99 -D legacy-ns4 -X named.lock -g -U 4 -T maxcachesize=2097152 -T noedns
diff --git a/bin/tests/system/legacy/ns5/named.args b/bin/tests/system/legacy/ns5/named.args
index 515e77d0d9..364370a18b 100644
--- a/bin/tests/system/legacy/ns5/named.args
+++ b/bin/tests/system/legacy/ns5/named.args
@@ -1 +1 @@
--m record,size,mctx -c named.conf -d 99 -D legacy-ns5 -X named.lock -g -U 4 -T noedns
+-m record,size,mctx -c named.conf -d 99 -D legacy-ns5 -X named.lock -g -U 4 -T maxcachesize=2097152 -T noedns
diff --git a/bin/tests/system/legacy/ns6/named.args b/bin/tests/system/legacy/ns6/named.args
index cdc570f7c8..64e5524324 100644
--- a/bin/tests/system/legacy/ns6/named.args
+++ b/bin/tests/system/legacy/ns6/named.args
@@ -1 +1 @@
--m record,size,mctx -c named.conf -d 99 -D legacy-ns6 -X named.lock -g -U 4 -T maxudp512
+-m record,size,mctx -c named.conf -d 99 -D legacy-ns6 -X named.lock -g -U 4 -T maxcachesize=2097152 -T maxudp512
diff --git a/bin/tests/system/legacy/ns7/named.args b/bin/tests/system/legacy/ns7/named.args
index 2a1a61217b..e491a95dc6 100644
--- a/bin/tests/system/legacy/ns7/named.args
+++ b/bin/tests/system/legacy/ns7/named.args
@@ -1 +1 @@
--m record,size,mctx -c named.conf -d 99 -D legacy-ns7 -X named.lock -g -U 4 -T maxudp512
+-m record,size,mctx -c named.conf -d 99 -D legacy-ns7 -X named.lock -g -U 4 -T maxcachesize=2097152 -T maxudp512
diff --git a/bin/tests/system/mirror/ns3/named.args b/bin/tests/system/mirror/ns3/named.args
index be1cb49ce3..7519c8f587 100644
--- a/bin/tests/system/mirror/ns3/named.args
+++ b/bin/tests/system/mirror/ns3/named.args
@@ -1 +1 @@
--D mirror-ns3 -X named.lock -m record,size,mctx -c named.conf -d 99 -g -U 4 -T tat=3
+-D mirror-ns3 -X named.lock -m record,size,mctx -c named.conf -d 99 -g -U 4 -T maxcachesize=2097152 -T tat=3
diff --git a/bin/tests/system/mkeys/ns2/named.args b/bin/tests/system/mkeys/ns2/named.args
index 9f4ad4e46b..2f752bd79b 100644
--- a/bin/tests/system/mkeys/ns2/named.args
+++ b/bin/tests/system/mkeys/ns2/named.args
@@ -1 +1 @@
--m record,size,mctx -c named.conf -d 99 -D mkeys-ns2 -X named.lock -g -T mkeytimers=5/10/20 -T tat=1
+-m record,size,mctx -c named.conf -d 99 -D mkeys-ns2 -X named.lock -g -T maxcachesize=2097152 -T mkeytimers=5/10/20 -T tat=1
diff --git a/bin/tests/system/mkeys/ns3/named.args b/bin/tests/system/mkeys/ns3/named.args
index 376aa253cf..2015ee509a 100644
--- a/bin/tests/system/mkeys/ns3/named.args
+++ b/bin/tests/system/mkeys/ns3/named.args
@@ -1 +1 @@
--m record,size,mctx -c named.conf -d 99 -D mkeys-ns3 -X named.lock -g -T mkeytimers=5/10/20
+-m record,size,mctx -c named.conf -d 99 -D mkeys-ns3 -X named.lock -g -T maxcachesize=2097152 -T mkeytimers=5/10/20
diff --git a/bin/tests/system/mkeys/ns5/named1.args b/bin/tests/system/mkeys/ns5/named1.args
index 2e6aadc2c1..c4c8a55817 100644
--- a/bin/tests/system/mkeys/ns5/named1.args
+++ b/bin/tests/system/mkeys/ns5/named1.args
@@ -1 +1 @@
--m record,size,mctx -c named.conf -d 99 -X named.lock -g
+-m record,size,mctx -c named.conf -d 99 -X named.lock -g -T maxcachesize=2097152
diff --git a/bin/tests/system/mkeys/ns5/named2.args b/bin/tests/system/mkeys/ns5/named2.args
index 3eaf260cff..3fd830afbb 100644
--- a/bin/tests/system/mkeys/ns5/named2.args
+++ b/bin/tests/system/mkeys/ns5/named2.args
@@ -1 +1 @@
--m record,size,mctx -c named.conf -d 99 -X named.lock -g -T mkeytimers=2/20/40
+-m record,size,mctx -c named.conf -d 99 -X named.lock -g -T maxcachesize=2097152 -T mkeytimers=2/20/40
diff --git a/bin/tests/system/mkeys/ns6/named.args b/bin/tests/system/mkeys/ns6/named.args
index 74ea7e0a81..65a8fcaa97 100644
--- a/bin/tests/system/mkeys/ns6/named.args
+++ b/bin/tests/system/mkeys/ns6/named.args
@@ -1 +1 @@
--m record,size,mctx -c named.conf -d 99 -X named.lock -g -T mkeytimers=5/10/20
+-m record,size,mctx -c named.conf -d 99 -X named.lock -g -T maxcachesize=2097152 -T mkeytimers=5/10/20
diff --git a/bin/tests/system/nsupdate/ns5/named.args b/bin/tests/system/nsupdate/ns5/named.args
index 6555b33a53..a1ebb6f763 100644
--- a/bin/tests/system/nsupdate/ns5/named.args
+++ b/bin/tests/system/nsupdate/ns5/named.args
@@ -1 +1 @@
--D nsupdate-ns5 -m record,size,mctx -c named.conf -d 99 -X named.lock -g -U 4 -T fixedlocal
+-D nsupdate-ns5 -m record,size,mctx -c named.conf -d 99 -X named.lock -g -U 4 -T maxcachesize=2097152 -T fixedlocal
diff --git a/bin/tests/system/nsupdate/ns6/named.args b/bin/tests/system/nsupdate/ns6/named.args
index 827afb9948..11e5449526 100644
--- a/bin/tests/system/nsupdate/ns6/named.args
+++ b/bin/tests/system/nsupdate/ns6/named.args
@@ -1 +1 @@
--D nsupdate-ns6 -m record,size,mctx -c named.conf -d 99 -X named.lock -g -U 4 -T fixedlocal
+-D nsupdate-ns6 -m record,size,mctx -c named.conf -d 99 -X named.lock -g -U 4 -T maxcachesize=2097152 -T fixedlocal
diff --git a/bin/tests/system/rndc/ns6/named.args b/bin/tests/system/rndc/ns6/named.args
index e876eb8930..9d7d03aaac 100644
--- a/bin/tests/system/rndc/ns6/named.args
+++ b/bin/tests/system/rndc/ns6/named.args
@@ -1,3 +1,3 @@
 # teardown of a huge zone with tracing enabled takes way too long 
 # -m none is set so that stop.pl does not timeout
--D rndc-ns6 -X named.lock -m none -c named.conf -d 99 -g -U 4
+-D rndc-ns6 -X named.lock -m none -c named.conf -d 99 -g -U 4 -T maxcachesize=2097152
diff --git a/bin/tests/system/rpz/ns5/named.args b/bin/tests/system/rpz/ns5/named.args
index 14371cc8f3..56edbe343b 100644
--- a/bin/tests/system/rpz/ns5/named.args
+++ b/bin/tests/system/rpz/ns5/named.args
@@ -1,2 +1,2 @@
 # run the performance test close to real life
--c named.conf -D rpz-ns5 -X named.lock -gd3
+-c named.conf -D rpz-ns5 -X named.lock -gd3 -T maxcachesize=2097152
diff --git a/bin/tests/system/rpzextra/ns1/named.args b/bin/tests/system/rpzextra/ns1/named.args
index e4ae75e3aa..b289924b27 100644
--- a/bin/tests/system/rpzextra/ns1/named.args
+++ b/bin/tests/system/rpzextra/ns1/named.args
@@ -1 +1 @@
- -m record,size,mctx -c named.conf -d 99 -D rpzextra-ns1 -X named.lock -U 4
+ -m record,size,mctx -c named.conf -d 99 -D rpzextra-ns1 -X named.lock -U 4 -T maxcachesize=2097152
diff --git a/bin/tests/system/start.pl b/bin/tests/system/start.pl
index e413e24942..ba6ff29bf5 100755
--- a/bin/tests/system/start.pl
+++ b/bin/tests/system/start.pl
@@ -268,7 +268,7 @@ sub construct_ns_command {
 			}
 		}
 
-		$command .= "-c named.conf -d 99 -g -U 4";
+		$command .= "-c named.conf -d 99 -g -U 4 -T maxcachesize=2097152";
 	}
 
 	if (-e "$testdir/$server/named.notcp") {