nixos/containers: use machinectl poweroff #76719
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Previously, we were storing the leader pid in a runtime file and signalled SIGRTMIN+4 manually. In systemd 219, the `machinectl poweroff` command was introduced, which does that for us.
|
@GrahamcOfBorg build nixosTests.containers-bridge nixosTests.containers-ephemeral nixosTests.containers-extra_veth nixosTests.containers-hosts nixosTests.containers-imperative nixosTests.containers-ip nixosTests.containers-macvlans nixosTests.containers-physical_interfaces nixosTests.containers-physical_interfaces nixosTests.containers-portforward nixosTests.containers-restart_networking nixosTests.containers-tmpfs |
|
@GrahamcOfBorg test containers-bridge containers-ephemeral containers-extra_veth containers-hosts containers-ip containers-macvlans containers-physical_interfaces containers-portforward containers-restart_networking containers-tmpfs |
jonringer
approved these changes
Dec 31, 2019
There was a problem hiding this comment.
LGTM
locally passes:
[nix-shell:~/.cache/nix-review/pr-76719]$ nix build -f ./nixpkgs/ nixosTests.containers-bridge nixosTests.containers-ephemeral nixosTests.containers-extra_veth nixosTests.containers-hosts nixosTests.containers-imperative nixosTests.containers-ip nixosTests.containers-macvlans nixosTests.containers-physical_interfaces nixosTests.containers-physical_interfaces nixosTests.containers-portforward nixosTests.containers-restart_networking nixosTests.containers-tmpfs
[754 built, 423 copied (1181.7 MiB), 237.6 MiB DL]
|
these passed locally, but failed on ofborg: |
|
@GrahamcOfBorg test containers-hosts containers-macvlans |
|
It now succeeded on ofborg aswell, merging. |
|
I'm probably missing something, but why we wouldn't use the same configuration as in the upstream service file? From my basic tests, the shutdown process seems the same. |
|
TBH, I'd like to see us moving to a state where we basically just use the upstream unit, and all the setup hackery became superfluous...
|
danbst
added a commit
to danbst/nixpkgs
that referenced
this pull request
Feb 15, 2020
Fixes NixOS#43652 Fixes NixOS#16753 Alternative fix for NixOS#39717 The fix in NixOS#76719 was not enough `--keep-unit` ties systemd-nspawn container to systemd unit. When unit is restarted (ie atomic operation "restart", not two separate "stop" and "start") systemd assumes that unit didn't disappear. Hence machine won't disappear. If unit is stopped (or stopped due to failure), associated machine is also stopped, so service can start fresh. Resource slice isn't changed though - it is machine.slice by default for nspawn containers.
zhaofengli
pushed a commit
to zhaofengli/nixpkgs
that referenced
this pull request
Mar 10, 2021
Fixes NixOS#43652 Fixes NixOS#16753 Alternative fix for NixOS#39717 The fix in NixOS#76719 was not enough `--keep-unit` ties systemd-nspawn container to systemd unit. When unit is restarted (ie atomic operation "restart", not two separate "stop" and "start") systemd assumes that unit didn't disappear. Hence machine won't disappear. If unit is stopped (or stopped due to failure), associated machine is also stopped, so service can start fresh. Resource slice isn't changed though - it is machine.slice by default for nspawn containers.
zhaofengli
pushed a commit
to mars-research/nixpkgs
that referenced
this pull request
Apr 14, 2021
Fixes NixOS#43652 Fixes NixOS#16753 Alternative fix for NixOS#39717 The fix in NixOS#76719 was not enough `--keep-unit` ties systemd-nspawn container to systemd unit. When unit is restarted (ie atomic operation "restart", not two separate "stop" and "start") systemd assumes that unit didn't disappear. Hence machine won't disappear. If unit is stopped (or stopped due to failure), associated machine is also stopped, so service can start fresh. Resource slice isn't changed though - it is machine.slice by default for nspawn containers.
zhaofengli
pushed a commit
to zhaofengli/nixpkgs
that referenced
this pull request
Apr 30, 2021
Fixes NixOS#43652 Fixes NixOS#16753 Alternative fix for NixOS#39717 The fix in NixOS#76719 was not enough `--keep-unit` ties systemd-nspawn container to systemd unit. When unit is restarted (ie atomic operation "restart", not two separate "stop" and "start") systemd assumes that unit didn't disappear. Hence machine won't disappear. If unit is stopped (or stopped due to failure), associated machine is also stopped, so service can start fresh. Resource slice isn't changed though - it is machine.slice by default for nspawn containers.
d-xo
pushed a commit
to d-xo/nixpkgs
that referenced
this pull request
Dec 4, 2023
Fixes NixOS#43652 Fixes NixOS#16753 Alternative fix for NixOS#39717 The fix in NixOS#76719 was not enough `--keep-unit` ties systemd-nspawn container to systemd unit. When unit is restarted (ie atomic operation "restart", not two separate "stop" and "start") systemd assumes that unit didn't disappear. Hence machine won't disappear. If unit is stopped (or stopped due to failure), associated machine is also stopped, so service can start fresh. Resource slice isn't changed though - it is machine.slice by default for nspawn containers.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Previously, we were storing the leader pid in a runtime file and
signalled SIGRTMIN+4 manually.
In systemd 219, the
machinectl poweroffcommand was introduced, whichdoes that for us.
Motivation for this change
Things done
sandboxinnix.confon non-NixOS linux)nix-shell -p nixpkgs-review --run "nixpkgs-review wip"./result/bin/)nix path-info -Sbefore and after)Notify maintainers
cc @arianvp