From 8b5239404b8ab6d9dbeb83ca4c0ad6e33ff2b40f Mon Sep 17 00:00:00 2001 From: emily Date: Fri, 18 Oct 2024 15:15:00 +0200 Subject: [PATCH 1/3] seras: Increase postgresql limits --- config/hosts/seras/configuration.nix | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/config/hosts/seras/configuration.nix b/config/hosts/seras/configuration.nix index 9d4b4af..b4e062b 100644 --- a/config/hosts/seras/configuration.nix +++ b/config/hosts/seras/configuration.nix @@ -21,6 +21,26 @@ ]; }; + services.postgresql.settings = { + max_connections = 200; + shared_buffers = "24GB"; + effective_cache_size = "72GB"; + maintenance_work_mem = "2GB"; + checkpoint_completion_target = 0.9; + wal_buffers = "16MB"; + default_statistics_target = 100; + random_page_cost = 1.1; + effective_io_concurrency = 200; + work_mem = "31457kB"; + huge_pages = "try"; + min_wal_size = "1GB"; + max_wal_size = "4GB"; + max_worker_processes = 32; + max_parallel_workers_per_gather = 4; + max_parallel_workers = 32; + max_parallel_maintenance_workers = 4; + }; + kyouma.ooklaserver = { enable = true; openFirewall = true; From d546dc37124e07d25a1d825776eef8546f9541d1 Mon Sep 17 00:00:00 2001 From: emily Date: Fri, 18 Oct 2024 16:17:20 +0200 Subject: [PATCH 2/3] hydra: fix build --- config/services/hydra/default.nix | 2 +- flake.lock | 18 ++++++++++-------- flake.nix | 2 +- pkgs/build-worker-oci/default.nix | 4 ++-- 4 files changed, 14 insertions(+), 12 deletions(-) diff --git a/config/services/hydra/default.nix b/config/services/hydra/default.nix index 5073636..404be76 100644 --- a/config/services/hydra/default.nix +++ b/config/services/hydra/default.nix @@ -32,7 +32,7 @@ binary_cache_public_uri = https://cache.kyouma.net evaluator_workers = 8 evaluator_max_memory_size = 16384 - max_output_size = 4294967296 + max_output_size = ${builtins.toString (24 * 1024 * 1024 * 1024)} ''; }; services.harmonia = { diff --git a/flake.lock b/flake.lock index eb0e562..86ea9a9 100644 --- a/flake.lock +++ b/flake.lock @@ -543,15 +543,17 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1728321752, - "narHash": "sha256-GbBAoBF7ZObz0IP+g0LZKxMafpMvNKjTEu9haiZbV54=", - "ref": "refs/heads/main", - "rev": "ee1234c15cdcb427dbd4828e0add09d02cd606c9", - "revCount": 4220, + "lastModified": 1728215710, + "narHash": "sha256-TRxR6zELQoUDPhLkmBU8QjgskNyVcblKgQIxhuOyNRc=", + "ref": "main", + "rev": "799441dcf6d595efb0def686ca0815aef398627b", + "revCount": 4217, "type": "git", "url": "https://git.lix.systems/lix-project/hydra" }, "original": { + "ref": "main", + "rev": "799441dcf6d595efb0def686ca0815aef398627b", "type": "git", "url": "https://git.lix.systems/lix-project/hydra" } @@ -842,11 +844,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1728193676, - "narHash": "sha256-PbDWAIjKJdlVg+qQRhzdSor04bAPApDqIv2DofTyynk=", + "lastModified": 1725001927, + "narHash": "sha256-eV+63gK0Mp7ygCR0Oy4yIYSNcum2VQwnZamHxYTNi+M=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ecbc1ca8ffd6aea8372ad16be9ebbb39889e55b6", + "rev": "6e99f2a27d600612004fbd2c3282d614bfee6421", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 9a54db8..54cc1fa 100644 --- a/flake.nix +++ b/flake.nix @@ -26,7 +26,7 @@ inputs.nixpkgs.follows = "nixpkgs"; }; hydra = { - url = "git+https://git.lix.systems/lix-project/hydra"; + url = "git+https://git.lix.systems/lix-project/hydra?ref=main&rev=799441dcf6d595efb0def686ca0815aef398627b"; inputs.lix.follows = "lix"; }; iceshrimp = { diff --git a/pkgs/build-worker-oci/default.nix b/pkgs/build-worker-oci/default.nix index e458d57..4701811 100644 --- a/pkgs/build-worker-oci/default.nix +++ b/pkgs/build-worker-oci/default.nix @@ -34,8 +34,8 @@ dockerTools.buildLayeredImage { trusted-public-keys = cache.kyouma.net:Frjwu4q1rnwE/MnSTmX9yx86GNA/z3p/oElGvucLiZg= cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY= max-substitution-jobs = 20 max-silent-time = 14400 - min-free = 17179869184 - max-free = 34359738368 + min-free = ${builtins.toString (49152 * 1024 * 1024)} + max-free = ${builtins.toString (65536 * 1024 * 1024)} system-features = benchmark big-parallel kvm nixos-test uid-range gccarch-x86-64 gccarch-x86-64-v2 gccarch-x86-64-v3 EOF From 9f5e0a3d05f0f2114dd5d7c2cb0b24915e02c913 Mon Sep 17 00:00:00 2001 From: Update Bot Date: Sat, 19 Oct 2024 04:20:41 +0200 Subject: [PATCH 3/3] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'disko': 'github:nix-community/disko/d7d57edb72e54891fa67a6f058a46b2bb405663b' (2024-10-16) → 'github:nix-community/disko/a6a3179ddf396dfc28a078e2f169354d0c137125' (2024-10-18) • Updated input 'home-manager': 'github:nix-community/home-manager/e78cbb20276f09c1802e62d2f77fc93ec32da268' (2024-10-17) → 'github:nix-community/home-manager/09a0c0c02953318bf94425738c7061ffdc4cba75' (2024-10-18) • Updated input 'nixpkgs': 'github:nixos/nixpkgs/a3c0b3b21515f74fd2665903d4ce6bc4dc81c77c' (2024-10-14) → 'github:nixos/nixpkgs/5785b6bb5eaae44e627d541023034e1601455827' (2024-10-16) • Updated input 'nixvim': 'github:nix-community/nixvim/3c7b6ae5d1524c691a1b65f7290facd0dc296e40' (2024-10-17) → 'github:nix-community/nixvim/6a8124ca7bc97e753f89da43b82bbc83d1125a32' (2024-10-19) • Updated input 'nixvim/git-hooks': 'github:cachix/git-hooks.nix/ff68f91754be6f3427e4986d7949e6273659be1d' (2024-10-13) → 'github:cachix/git-hooks.nix/3c3e88f0f544d6bb54329832616af7eb971b6be6' (2024-10-16) • Updated input 'nixvim/treefmt-nix': 'github:numtide/treefmt-nix/4446c7a6fc0775df028c5a3f6727945ba8400e64' (2024-10-03) → 'github:numtide/treefmt-nix/d986489c1c757f6921a48c1439f19bfb9b8ecab5' (2024-10-18) --- flake.lock | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/flake.lock b/flake.lock index 86ea9a9..a0be3e4 100644 --- a/flake.lock +++ b/flake.lock @@ -155,11 +155,11 @@ ] }, "locked": { - "lastModified": 1729099656, - "narHash": "sha256-VftVIg7UXTy1bq+tzi1aVYOWl7PQ35IpjW88yMYjjpc=", + "lastModified": 1729281548, + "narHash": "sha256-MuojlSnwAJAwfhgmW8ZtZrwm2Sko4fqubCvReqbUzYw=", "owner": "nix-community", "repo": "disko", - "rev": "d7d57edb72e54891fa67a6f058a46b2bb405663b", + "rev": "a6a3179ddf396dfc28a078e2f169354d0c137125", "type": "github" }, "original": { @@ -462,11 +462,11 @@ ] }, "locked": { - "lastModified": 1728778939, - "narHash": "sha256-WybK5E3hpGxtCYtBwpRj1E9JoiVxe+8kX83snTNaFHE=", + "lastModified": 1729104314, + "narHash": "sha256-pZRZsq5oCdJt3upZIU4aslS9XwFJ+/nVtALHIciX/BI=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "ff68f91754be6f3427e4986d7949e6273659be1d", + "rev": "3c3e88f0f544d6bb54329832616af7eb971b6be6", "type": "github" }, "original": { @@ -521,11 +521,11 @@ ] }, "locked": { - "lastModified": 1729174520, - "narHash": "sha256-QxCAdgQdeIOaCiE0Sr23s9lD0+T1b/wuz5pSiGwNrCQ=", + "lastModified": 1729260213, + "narHash": "sha256-jAvHoU/1y/yCuXzr2fNF+q6uKmr8Jj2xgAisK4QB9to=", "owner": "nix-community", "repo": "home-manager", - "rev": "e78cbb20276f09c1802e62d2f77fc93ec32da268", + "rev": "09a0c0c02953318bf94425738c7061ffdc4cba75", "type": "github" }, "original": { @@ -876,11 +876,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1728888510, - "narHash": "sha256-nsNdSldaAyu6PE3YUA+YQLqUDJh+gRbBooMMekZJwvI=", + "lastModified": 1729070438, + "narHash": "sha256-KOTTUfPkugH52avUvXGxvWy8ibKKj4genodIYUED+Kc=", "owner": "nixos", "repo": "nixpkgs", - "rev": "a3c0b3b21515f74fd2665903d4ce6bc4dc81c77c", + "rev": "5785b6bb5eaae44e627d541023034e1601455827", "type": "github" }, "original": { @@ -907,11 +907,11 @@ "treefmt-nix": "treefmt-nix_2" }, "locked": { - "lastModified": 1729196897, - "narHash": "sha256-xftdQl0kxWJZNWCDSl0pU2E7zCmGjhD/N9ZWgPXK0A0=", + "lastModified": 1729301771, + "narHash": "sha256-XBnrpP7a9oYOGiqHXoXRthRBVZbhhEZPE/6YVLqIrAU=", "owner": "nix-community", "repo": "nixvim", - "rev": "3c7b6ae5d1524c691a1b65f7290facd0dc296e40", + "rev": "6a8124ca7bc97e753f89da43b82bbc83d1125a32", "type": "github" }, "original": { @@ -1173,11 +1173,11 @@ ] }, "locked": { - "lastModified": 1727984844, - "narHash": "sha256-xpRqITAoD8rHlXQafYZOLvUXCF6cnZkPfoq67ThN0Hc=", + "lastModified": 1729242555, + "narHash": "sha256-6jWSWxv2crIXmYSEb3LEVsFkCkyVHNllk61X4uhqfCs=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "4446c7a6fc0775df028c5a3f6727945ba8400e64", + "rev": "d986489c1c757f6921a48c1439f19bfb9b8ecab5", "type": "github" }, "original": {