From 2ee64c94593032e22f26e5d308cd1253669b881c Mon Sep 17 00:00:00 2001 From: Astro Date: Tue, 31 May 2022 23:16:34 +0200 Subject: [PATCH] hydra: wiggle the memory limits, remove dead code --- hosts/hydra/hydra.nix | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) diff --git a/hosts/hydra/hydra.nix b/hosts/hydra/hydra.nix index b4131867..e9eed521 100644 --- a/hosts/hydra/hydra.nix +++ b/hosts/hydra/hydra.nix @@ -30,32 +30,23 @@ in { hydraURL = "https://hydra.hq.c3d2.de"; logo = ./c3d2.svg; notificationSender = "hydra@spam.works"; - # package = pkgs.hydra-unstable.overrideAttrs (oa: { - # # HACK for Hydra error: cannot write modified lock file of flake - # patchPhase = '' - # ${pkgs.lib.optionalString (oa ? patchPhase) oa.patchPhase} - - # substituteInPlace src/script/hydra-eval-jobset \ - # --replace '"nix", "flake", "info"' '"nix", "flake", "info", "--no-write-lock-file"' - # ''; - # }); useSubstitutes = true; extraConfig = '' max_output_size = 4294967296 - evaluator_workers = 1 - evaluator_max_memory_size = 4096 + evaluator_workers = 4 + evaluator_max_memory_size = 2048 ''; }; systemd.services.hydra-evaluator.serviceConfig = { CPUWeight = 2; MemoryHigh = "32G"; - MemoryMax = "40G"; + MemoryMax = "32G"; MemorySwapMax = "16G"; }; systemd.services.nix-daemon.serviceConfig = { CPUWeight = 5; MemoryHigh = "32G"; - MemoryMax = "40G"; + MemoryMax = "32G"; MemorySwapMax = "16G"; };