PR#314: Get dns server address if host isn’t using systemd-resolved - fedora-qa/os-autoinst-distri-fedora

fedora-qa / os-autoinst-distri-fedora

#314 Get dns server address if host isn’t using systemd-resolved

Merged a month ago by adamwill. Opened 2 months ago by dbrouwer.

fedora-qa/ dbrouwer/os-autoinst-distri-fedora dns_resolution into main

Get dns server address if host isn’t using systemd-resolved

Deborah Brouwer • a month ago

4eec75b

lib/tapnet.pm

file modified

+11

		`@@ -62,6 +62,17 @@`
		`# FIXME this is gonna break when we have IPv6 DNS servers on the`
		`# worker hosts`
		`my @forwards = split(' ', $result);`
		`+`
		`+ # Alternatively, for hosts that aren't running systemd, read /etc/resolv.conf`
		`+ if (!@forwards && open(my $fh, '<', "/etc/resolv.conf")) {`
		`+ while (<$fh>) {`
		`+ next if /:/; # ignore ipv6 addresses`
		`+ if ($_ =~ m/^nameserver +(.+)/) {`
		`+ push @forwards, $1;`
		`+ }`
		`+ }`
		`+ close($fh);`
		`+ }`
		`return @forwards;`
		`}`

dbrouwer commented 2 months ago

The worker containers aren’t using systemd-resolved so
get_host_dns() can’t find the dns server causing tests that need
it to fail. Add an alternative place to look for the dns server address
that doesn’t rely on systemd-resolved.

Signed-off-by: Deborah Brouwer deborah.brouwer@collabora.com

zuul commented 2 months ago

Build succeeded.
https://fedora.softwarefactory-project.io/zuul/buildset/fe4d7d6fd8004dc69f52762de73a70fc

os-autoinst-tox : SUCCESS in 4m 56s
os-autoinst-perl : SUCCESS in 8m 37s

adamwill commented 2 months ago

why not just grep 'nameserver' /etc/resolv.conf instead of cat /etc/resolv.conf | grep 'nameserver'? aside from that, sure! should be fine.

adamwill commented 2 months ago

actually, huh. according to me in https://pagure.io/fedora-qa/os-autoinst-distri-fedora/c/a5433c823d5da4b38408434d1a840ea6452fe671?branch=main , the current implementation is a quick hack. I had completely forgotten about this, probably because it kept working. I probably meant to do something a bit more sophisticated at some point.

maybe you could use the old resolv.conf-based implementation I had (the 'before' of that commit) in your conditional instead of this one...

dbrouwer commented 2 months ago

Sure, yes, when I tested the 'before' commit, I needed to tweak it just to force it to take only one nameserver address and to ignore any ipv6 addresses that might appear.

rebased onto aec6de4

2 months ago

zuul commented 2 months ago

Build failed. More information on how to proceed and troubleshoot errors available at https://fedoraproject.org/wiki/Zuul-based-ci
https://fedora.softwarefactory-project.io/zuul/buildset/19f3940771b34440bad97964598be5ae

os-autoinst-tox : SUCCESS in 4m 51s
os-autoinst-perl : FAILURE in 8m 43s

rebased onto 50b39f1

2 months ago

zuul commented 2 months ago

Build succeeded.
https://fedora.softwarefactory-project.io/zuul/buildset/47e372aae0d846699ff73cbe7a94bb94

os-autoinst-tox : SUCCESS in 5m 39s
os-autoinst-perl : SUCCESS in 7m 50s

adamwill commented 2 months ago

ah, I see. taking just one nameserver is not actually the intent, though - the function is meant to get all of them. the systemd version gets all the nameservers on one line and calls split() on it.

dbrouwer commented 2 months ago

i see what you mean - sending all of the ipv4 addresses does work fine now that i am removing the ipv6 addresses

rebased onto f107444

2 months ago

zuul commented 2 months ago

Build succeeded.
https://fedora.softwarefactory-project.io/zuul/buildset/e9c45cf21bfc42908ade83608426e324