From c103d04d4ce4c08b862cb7d6feb553b668ddbbc6 Mon Sep 17 00:00:00 2001 From: Jim Garlick Date: Thu, 4 Nov 2021 19:50:13 -0700 Subject: [PATCH 1/2] testsuite: raise file descriptor limit Problem: issues test 3503 fails if the job-archive module is loaded in rc1. Add 3 more file descriptors to the low limit that is set for the test. --- t/issues/t3503-nofiles-limit.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/t/issues/t3503-nofiles-limit.sh b/t/issues/t3503-nofiles-limit.sh index 054eecb2cded..5979037d21b9 100755 --- a/t/issues/t3503-nofiles-limit.sh +++ b/t/issues/t3503-nofiles-limit.sh @@ -9,8 +9,8 @@ # definitely cause the broker to run over the artificially lowered # fd limit. # -ulimit -n 110 -ulimit -Hn 110 +ulimit -n 113 +ulimit -Hn 113 flux start \ sh -c ' flux mini submit --cc=1-12 hostname && From 5236b14853d299d6d50d4a770f218ecbe8021ef7 Mon Sep 17 00:00:00 2001 From: Jim Garlick Date: Thu, 4 Nov 2021 19:41:26 -0700 Subject: [PATCH 2/2] rc: load job-archive by default Problem: although job-archive does nothing if not configured, it is not loaded in rc1/rc3, so a custom rc script is required if it is needed. Just load it in rc1/rc3 and it can be enabled with config. Fixes #3940 --- etc/rc1 | 1 + etc/rc3 | 1 + 2 files changed, 2 insertions(+) diff --git a/etc/rc1 b/etc/rc1 index 736454e40a8e..ab0d8811bffe 100755 --- a/etc/rc1 +++ b/etc/rc1 @@ -26,6 +26,7 @@ modload 0 cron sync=heartbeat.pulse modload 0 job-manager modload all job-info modload 0 job-list +modload 0 job-archive modload all job-ingest modload 0 job-exec diff --git a/etc/rc3 b/etc/rc3 index 38905d86e83d..27f83904e78a 100755 --- a/etc/rc3 +++ b/etc/rc3 @@ -25,6 +25,7 @@ shopt -u nullglob modrm 0 heartbeat modrm 0 sched-simple modrm all resource +modrm 0 job-archive modrm 0 job-exec modrm 0 job-list modrm all job-info