diff --git a/webservice/config/webservice.yaml b/webservice/config/webservice.yaml index 7a764b0fad1807ae1cd3dcd72a41c1962a47e32e..c91b4b923f70df2982f996d0206d367c0a70c37e 100644 --- a/webservice/config/webservice.yaml +++ b/webservice/config/webservice.yaml @@ -31,7 +31,8 @@ kafka: correct: in-folder: /gpfs/exfel/exp/{instrument}/{cycle}/p{proposal}/raw out-folder: /gpfs/exfel/d/proc/{instrument}/{cycle}/p{proposal}/{run} - sched-prio: 80 + commissioning-penalty: 1250 + job-penalty: 2 cmd : >- python -m xfel_calibrate.calibrate {detector} CORRECT --slurm-scheduling {sched_prio} @@ -45,7 +46,8 @@ correct: dark: in-folder: /gpfs/exfel/exp/{instrument}/{cycle}/p{proposal}/raw out-folder: /gpfs/exfel/u/usr/{instrument}/{cycle}/p{proposal}/dark/runs_{runs} - sched-prio: 10 + commissioning-penalty: 1250 + job-penalty: 2 cmd: >- python -m xfel_calibrate.calibrate {detector} DARK --concurrency-par karabo_da diff --git a/webservice/webservice.py b/webservice/webservice.py index 5fde4f4bb75e3c508863b744f96bef2b6f59e1cb..983d33e58b8a00b2aca4bb8cfba86c9d1494fa0e 100644 --- a/webservice/webservice.py +++ b/webservice/webservice.py @@ -1255,7 +1255,10 @@ class ActionsServer: ret = [] partition = await get_slurm_partition(self.mdc, action, proposal) - nice = await get_slurm_nice(partition, instrument, cycle) + nice = await get_slurm_nice( + partition, instrument, cycle, + commissioning_penalty=self.config[action]['commissioning-penalty'], + job_penalty=self.config[action]['job-penalty']) # run xfel_calibrate for karabo_id, dconfig in detectors.items():