ehmry
/
nix-processmgmt
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Implement nice level for process running in Docker, adjust testcases to use a different state directory

This commit is contained in:
Sander van der Burg 2021-03-28 15:58:58 +02:00 committed by Sander van der Burg
parent af529514cf
commit 5384e7bb51
3 changed files with 19 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
nixproc/backends/docker/generate-docker-container.nix
View File

@ -21,9 +21,6 @@
, postInstall
}:
# TODO:
# nice unsupported
let
util = import ../util {
inherit lib;
@ -62,7 +59,7 @@ let
executable = foregroundProcess;
user = _user;
initialize = _initialize;
inherit name runtimeDir stdenv;
inherit name runtimeDir stdenv nice;
} // lib.optionalAttrs (instanceName != null) {
inherit instanceName;
} // lib.optionalAttrs (pidFile != null) {
@ -77,7 +74,7 @@ let
executable = daemon;
user = _user;
initialize = _initialize;
inherit name runtimeDir stdenv;
inherit name runtimeDir stdenv nice;
} // lib.optionalAttrs (instanceName != null) {
inherit instanceName;
} // lib.optionalAttrs (pidFile != null) {

5
nixproc/backends/util/generate-foreground-proxy.nix
View File

@ -9,6 +9,7 @@
, instanceName ? null
, pidFile ? (if instanceName == null then null else "${runtimeDir}/${instanceName}.pid")
, user ? null
, nice ? null
}:
let
@ -43,7 +44,7 @@ writeTextFile {
trap _interrupt SIGINT
# Start process in the background as a daemon
${lib.optionalString (user != null) "${chainload-user}/bin/nixproc-chainload-user ${user}"} ${executable} "$@"
${lib.optionalString (user != null) "${chainload-user}/bin/nixproc-chainload-user ${user} "}${lib.optionalString (nice != null) "nice -n ${nice} "}${executable} "$@"
# Wait for the PID file to become available. Useful to work with daemons that don't behave well enough.
count=1 # Start with 1, because 0 returns a non-zero exit status when incrementing it
@ -80,7 +81,7 @@ writeTextFile {
blocker_pid=$!
wait $blocker_pid
'' else ''
exec ${lib.optionalString (user != null) "${chainload-user}/bin/nixproc-chainload-user ${user} "}"${executable}" "$@"
exec ${lib.optionalString (user != null) "${chainload-user}/bin/nixproc-chainload-user ${user} "}${lib.optionalString (nice != null) "nice -n ${nice} "}"${executable}" "$@"
''}
'';
executable = true;

19
tests/webapps-agnostic-docker.nix
View File

@ -3,8 +3,11 @@
with import "${nixpkgs}/nixos/lib/testing-python.nix" { system = builtins.currentSystem; };
let
stateDir = "/dockervar";
dockerProcessEnv = import ../nixproc/backends/systemd/build-systemd-env.nix {
exprFile = ./processes-docker.nix;
inherit stateDir;
};
processesEnvForeground = import ../nixproc/backends/docker/build-docker-env.nix {
@ -12,6 +15,7 @@ let
extraParams = {
webappMode = "foreground";
};
inherit stateDir;
};
processesEnvDaemon = import ../nixproc/backends/docker/build-docker-env.nix {
@ -19,23 +23,28 @@ let
extraParams = {
webappMode = "daemon";
};
inherit stateDir;
};
processesEnvAuto = import ../nixproc/backends/docker/build-docker-env.nix {
exprFile = ../examples/webapps-agnostic/processes.nix;
inherit stateDir;
};
processesEnvAdvanced = import ../nixproc/backends/docker/build-docker-env.nix {
exprFile = ../examples/webapps-agnostic/processes-advanced.nix;
inherit stateDir;
};
processesEnvUnprivileged = import ../nixproc/backends/docker/build-docker-env.nix {
exprFile = ../examples/webapps-agnostic/processes.nix;
forceDisableUserChange = true;
inherit stateDir;
};
processesEnvEmpty = import ../nixproc/backends/docker/build-docker-env.nix {
exprFile = null;
inherit stateDir;
};
tools = import ../tools {};
@ -111,7 +120,7 @@ makeTest {
# Deploy the system with foreground webapp processes
machine.succeed(
'${env} nixproc-docker-switch ${nix-processmgmt}/examples/webapps-agnostic/processes.nix --extra-params \'{ "webappMode" = "foreground"; }\'${""}'
'${env} nixproc-docker-switch ${nix-processmgmt}/examples/webapps-agnostic/processes.nix --state-dir ${stateDir} --extra-params \'{ "webappMode" = "foreground"; }\'${""}'
)
machine.succeed("sleep 10")
@ -124,7 +133,7 @@ makeTest {
# Deploy the system with daemon webapp processes
machine.succeed(
'${env} nixproc-docker-switch ${nix-processmgmt}/examples/webapps-agnostic/processes.nix --extra-params \'{ "webappMode" = "daemon"; }\'${""}'
'${env} nixproc-docker-switch ${nix-processmgmt}/examples/webapps-agnostic/processes.nix --state-dir ${stateDir} --extra-params \'{ "webappMode" = "daemon"; }\'${""}'
)
machine.succeed("sleep 10")
@ -137,7 +146,7 @@ makeTest {
# Deploy the entire system in auto mode. Should result in foreground webapp processes
machine.succeed(
"${env} nixproc-docker-switch ${nix-processmgmt}/examples/webapps-agnostic/processes.nix"
"${env} nixproc-docker-switch ${nix-processmgmt}/examples/webapps-agnostic/processes.nix --state-dir ${stateDir}"
)
machine.succeed("sleep 10")
@ -150,7 +159,7 @@ makeTest {
# Deploy the advanced example with multiple instances and see if it works
machine.succeed(
"${env} nixproc-docker-switch ${nix-processmgmt}/examples/webapps-agnostic/processes-advanced.nix"
"${env} nixproc-docker-switch ${nix-processmgmt}/examples/webapps-agnostic/processes-advanced.nix --state-dir ${stateDir}"
)
machine.succeed("sleep 40")
@ -161,7 +170,7 @@ makeTest {
# Deploy an instance without changing user privileges
machine.succeed(
"${env} nixproc-docker-switch ${nix-processmgmt}/examples/webapps-agnostic/processes.nix --force-disable-user-change"
"${env} nixproc-docker-switch ${nix-processmgmt}/examples/webapps-agnostic/processes.nix --state-dir ${stateDir} --force-disable-user-change"
)
machine.succeed("sleep 10")