Skip to content

nixos/tinydns: port test to python#73059

Merged
worldofpeace merged 2 commits intoNixOS:masterfrom
flokli:nixos-test-port-tinydns
Nov 9, 2019
Merged

nixos/tinydns: port test to python#73059
worldofpeace merged 2 commits intoNixOS:masterfrom
flokli:nixos-test-port-tinydns

Conversation

@flokli
Copy link
Copy Markdown
Member

@flokli flokli commented Nov 8, 2019

Motivation for this change

#72828

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nix-review --run "nix-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.
Notify maintainers

cc @worldofpeace @tfc

@ofborg ofborg bot added the 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS label Nov 8, 2019
In cases where you boot up really quickly (like in the VM test on a
non-busy host), tinydns might want to bind before the loopback interface
is fully up. Order tinydns after network.target to fix that.
@flokli flokli force-pushed the nixos-test-port-tinydns branch from c57dd5e to caac096 Compare November 8, 2019 16:26
@flokli
Copy link
Copy Markdown
Member Author

flokli commented Nov 8, 2019

There was some flakyness in the tests, as sometimes tinydns.service wanted to bind before network.target was reached. Fixed by adding a after line to the tinydns.service defined in the NixOS module.

@ofborg ofborg bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux. 8.has: module (update) This PR changes an existing module in `nixos/` labels Nov 8, 2019
@rnhmjoj
Copy link
Copy Markdown
Contributor

rnhmjoj commented Nov 8, 2019

@GrahamcOfBorg test tinydns

systemd.services.tinydns = {
description = "djbdns tinydns server";
wantedBy = [ "multi-user.target" ];
after = [ "network.target" ];
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You should never use network.target: it's meant to be pulled in by services providing the network link/setup, like dhcpcd. Use network-online.target instead. See #50930 (comment)

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Does tinydns fail horribly during startup if there's no default route? Otherwise, systemd docs explicitly mention we should go after network.target, not network-online.target:

Units that strictly require a configured network connection should pull in network-online.target (via a Wants= type dependency) and order themselves after it. This target unit is intended to pull in a service that delays further execution until the network is sufficiently set up. What precisely this requires is left to the implementation of the network managing service.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Does tinydns fail horribly during startup if there's no default route?

Probably not but it's logically not part of setting up the network link and needs an internet connection.

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We don't set wants, or make it partOf network.target - we only set an after.

Setting After=network-online.target would mean we wait with starting tinydns until there's a default route. This means if you're enabling tinydns on your laptop, you don't reach multi-user.target until you get an internet connection.

I don't think that's necessary, but tinydns needs to wait until there's a network interface available in the system, so setting After=network.target should be right. 😕

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh, you are right: I was confusing After with Wants, sorry.

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No worries!

@worldofpeace worldofpeace merged commit 488e6b7 into NixOS:master Nov 9, 2019
@flokli flokli deleted the nixos-test-port-tinydns branch November 22, 2019 19:32
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 8.has: module (update) This PR changes an existing module in `nixos/` 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants