ComputerSurge/bind9
3
0
Fork 0
Code Pull Requests 1 Activity

Merge branch '4082-rrl-would-limit-log-line' into 'main'

Browse Source 
Disable rrl check in slow environments

Closes #4082

See merge request isc-projects/bind9!7963
This commit is contained in:
Tom Krizek
2023-05-26 10:26:41 +00:00
parent 6efe11bcec d8997db5d5
commit 714d722604
2 changed files with 15 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.gitlab-ci.yml
View File

@@ -1128,7 +1128,7 @@ system:clang:tsan:
needs:
- job: clang:tsan
artifacts: true
allow_failure: true # rrl (GL#4082), upforwd (GL#4072)
allow_failure: true # upforwd (GL#4072), rpz, serve-stale, ... (GL#4081)
unit:clang:tsan:
variables:

27
bin/tests/system/rrl/tests.sh
View File

@@ -252,29 +252,29 @@ $RNDCCMD $ns2 stats
ckstats final dropped 56
ckstats final truncated 23
#########
sec_start
# check that "would limit" is emitted for "log-only yes;"
DIGOPTS="+nocookie +nosearch +time=1 +tries=1 +ignore -p ${PORT}"
$DIG $DIGOPTS @$ns4 A a7.tld4 > /dev/null 2>&1
$DIG $DIGOPTS @$ns4 A a7.tld4 > /dev/null 2>&1
$DIG $DIGOPTS @$ns4 A a7.tld4 > /dev/null 2>&1
$DIG $DIGOPTS @$ns4 A a7.tld4 > /dev/null 2>&1
$DIG $DIGOPTS @$ns4 A a7.tld4 > /dev/null 2>&1
$DIG $DIGOPTS @$ns4 A a7.tld4 > /dev/null 2>&1
$DIG $DIGOPTS @$ns4 A a7.tld4 > /dev/null 2>&1
$DIG $DIGOPTS @$ns4 A a7.tld4 > /dev/null 2>&1
$DIG $DIGOPTS @$ns4 A a7.tld4 > /dev/null 2>&1
$DIG $DIGOPTS @$ns4 A a7.tld4 > /dev/null 2>&1
$DIG $DIGOPTS @$ns4 A a7.tld4 > /dev/null 2>&1
$DIG $DIGOPTS @$ns4 A a7.tld4 > dig.out.a7.tld 2> /dev/null
# skip this check if query takes over 500ms
if grep -E ';; Query time: [1-4]?[0-9]?[0-9] msec' dig.out.a7.tld > /dev/null 2>&1; then
for i in 1 2 3 4 5; do
$DIG $DIGOPTS @$ns4 A a7.tld4 > /dev/null 2>&1 &
done
wait
grep "would limit" ns4/named.run > /dev/null 2>&1 || setret "\"would limit\" not found in log file."
fi
# regression test for GL #2839
DIGOPTS="+bufsize=4096 +ignore -p ${PORT}"
$DIG $DIGOPTS @$ns4 TXT big.tld4 > /dev/null 2>&1
grep "would limit" ns4/named.run >/dev/null 2>&1 ||
setret "\"would limit\" not found in log file."
# check named doesn't start with a broken config
$NAMED -D rrl-ns5 -gc broken.conf > broken.out 2>&1 &
sleep 2
grep "min-table-size 1" broken.out > /dev/null || setret "min-table-size 0 was not changed to 1"
@@ -284,5 +284,6 @@ if [ -f named.pid ]; then
setret "named should not have started, but did"
fi
echo_i "exit status: $ret"
[ $ret -eq 0 ] || exit 1