From 4a8d404876f88e6f9f030c4b80db77cadfb783a8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20K=C4=99pie=C5=84?= Date: Wed, 28 Apr 2021 07:56:47 +0200 Subject: [PATCH] Limit logging for verbose system tests The system test framework starts all named instances with the "-d 99" command line option (unless it is overridden by a named.args file in a given instance's working directory). This causes a lot of log messages to be written to named.run files - currently over 5 million lines for a single test suite run. While debugging information preserved in the log files is essential for troubleshooting intermittent test failures, some system tests involve sending hundreds or even thousands of queries, which causes the relevant log files to explode in size. When multiple tests (or even multiple test suites) are run in parallel, excessive logging contributes considerably to the I/O load on the test host, increasing the odds of intermittent test failures getting triggered. Decrease the debug level for the seven most verbose named instances: - use "-d 3" for ns2 in the "cacheclean" system test (it is the lowest logging level at which the test still passes without the need to apply any changes to tests.sh), - use "-d 1" for the other six named instances. This roughly halves the number of lines logged by each test suite run while still leaving enough information in the logs to allow at least basic troubleshooting in case of test failures. This approach was chosen as it results in a greater decrease in the number of lines logged than running all named instances with "-d 3", without causing any test failures. --- bin/tests/system/cacheclean/ns1/named.args | 1 + bin/tests/system/cacheclean/ns2/named.args | 1 + bin/tests/system/fetchlimit/ns3/named.args | 1 + bin/tests/system/timeouts/ns1/named.args | 1 + bin/tests/system/zero/ns2/named.args | 1 + bin/tests/system/zero/ns3/named.args | 1 + bin/tests/system/zero/ns4/named.args | 1 + util/copyrights | 7 +++++++ 8 files changed, 14 insertions(+) create mode 100644 bin/tests/system/cacheclean/ns1/named.args create mode 100644 bin/tests/system/cacheclean/ns2/named.args create mode 100644 bin/tests/system/fetchlimit/ns3/named.args create mode 100644 bin/tests/system/timeouts/ns1/named.args create mode 100644 bin/tests/system/zero/ns2/named.args create mode 100644 bin/tests/system/zero/ns3/named.args create mode 100644 bin/tests/system/zero/ns4/named.args diff --git a/bin/tests/system/cacheclean/ns1/named.args b/bin/tests/system/cacheclean/ns1/named.args new file mode 100644 index 0000000000..2ba9a1403d --- /dev/null +++ b/bin/tests/system/cacheclean/ns1/named.args @@ -0,0 +1 @@ +-m record,size,mctx -c named.conf -d 1 -D cacheclean-ns1 -X named.lock -g -T maxcachesize=2097152 diff --git a/bin/tests/system/cacheclean/ns2/named.args b/bin/tests/system/cacheclean/ns2/named.args new file mode 100644 index 0000000000..1bcc5eab28 --- /dev/null +++ b/bin/tests/system/cacheclean/ns2/named.args @@ -0,0 +1 @@ +-m record,size,mctx -c named.conf -d 3 -D cacheclean-ns2 -X named.lock -g -T maxcachesize=2097152 diff --git a/bin/tests/system/fetchlimit/ns3/named.args b/bin/tests/system/fetchlimit/ns3/named.args new file mode 100644 index 0000000000..6bd3e6cf64 --- /dev/null +++ b/bin/tests/system/fetchlimit/ns3/named.args @@ -0,0 +1 @@ +-m record,size,mctx -c named.conf -d 1 -D fetchlimit-ns3 -X named.lock -g -T maxcachesize=2097152 diff --git a/bin/tests/system/timeouts/ns1/named.args b/bin/tests/system/timeouts/ns1/named.args new file mode 100644 index 0000000000..2df2be2737 --- /dev/null +++ b/bin/tests/system/timeouts/ns1/named.args @@ -0,0 +1 @@ +-m record,size,mctx -c named.conf -d 1 -D timeouts-ns1 -X named.lock -g -T maxcachesize=2097152 diff --git a/bin/tests/system/zero/ns2/named.args b/bin/tests/system/zero/ns2/named.args new file mode 100644 index 0000000000..b20594ea45 --- /dev/null +++ b/bin/tests/system/zero/ns2/named.args @@ -0,0 +1 @@ +-m record,size,mctx -c named.conf -d 1 -D zero-ns2 -X named.lock -g -T maxcachesize=2097152 diff --git a/bin/tests/system/zero/ns3/named.args b/bin/tests/system/zero/ns3/named.args new file mode 100644 index 0000000000..9d89bd697c --- /dev/null +++ b/bin/tests/system/zero/ns3/named.args @@ -0,0 +1 @@ +-m record,size,mctx -c named.conf -d 1 -D zero-ns3 -X named.lock -g -T maxcachesize=2097152 diff --git a/bin/tests/system/zero/ns4/named.args b/bin/tests/system/zero/ns4/named.args new file mode 100644 index 0000000000..09d1fe01fc --- /dev/null +++ b/bin/tests/system/zero/ns4/named.args @@ -0,0 +1 @@ +-m record,size,mctx -c named.conf -d 1 -D zero-ns4 -X named.lock -g -T maxcachesize=2097152 diff --git a/util/copyrights b/util/copyrights index 13f643718c..e716e78985 100644 --- a/util/copyrights +++ b/util/copyrights @@ -246,6 +246,8 @@ ./bin/tests/system/cacheclean/clean.sh SH 2001,2004,2007,2011,2012,2014,2015,2016,2018,2019,2020,2021 ./bin/tests/system/cacheclean/dig.batch X 2001,2018,2019,2020,2021 ./bin/tests/system/cacheclean/knowngood.dig.out X 2001,2018,2019,2020,2021 +./bin/tests/system/cacheclean/ns1/named.args X 2021 +./bin/tests/system/cacheclean/ns2/named.args X 2021 ./bin/tests/system/cacheclean/setup.sh SH 2018,2019,2020,2021 ./bin/tests/system/cacheclean/tests.sh SH 2001,2004,2007,2011,2012,2013,2014,2016,2018,2019,2020,2021 ./bin/tests/system/case/clean.sh SH 2013,2014,2015,2016,2018,2019,2020,2021 @@ -447,6 +449,7 @@ ./bin/tests/system/feature-test.c C 2016,2017,2018,2019,2020,2021 ./bin/tests/system/fetchlimit/ans4/ans.pl PERL 2019,2020,2021 ./bin/tests/system/fetchlimit/clean.sh SH 2015,2016,2018,2019,2020,2021 +./bin/tests/system/fetchlimit/ns3/named.args X 2021 ./bin/tests/system/fetchlimit/setup.sh SH 2015,2016,2018,2019,2020,2021 ./bin/tests/system/fetchlimit/tests.sh SH 2015,2016,2018,2019,2020,2021 ./bin/tests/system/filter-aaaa/clean.sh SH 2010,2012,2014,2016,2018,2019,2020,2021 @@ -904,6 +907,7 @@ ./bin/tests/system/testsummary.sh SH 2018,2019,2020,2021 ./bin/tests/system/timeouts/clean.sh SH 2021 ./bin/tests/system/timeouts/conftest.py PYTHON 2021 +./bin/tests/system/timeouts/ns1/named.args X 2021 ./bin/tests/system/timeouts/prereq.sh SH 2021 ./bin/tests/system/timeouts/setup.sh SH 2021 ./bin/tests/system/timeouts/tests-tcp.py PYTHON-BIN 2021 @@ -1010,6 +1014,9 @@ ./bin/tests/system/xferquota/tests.sh SH 2000,2001,2004,2007,2012,2016,2018,2019,2020,2021 ./bin/tests/system/zero/ans5/ans.pl PERL 2016,2018,2019,2020,2021 ./bin/tests/system/zero/clean.sh SH 2013,2014,2015,2016,2018,2019,2020,2021 +./bin/tests/system/zero/ns2/named.args X 2021 +./bin/tests/system/zero/ns3/named.args X 2021 +./bin/tests/system/zero/ns4/named.args X 2021 ./bin/tests/system/zero/setup.sh SH 2013,2014,2016,2018,2019,2020,2021 ./bin/tests/system/zero/tests.sh SH 2013,2016,2017,2018,2019,2020,2021 ./bin/tests/system/zonechecks/clean.sh SH 2004,2007,2012,2014,2015,2016,2018,2019,2020,2021