From 6e75e1394d5be47c16701b243f112f2454bb387d Mon Sep 17 00:00:00 2001 From: Otto Moerbeek Date: Thu, 26 Jan 2023 10:04:36 +0100 Subject: [PATCH] Enable TSAN for bulk tests. It seems that putting a sleep between the dnsbulktest runs in regression-tests/recursor-test circumvents the UDP packet loss issues. Still have to find out how and why. --- .github/workflows/build-and-test-all.yml | 2 +- regression-tests/recursor-test | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-and-test-all.yml b/.github/workflows/build-and-test-all.yml index b202abe1b3..52d4b48802 100644 --- a/.github/workflows/build-and-test-all.yml +++ b/.github/workflows/build-and-test-all.yml @@ -345,7 +345,7 @@ jobs: runs-on: ubuntu-20.04 strategy: matrix: - sanitizers: [ubsan+asan] + sanitizers: [ubsan+asan, tsan] threads: [1, 2, 3, 4, 8] mthreads: [2048] shards: [1, 2, 1024] diff --git a/regression-tests/recursor-test b/regression-tests/recursor-test index abf63f40bb..7e6f67d352 100755 --- a/regression-tests/recursor-test +++ b/regression-tests/recursor-test @@ -44,10 +44,11 @@ fi echo echo === First run with limit=$limit threads=$threads mthreads=$mthreads shards=$shards === ${DNSBULKTEST} --www=false -qe 127.0.0.1 $port $limit < ${CSV} > bulktest.results -echo kill -USR1 $(cat pdns_recursor.pid) || true ${RECCONTROL} --timeout=20 --socket-dir=. --config-dir=. get-all || true +sleep 5 + # rerun 1 with hot cache echo echo === Second run with limit=$limit threads=$threads mthreads=$mthreads shards=$shards === @@ -55,6 +56,8 @@ ${DNSBULKTEST} --www=false -qe 127.0.0.1 $port $limit < ${CSV} > bulktest.result kill -USR1 $(cat pdns_recursor.pid) || true ${RECCONTROL} --timeout=20 --socket-dir=. --config-dir=. get-all || true +sleep 5 + # rerun 2 with hot cache echo echo === Third run with limit=$limit threads=$threads mthreads=$mthreads shards=$shards === -- 2.47.2