Skip to content

Commit 2ad1c3e

Browse files
committed
hydra-queue-runner-v2: c7b947af -> 00852963
1 parent 8bcdafb commit 2ad1c3e

File tree

3 files changed

+22
-9
lines changed

3 files changed

+22
-9
lines changed

non-critical-infra/hosts/staging-hydra/hydra.nix

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -120,9 +120,13 @@ in
120120

121121
hydra-queue-runner-v2 = {
122122
enable = true;
123-
settings.remoteStoreAddr = [
124-
"s3://nix-cache-staging?secret-key=${config.sops.secrets.signing-key.path}&ls-compression=br&log-compression=br"
125-
];
123+
settings = {
124+
queueTriggerTimerInS = 300;
125+
concurrentUploadLimit = 2;
126+
remoteStoreAddr = [
127+
"s3://nix-cache-staging?secret-key=${config.sops.secrets.signing-key.path}&ls-compression=br&log-compression=br"
128+
];
129+
};
126130
};
127131

128132
nginx = {

non-critical-infra/modules/hydra-queue-runner-v2.nix

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -106,6 +106,11 @@ in
106106
type = lib.types.ints.positive;
107107
default = 5;
108108
};
109+
concurrentUploadLimit = lib.mkOption {
110+
description = "Concurrent limit for uploading to s3.";
111+
type = lib.types.ints.positive;
112+
default = 5;
113+
};
109114
};
110115
};
111116
default = { };

non-critical-infra/packages/hydra-queue-runner/default.nix

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,15 @@
1313
boost,
1414
}:
1515
let
16-
version = "unstable-2025-08-26";
16+
version = "unstable-2025-08-31";
1717
src = fetchFromGitHub {
1818
owner = "helsinki-systems";
1919
repo = "hydra-queue-runner";
20-
rev = "c7b947af0301a371baaf60e8dac74e547613b80a";
21-
hash = "sha256-OWQk5EGxPBcnc6+S2xhvrEUQXPhRcIYjCrbQf/EaP48=";
20+
rev = "0085296317872fc1127aed2faa00d65940182207";
21+
hash = "sha256-+2G1xBcnDEJXslQLD5QHqZyFDaPYvIdQ04p2Th1MI9E=";
2222
};
2323
useFetchCargoVendor = true;
24-
cargoHash = "sha256-0pj08Gmo+UcWO8oBJFEDaUDpjwSZuJCTVVZtORgK5rM=";
24+
cargoHash = "sha256-/L77FVPjPSVOtnUe7tBBFziiF9PwsnskEqkwOk6LZyo=";
2525
nativeBuildInputs = [
2626
pkg-config
2727
protobuf
@@ -66,7 +66,9 @@ in
6666
cargoTestFlags = finalAttrs.cargoBuildFlags;
6767

6868
postInstall = ''
69-
wrapProgram $out/bin/queue-runner --prefix PATH : ${lib.makeBinPath [ nixVersions.nix_2_29 ]}
69+
wrapProgram $out/bin/queue-runner \
70+
--prefix PATH : ${lib.makeBinPath [ nixVersions.nix_2_29 ]} \
71+
--set-default JEMALLOC_SYS_WITH_MALLOC_CONF "background_thread:true,narenas:1,tcache:false,dirty_decay_ms:0,muzzy_decay_ms:0,abort_conf:true"
7072
'';
7173

7274
meta = meta // {
@@ -94,7 +96,9 @@ in
9496
cargoTestFlags = finalAttrs.cargoBuildFlags;
9597

9698
postInstall = ''
97-
wrapProgram $out/bin/builder --prefix PATH : ${lib.makeBinPath [ nixVersions.nix_2_29 ]}
99+
wrapProgram $out/bin/builder \
100+
--prefix PATH : ${lib.makeBinPath [ nixVersions.nix_2_29 ]} \
101+
--set-default JEMALLOC_SYS_WITH_MALLOC_CONF "background_thread:true,narenas:1,tcache:false,dirty_decay_ms:0,muzzy_decay_ms:0,abort_conf:true"
98102
'';
99103

100104
meta = meta // {

0 commit comments

Comments
 (0)