From 59fa100e3aaab3c5096363b7c3057efa0ee33f0c Mon Sep 17 00:00:00 2001 From: Daniel Morcuende Date: Tue, 8 Feb 2022 12:31:33 -0700 Subject: [PATCH] allows setting how many days look back when fetching sacct job information --- cfg/sequencer.cfg | 3 +++ osa/job.py | 8 +++++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/cfg/sequencer.cfg b/cfg/sequencer.cfg index e42aa373..b7289648 100644 --- a/cfg/sequencer.cfg +++ b/cfg/sequencer.cfg @@ -70,6 +70,9 @@ PARTITION_PEDCALIB: short PARTITION_DATA: long MEMSIZE_PEDCALIB: 3GB MEMSIZE_DATA: 16GB +# Days from current day up to which the jobs are fetched from the queue. +# Default is None (left empty). +STARTTIME_DAYS_SACCT: [WEBSERVER] # Set the server address and port to transfer the datacheck plots diff --git a/osa/job.py b/osa/job.py index 3cdc791d..50fe7a65 100644 --- a/osa/job.py +++ b/osa/job.py @@ -779,18 +779,20 @@ def run_sacct() -> StringIO: log.warning("No job info available since sacct command is not available") return StringIO() - start_date = (datetime.date.today() - datetime.timedelta(weeks=1)).isoformat() sacct_cmd = [ "sacct", "-n", "--parsable2", "--delimiter=,", "--units=G", - "--starttime", - start_date, "-o", ",".join(FORMAT_SLURM), ] + if cfg.get("SLURM", "STARTTIME_DAYS_SACCT"): + days = int(cfg.get("SLURM", "STARTTIME_DAYS_SACCT")) + start_date = (datetime.date.today() - datetime.timedelta(days=days)).isoformat() + sacct_cmd.extend(["--starttime", start_date]) + return StringIO(sp.check_output(sacct_cmd).decode())