Skip to content

[19.03] nixos-containers: add TimeoutStartSec option#66205

Merged
infinisil merged 1 commit intoNixOS:release-19.03from
davidak:backport_nixos-containers-TimeoutStartSec
Aug 29, 2019
Merged

[19.03] nixos-containers: add TimeoutStartSec option#66205
infinisil merged 1 commit intoNixOS:release-19.03from
davidak:backport_nixos-containers-TimeoutStartSec

Conversation

@davidak
Copy link
Member

@davidak davidak commented Aug 6, 2019 •
edited
Loading

Motivation for this change

Backport #65661 to fix #65001 on stable too!

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS)
  • 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 @

@davidak davidak requested a review from infinisil as a code owner August 6, 2019 14:30
@ofborg ofborg bot added 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: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. labels Aug 6, 2019
@samueldr
Copy link
Member

samueldr commented Aug 7, 2019

Marked work-in-progress to signal that the PR this backports hasn't been approved and merged to master.

@davidak davidak force-pushed the backport_nixos-containers-TimeoutStartSec branch from 64036f0 to cc26704 Compare August 14, 2019 18:27
@davidak davidak force-pushed the backport_nixos-containers-TimeoutStartSec branch from cc26704 to e1a1969 Compare August 28, 2019 20:11
@davidak
Copy link
Member Author

davidak commented Aug 28, 2019

It has now been approved and merged to master.

I updated this branch and run the tests.

@davidak
nixos-containers: add TimeoutStartSec option
6a04061 
Default is now 1m instead of global default of 15sec. It is also
configurable.

Fixes issue where start of many containers (40+) fail
NixOS#65001

(cherry picked from commit eba686d)
Reason: Problem exists in stable too
@davidak davidak force-pushed the backport_nixos-containers-TimeoutStartSec branch from e1a1969 to 6a04061 Compare August 28, 2019 20:29
@davidak
Copy link
Member Author

davidak commented Aug 28, 2019

@infinisil can you review and merge this too?

@infinisil infinisil merged commit 0715f2f into NixOS:release-19.03 Aug 29, 2019
@davidak davidak deleted the backport_nixos-containers-TimeoutStartSec branch August 29, 2019 07:55
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@infinisil infinisil Awaiting requested review from infinisil infinisil is a code owner

Assignees

No one assigned

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: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@davidak @samueldr @infinisil