- Draft the idea of unjostable queries if upstreams are explicitly configured.

2026-08-25 17:12:31 +02:00 · 2024-12-06 16:05:59 +01:00
parent ded4c82ced
commit f0e6c4fa2c
8 changed files with 213 additions and 25 deletions
@@ -0,0 +1,27 @@
+server:
+        num-threads: 1
+	verbosity: 5
+	use-syslog: no
+	directory: ""
+	pidfile: "unbound.pid"
+	chroot: ""
+	username: ""
+	do-not-query-localhost: no
+	use-caps-for-id: no
+	port: @SERVER_PORT@
+	interface: 127.0.0.1
+
+        num-queries-per-thread: 2
+        infra-cache-min-rtt: 1000
+
+stub-zone:
+	name: "a.slow"
+	stub-addr: 127.0.0.1@@SLOW_STUB_PORT@
+
+stub-zone:
+	name: "b.slow"
+	stub-addr: 127.0.0.1@@SLOW_STUB_PORT@
+
+stub-zone:
+	name: "c.fast"
+	stub-addr: 127.0.0.1@@FAST_STUB_PORT@
@@ -0,0 +1,16 @@
+BaseName: mesh_jostle_priority
+Version: 1.0
+Description: Check that mesh items will not be jostled if there is a explicitly configured upstream
+CreationDate: Tue 3 Dec 11:00:00 CEST 2024
+Maintainer:
+Category:
+Component:
+CmdDepends:
+Depends:
+Help:
+Pre: mesh_jostle_priority.pre
+Post: mesh_jostle_priority.post
+Test: mesh_jostle_priority.test
+AuxFiles:
+Passed:
+Failure:
@@ -0,0 +1,12 @@
+# #-- mesh_jostle_priority.post --#
+# source the master var file when it's there
+[ -f ../.tpkg.var.master ] && source ../.tpkg.var.master
+# source the test var file when it's there
+[ -f .tpkg.var.test ] && source .tpkg.var.test
+#
+# do your teardown here
+. ../common.sh
+kill_from_pidfile "unbound.pid"
+kill_pid $SLOW_STUB_PID
+kill_pid $FAST_STUB_PID
+cat unbound.log
@@ -0,0 +1,36 @@
+# #-- mesh_jostle_priority.pre--#
+PRE="../.."
+. ../common.sh
+
+get_random_port 3
+SERVER_PORT=$RND_PORT
+SLOW_STUB_PORT=$(($RND_PORT + 1))
+FAST_STUB_PORT=$(($RND_PORT + 2))
+echo "SERVER_PORT=$SERVER_PORT" >> .tpkg.var.test
+echo "SLOW_STUB_PORT=$SLOW_STUB_PORT" >> .tpkg.var.test
+echo "FAST_STUB_PORT=$FAST_STUB_PORT" >> .tpkg.var.test
+
+# start stub
+get_ldns_testns
+$LDNS_TESTNS -v -p $SLOW_STUB_PORT mesh_jostle_priority.testns >stub_slow.log 2>&1 &
+SLOW_STUB_PID=$!
+echo "SLOW_STUB_PID=$SLOW_STUB_PID" >> .tpkg.var.test
+
+$LDNS_TESTNS -v -p $FAST_STUB_PORT mesh_jostle_priority.testns >stub_fast.log 2>&1 &
+FAST_STUB_PID=$!
+echo "FAST_STUB_PID=$FAST_STUB_PID" >> .tpkg.var.test
+
+# make config file
+sed \
+	-e 's/@SERVER_PORT\@/'$SERVER_PORT'/' \
+	-e 's/@SLOW_STUB_PORT\@/'$SLOW_STUB_PORT'/' \
+	-e 's/@FAST_STUB_PORT\@/'$FAST_STUB_PORT'/' \
+	< mesh_jostle_priority.conf > ub.conf
+
+# start unbound in the background
+$PRE/unbound -d -c ub.conf > unbound.log 2>&1 &
+
+cat .tpkg.var.test
+wait_ldns_testns_up stub_slow.log
+wait_ldns_testns_up stub_fast.log
+wait_unbound_up unbound.log
@@ -0,0 +1,31 @@
+# #-- mesh_jostle_priority.test --#
+# source the master var file when it's there
+[ -f ../.tpkg.var.master ] && source ../.tpkg.var.master
+# use .tpkg.var.test for in test variable passing
+[ -f .tpkg.var.test ] && source .tpkg.var.test
+PRE="../.."
+. ../common.sh
+
+get_make
+(cd $PRE; $MAKE streamtcp)
+
+teststep "Fire up and forget the two slow queries"
+$PRE/streamtcp -f 127.0.0.1@$SERVER_PORT -u -n a.slow. A IN b.slow. A IN
+if test "$?" -ne 0
+then
+	echo "error with streamtcp"
+	exit 1
+fi
+
+teststep "Let time pass so that queries can be jostled based on time"
+sleep 1
+
+teststep "Check that the fast query is dropped because the slow ones have explicitly configured upstreams"
+dig @127.0.0.1 -p $SERVER_PORT +retry=0 +timeout=1 c.fast. > outfile
+if grep "10.20.30.40" outfile
+then
+	cat outfile
+	echo "Did not get a drop"
+	exit 1
+fi
+exit 0
@@ -0,0 +1,35 @@
+$ORIGIN slow.
+$TTL 3600
+
+ENTRY_BEGIN
+MATCH opcode qtype qname
+REPLY QR AA NOERROR
+ADJUST copy_id sleep=5
+SECTION QUESTION
+a	IN	A
+SECTION ANSWER
+a	IN	A 1.1.1.1
+ENTRY_END
+
+ENTRY_BEGIN
+MATCH opcode qtype qname
+REPLY QR AA NOERROR
+ADJUST copy_id sleep=5
+SECTION QUESTION
+b	IN	A
+SECTION ANSWER
+b	IN	A 2.2.2.2
+ENTRY_END
+
+$ORIGIN fast.
+
+ENTRY_BEGIN
+MATCH opcode qtype qname
+REPLY QR AA NOERROR
+ADJUST copy_id
+SECTION QUESTION
+c	IN	A
+SECTION ANSWER
+c	IN	A	10.20.30.40
+ENTRY_END
+