On 16.10.22 23:25, Christopher J. Madsen wrote:
> I tried building dnsmasq 2.87 with a patch that reverts commit 553c4c99,
> and that does seem to fix the problem.

Related to the very same patch, but from a slightly different angle: automatic reload of $resolv-file purges all upstream servers not configured in this $resolve-file; below is a small minimal configuration and the logs of v2.88test1 vs v2.88test1+backout-553c4c9

==== dnsmasq.conf

# Include all files in a directory which end in .conf
conf-dir=/data/bla/t/dnsmasq-example/dnsmasq.d/,*.conf

==== dnsmasq.d/check.conf
resolv-file=/run/NetworkManager/no-stub-resolv.conf
server=/ct.de/9.9.9.9
server=/heise.de/8.8.8.8
no-negcache
interface=lo
domain-needed
clear-on-reload
port=5355
no-dhcp-interface=lo
keep-in-foreground
user=dnsmasq

==== Output of v2.88test1:
> pkill -f -USR1 dnsmasq-example
dnsmasq[2314255]: time 1666000359
dnsmasq[2314255]: cache size 150, 0/0 cache insertions re-used unexpired cache entries.
dnsmasq[2314255]: queries forwarded 0, queries answered locally 0
dnsmasq[2314255]: queries for authoritative zones 0
dnsmasq[2314255]: pool memory in use 0, max 0, allocated 0
dnsmasq[2314255]: server 9.9.9.9#53: queries sent 0, retried 0, failed 0, nxdomain replies 0, avg. latency 0ms dnsmasq[2314255]: server 8.8.8.8#53: queries sent 0, retried 0, failed 0, nxdomain replies 0, avg. latency 0ms dnsmasq[2314255]: server 172.27.1.253#53: queries sent 0, retried 0, failed 0, nxdomain replies 0, avg. latency 0ms dnsmasq[2314255]: server 172.27.1.254#53: queries sent 0, retried 0, failed 0, nxdomain replies 0, avg. latency 0ms

> touch /run/NetworkManager/no-stub-resolv.conf
dnsmasq[2314255]: reading /run/NetworkManager/no-stub-resolv.conf
dnsmasq[2314255]: using nameserver 172.27.1.253#53
dnsmasq[2314255]: using nameserver 172.27.1.254#53
dnsmasq[2314255]: read /etc/hosts - 35 addresses

> pkill -f -USR1 dnsmasq-example
dnsmasq[2314255]: time 1666000365
dnsmasq[2314255]: cache size 150, 0/0 cache insertions re-used unexpired cache entries.
dnsmasq[2314255]: queries forwarded 0, queries answered locally 0
dnsmasq[2314255]: queries for authoritative zones 0
dnsmasq[2314255]: pool memory in use 0, max 0, allocated 0
dnsmasq[2314255]: server 172.27.1.253#53: queries sent 0, retried 0, failed 0, nxdomain replies 0, avg. latency 0ms dnsmasq[2314255]: server 172.27.1.254#53: queries sent 0, retried 0, failed 0, nxdomain replies 0, avg. latency 0ms dnsmasq[2314255]: server 9.9.9.9#53: queries sent 0, retried 0, failed 0, nxdomain replies 0, avg. latency 0ms


==== after backout of 553c4c9
==== * 504538b 2022-10-14 15:12:04.. (tag: backout) Revert "Fix massive confusion on server reload." <Michael Eyrich>

> pkill -f -USR1 dnsmasq-example
dnsmasq[2306436]: time 1666000232
dnsmasq[2306436]: cache size 150, 0/0 cache insertions re-used unexpired cache entries.
dnsmasq[2306436]: queries forwarded 0, queries answered locally 0
dnsmasq[2306436]: queries for authoritative zones 0
dnsmasq[2306436]: pool memory in use 0, max 0, allocated 0
dnsmasq[2306436]: server 9.9.9.9#53: queries sent 0, retried 0, failed 0, nxdomain replies 0, avg. latency 0ms dnsmasq[2306436]: server 8.8.8.8#53: queries sent 0, retried 0, failed 0, nxdomain replies 0, avg. latency 0ms dnsmasq[2306436]: server 172.27.1.253#53: queries sent 0, retried 0, failed 0, nxdomain replies 0, avg. latency 0ms dnsmasq[2306436]: server 172.27.1.254#53: queries sent 0, retried 0, failed 0, nxdomain replies 0, avg. latency 0ms

> touch /run/NetworkManager/no-stub-resolv.conf
dnsmasq[2306436]: reading /run/NetworkManager/no-stub-resolv.conf
dnsmasq[2306436]: using nameserver 9.9.9.9#53 for domain ct.de
dnsmasq[2306436]: using nameserver 8.8.8.8#53 for domain heise.de
dnsmasq[2306436]: using nameserver 172.27.1.253#53
dnsmasq[2306436]: using nameserver 172.27.1.254#53
dnsmasq[2306436]: using nameserver 9.9.9.9#53
dnsmasq[2306436]: read /etc/hosts - 35 addresses

> pkill -f -USR1 dnsmasq-example
dnsmasq[2306436]: time 1666000244
dnsmasq[2306436]: cache size 150, 0/0 cache insertions re-used unexpired cache entries.
dnsmasq[2306436]: queries forwarded 0, queries answered locally 0
dnsmasq[2306436]: queries for authoritative zones 0
dnsmasq[2306436]: pool memory in use 0, max 0, allocated 0
dnsmasq[2306436]: server 9.9.9.9#53: queries sent 0, retried 0, failed 0, nxdomain replies 0, avg. latency 0ms dnsmasq[2306436]: server 8.8.8.8#53: queries sent 0, retried 0, failed 0, nxdomain replies 0, avg. latency 0ms dnsmasq[2306436]: server 172.27.1.253#53: queries sent 0, retried 0, failed 0, nxdomain replies 0, avg. latency 0ms dnsmasq[2306436]: server 172.27.1.254#53: queries sent 0, retried 0, failed 0, nxdomain replies 0, avg. latency 0ms


Thanks for all you work on dnsmasq!

Michael

--
Michael Eyrich



_______________________________________________
Dnsmasq-discuss mailing list
Dnsmasq-discuss@lists.thekelleys.org.uk
https://lists.thekelleys.org.uk/cgi-bin/mailman/listinfo/dnsmasq-discuss

Reply via email to