upstream/bind9
1
0
Fork 0
mirror of https://github.com/isc-projects/bind9.git synced 2026-06-09 13:32:11 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Use "-T maxcachesize=2097152" in all system tests

Browse source 
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.
This commit is contained in:
Michał Kępień 2020-08-31 13:15:33 +02:00
parent 9ac1f6a9bc
commit dad6572093
42 changed files with 29 additions and 42 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
bin/tests/system/additional/ns1/named.args
View file

@ -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

2
bin/tests/system/allow-query/ns3/named.args
View file

@ -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

1
bin/tests/system/cacheclean/ns2/named.conf.in
View file

@ -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;

2
bin/tests/system/delzone/ns2/named.args
View file

@ -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

2
bin/tests/system/dnssec/ns6/named.args
View file

@ -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

2
bin/tests/system/dnstap/ns3/named.args
View file

@ -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

2
bin/tests/system/dscp/ns1/named.args
View file

@ -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

2
bin/tests/system/dscp/ns2/named.args
View file

@ -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

2
bin/tests/system/dscp/ns3/named.args
View file

@ -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

2
bin/tests/system/dscp/ns4/named.args
View file

@ -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

2
bin/tests/system/dscp/ns5/named.args
View file

@ -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

2
bin/tests/system/dscp/ns6/named.args
View file

@ -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

2
bin/tests/system/dscp/ns7/named.args
View file

@ -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

2
bin/tests/system/dupsigs/ns1/named.args
View file

@ -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

1
bin/tests/system/geoip2/ns2/named1.conf.in
View file

@ -22,7 +22,6 @@ options {
recursion no;
dnssec-validation no;
geoip-directory "../data";
max-cache-size 1M;
};
key rndc_key {

1
bin/tests/system/geoip2/ns2/named10.conf.in
View file

@ -22,7 +22,6 @@ options {
recursion no;
dnssec-validation no;
geoip-directory "../data";
max-cache-size 1M;
};
key rndc_key {

1
bin/tests/system/geoip2/ns2/named11.conf.in
View file

@ -22,7 +22,6 @@ options {
recursion no;
dnssec-validation no;
geoip-directory "../data";
max-cache-size 1M;
};
key rndc_key {

1
bin/tests/system/geoip2/ns2/named12.conf.in
View file

@ -27,7 +27,6 @@ options {
dnssec-validation no;
geoip-directory "../data";
blackhole { blocking; };
max-cache-size 1M;
};
key rndc_key {

1
bin/tests/system/geoip2/ns2/named2.conf.in
View file

@ -22,7 +22,6 @@ options {
recursion no;
dnssec-validation no;
geoip-directory "../data";
max-cache-size 1M;
};
key rndc_key {

1
bin/tests/system/geoip2/ns2/named3.conf.in
View file

@ -22,7 +22,6 @@ options {
recursion no;
dnssec-validation no;
geoip-directory "../data";
max-cache-size 1M;
};
key rndc_key {

1
bin/tests/system/geoip2/ns2/named4.conf.in
View file

@ -22,7 +22,6 @@ options {
recursion no;
dnssec-validation no;
geoip-directory "../data";
max-cache-size 1M;
};
key rndc_key {

1
bin/tests/system/geoip2/ns2/named5.conf.in
View file

@ -22,7 +22,6 @@ options {
recursion no;
dnssec-validation no;
geoip-directory "../data";
max-cache-size 1M;
};
key rndc_key {

1
bin/tests/system/geoip2/ns2/named6.conf.in
View file

@ -22,7 +22,6 @@ options {
recursion no;
dnssec-validation no;
geoip-directory "../data";
max-cache-size 1M;
};
key rndc_key {

1
bin/tests/system/geoip2/ns2/named7.conf.in
View file

@ -22,7 +22,6 @@ options {
recursion no;
dnssec-validation no;
geoip-directory "../data";
max-cache-size 1M;
};
key rndc_key {

1
bin/tests/system/geoip2/ns2/named8.conf.in
View file

@ -22,7 +22,6 @@ options {
recursion no;
dnssec-validation no;
geoip-directory "../data";
max-cache-size 1M;
};
key rndc_key {

1
bin/tests/system/geoip2/ns2/named9.conf.in
View file

@ -22,7 +22,6 @@ options {
recursion no;
dnssec-validation no;
geoip-directory "../data";
max-cache-size 1M;
};
key rndc_key {

2
bin/tests/system/legacy/ns4/named.args
View file

@ -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

2
bin/tests/system/legacy/ns5/named.args
View file

@ -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

2
bin/tests/system/legacy/ns6/named.args
View file

@ -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

2
bin/tests/system/legacy/ns7/named.args
View file

@ -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

2
bin/tests/system/mirror/ns3/named.args
View file

@ -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

2
bin/tests/system/mkeys/ns2/named.args
View file

@ -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

2
bin/tests/system/mkeys/ns3/named.args
View file

@ -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

2
bin/tests/system/mkeys/ns5/named1.args
View file

@ -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

2
bin/tests/system/mkeys/ns5/named2.args
View file

@ -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

2
bin/tests/system/mkeys/ns6/named.args
View file

@ -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

2
bin/tests/system/nsupdate/ns5/named.args
View file

@ -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

2
bin/tests/system/nsupdate/ns6/named.args
View file

@ -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

2
bin/tests/system/rndc/ns6/named.args
View file

@ -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

2
bin/tests/system/rpz/ns5/named.args
View file

@ -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

2
bin/tests/system/rpzextra/ns1/named.args
View file

@ -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

2
bin/tests/system/start.pl
View file

@ -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") {