From: Michał Kępień Date: Mon, 31 Aug 2020 11:15:33 +0000 (+0200) Subject: Use "-T maxcachesize=2097152" in all system tests X-Git-Tag: v9.17.5~20^2 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=dad6572093aa17cd6c5ea96b939dde8ad7ed3b78;p=thirdparty%2Fbind9.git 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. --- diff --git a/bin/tests/system/additional/ns1/named.args b/bin/tests/system/additional/ns1/named.args index 0db1ead8340..15aa849355f 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 5dd675d0fd2..35e99d8dd8b 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 4979f325d0b..520264876b6 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 b3028b1d29f..be9241ed54a 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 21242f17ff6..65b7dbcc939 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 b746de58fe2..fb42af211a0 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 4986abce059..0c955c704a1 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 91635e8c04b..ff501a812c0 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 ec9b5934dad..3d1981fb59a 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 6da9eff6075..277a47b628f 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 dc556e7e86b..c678163f374 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 c7389076ba4..283cf22011b 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 39ccaa4bbf8..4ccf38ea05c 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 2eed0529a73..231eed49024 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 dfb6f0e86b0..2838b28fce5 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 15b23c4deca..f809d04d999 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 d1c5fa0afe9..0a4892599c3 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 3fd54cb274a..a968c8a91e1 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 df1656f733a..8794cbbd956 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 0aed3b5f341..ecd758c1a6b 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 a6a6ff69bd8..e5c88284fd9 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 cd37c95eeae..0b535200189 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 aa1afd6ff47..56e17b3820c 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 e39ef106e58..93e6a2c712a 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 2e835310893..ebf17659d60 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 f86583bf487..a9161c0f75d 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 24af8c11275..0fe67743295 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 515e77d0d9c..364370a18b4 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 cdc570f7c8d..64e5524324a 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 2a1a61217bb..e491a95dc61 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 be1cb49ce3d..7519c8f587b 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 9f4ad4e46b5..2f752bd79b0 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 376aa253cf0..2015ee509a7 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 2e6aadc2c1b..c4c8a558173 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 3eaf260cff9..3fd830afbbe 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 74ea7e0a813..65a8fcaa974 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 6555b33a530..a1ebb6f7631 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 827afb99487..11e54495262 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 e876eb89305..9d7d03aaac4 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 14371cc8f35..56edbe343b7 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 e4ae75e3aa9..b289924b274 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 e413e24942e..ba6ff29bf50 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") {