diff options
author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2016-01-04 16:53:42 +0100 |
---|---|---|
committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2016-01-04 16:53:42 +0100 |
commit | 6d02d7e740396980cf4f36b3a623eea01155b6d2 (patch) | |
tree | 047e2a0e6c6e7fb64ef8404549620ea38e49208b /nixos | |
parent | 517d8c88469bc6cd72056e7cc24c42d9ee98334e (diff) | |
download | nixlib-6d02d7e740396980cf4f36b3a623eea01155b6d2.tar nixlib-6d02d7e740396980cf4f36b3a623eea01155b6d2.tar.gz nixlib-6d02d7e740396980cf4f36b3a623eea01155b6d2.tar.bz2 nixlib-6d02d7e740396980cf4f36b3a623eea01155b6d2.tar.lz nixlib-6d02d7e740396980cf4f36b3a623eea01155b6d2.tar.xz nixlib-6d02d7e740396980cf4f36b3a623eea01155b6d2.tar.zst nixlib-6d02d7e740396980cf4f36b3a623eea01155b6d2.zip |
NixOS tests: Increase hung_task_timeout_secs
This hopefully fixes intermittent test failures like http://hydra.nixos.org/build/29962437 router# [ 240.128835] INFO: task mke2fs:99 blocked for more than 120 seconds. router# [ 240.130135] Not tainted 3.18.25 #1-NixOS router# [ 240.131110] "echo 0 > /proc/sys/kernel/hung_task_timeout_secs" disables this message. assuming that these are caused by high load on the host.
Diffstat (limited to 'nixos')
-rw-r--r-- | nixos/modules/system/boot/stage-1-init.sh | 1 | ||||
-rw-r--r-- | nixos/modules/system/boot/stage-1.nix | 11 | ||||
-rw-r--r-- | nixos/modules/testing/test-instrumentation.nix | 5 |
3 files changed, 16 insertions, 1 deletions
diff --git a/nixos/modules/system/boot/stage-1-init.sh b/nixos/modules/system/boot/stage-1-init.sh index 2b5d547353f8..7fb368e8c44f 100644 --- a/nixos/modules/system/boot/stage-1-init.sh +++ b/nixos/modules/system/boot/stage-1-init.sh @@ -140,6 +140,7 @@ done # Create device nodes in /dev. +@preDeviceCommands@ echo "running udev..." mkdir -p /etc/udev ln -sfn @udevRules@ /etc/udev/rules.d diff --git a/nixos/modules/system/boot/stage-1.nix b/nixos/modules/system/boot/stage-1.nix index 58a0749c74e2..694a5cfb6f85 100644 --- a/nixos/modules/system/boot/stage-1.nix +++ b/nixos/modules/system/boot/stage-1.nix @@ -203,7 +203,7 @@ let inherit (config.boot) resumeDevice devSize runSize; inherit (config.boot.initrd) checkJournalingFS - postEarlyDeviceCommands preLVMCommands postDeviceCommands postMountCommands kernelModules; + preLVMCommands preDeviceCommands postEarlyDeviceCommands postDeviceCommands postMountCommands kernelModules; resumeDevices = map (sd: if sd ? device then sd.device else "/dev/disk/by-label/${sd.label}") (filter (sd: (sd ? label || hasPrefix "/dev/" sd.device) && !sd.randomEncryption) config.swapDevices); @@ -303,6 +303,15 @@ in ''; }; + boot.initrd.preDeviceCommands = mkOption { + default = ""; + type = types.lines; + description = '' + Shell commands to be executed before udev is started to create + device nodes. + ''; + }; + boot.initrd.postDeviceCommands = mkOption { default = ""; type = types.lines; diff --git a/nixos/modules/testing/test-instrumentation.nix b/nixos/modules/testing/test-instrumentation.nix index f37bbd0246da..c233beb63ca7 100644 --- a/nixos/modules/testing/test-instrumentation.nix +++ b/nixos/modules/testing/test-instrumentation.nix @@ -43,6 +43,11 @@ let kernel = config.boot.kernelPackages.kernel; in # into thinking they're running interactively. environment.variables.PAGER = ""; + boot.initrd.preDeviceCommands = + '' + echo 600 > /proc/sys/kernel/hung_task_timeout_secs + ''; + boot.initrd.postDeviceCommands = '' # Using acpi_pm as a clock source causes the guest clock to |