Commit eabce2a0b3 for bind
commit eabce2a0b3a80d092e95efd2992760d56f231d1b
Author: Michal Nowak <mnowak@isc.org>
Date: Mon Oct 5 13:01:41 2026 +0000
Revert "Retry pipequeries on a transient EADDRINUSE in the pipelined test"
This reverts commit b9cf877277d37db7148a917581a57c7702a35b33.
The EADDRINUSE came from libuv setting SO_REUSEADDR on the port-0
bind done by netmgr, a path the Python pipequeries no longer takes,
so the retry loop is dead weight.
diff --git a/bin/tests/system/pipelined/tests.sh b/bin/tests/system/pipelined/tests.sh
index 1dcd38a6e7..ba2914da81 100644
--- a/bin/tests/system/pipelined/tests.sh
+++ b/bin/tests/system/pipelined/tests.sh
@@ -32,32 +32,7 @@ n=1
ret=0
echo_i "check pipelined TCP queries ($n)"
-# On FreeBSD, the TCP connect() call can transiently fail with
-# EADDRINUSE even after the netmgr retried it in place: the socket is
-# already bound, so retrying on the same source port cannot help.
-# pipequeries then bails out before any query is sent, which leaves
-# the ns4 cache cold, so it is safe to simply run it again (and the
-# out-of-order check below remains meaningful on a repeated run).
-#
-# This loop is a workaround for the pipequeries.c implementation. If
-# pipequeries is ever rewritten in pure Python (using the test suite's
-# own DNS machinery, which can pick a fresh source port per attempt),
-# this retry should no longer be necessary and can be dropped.
-pq_left=10
-while :; do
- ret=0
- pipequeries <input >raw.$n 2>pipequeries.err.$n || ret=1
- cat pipequeries.err.$n >&2
- pq_left=$((pq_left - 1))
- if [ $ret -eq 0 ] || [ $pq_left -le 0 ]; then
- break
- fi
- if ! grep "address in use" pipequeries.err.$n >/dev/null; then
- break
- fi
- echo_i "retrying pipequeries after a transient connect failure"
- sleep 1
-done
+pipequeries <input >raw.$n || ret=1
awk '{ print $1 " " $5 }' <raw.$n >output.$n
sort <output.$n >output-sorted.$n
diff ref output-sorted.$n || {
diff --git a/bin/tests/system/pipelined/tests_sh_pipelined.py b/bin/tests/system/pipelined/tests_sh_pipelined.py
index 646d7a1647..8aae6f2e5e 100644
--- a/bin/tests/system/pipelined/tests_sh_pipelined.py
+++ b/bin/tests/system/pipelined/tests_sh_pipelined.py
@@ -14,7 +14,6 @@ import pytest
pytestmark = pytest.mark.extra_artifacts(
[
"output*",
- "pipequeries.err*",
"raw*",
]
)