From 1ea24e4dc24142282476a168ed45a59e8efc31d4 Mon Sep 17 00:00:00 2001
From: Karim Ahmed <karim.ahmed@xfel.eu>
Date: Wed, 15 Jan 2020 17:40:59 +0100
Subject: [PATCH] modify slurm name in prod
---
webservice/webservice.py | 11 ++++++++---
webservice/webservice.yaml | 2 +-
2 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/webservice/webservice.py b/webservice/webservice.py
index 70cd40107..4a4959bdc 100644
--- a/webservice/webservice.py
+++ b/webservice/webservice.py
@@ -654,7 +654,7 @@ async def server_runner(config, mode):
for detector, dconfig in pconf[instrument].items():
# check if we find files according
# to mapping in raw run folder
- if detector not in det_list and det_list[0]!='all':
+ if detector not in det_list and det_list[0] != 'all':
continue
fl = glob.glob(
"{}/RAW-*{}*.h5".format(rpath, dconfig["inset"]))
@@ -690,7 +690,10 @@ async def server_runner(config, mode):
priority = '0'
cmd = ["python", "-m", "xfel_calibrate.calibrate",
detector, "DARK", '--priority', priority,
- '--slurm-scheduling', str(config[action]['sched-prio'])] #noqa
+ '--slurm-scheduling', str(config[action]['sched-prio']), # noqa
+ '--slurm-name',
+ '{}_{}_{}_p{:06d}_r{:04d}'.format(action, instrument,
+ detector, proposal, runnr)]
# Avoid giving a reservation parameter after the
# ITDM changes for giving xcal high priority by default
@@ -759,7 +762,9 @@ async def server_runner(config, mode):
detector, _ = detector.split("-")
cmd = ["python", "-m", "xfel_calibrate.calibrate",
detector, "CORRECT", '--slurm-scheduling',
- str(config[action]['sched-prio'])]
+ str(config[action]['sched-prio']), '--slurm-name',
+ '{}_{}_{}_{}_{}'.format(action, instrument,
+ detector, proposal, runnr)]
cmd = await parse_config(cmd, dconfig)
diff --git a/webservice/webservice.yaml b/webservice/webservice.yaml
index 542cdbf6e..c4b138b76 100644
--- a/webservice/webservice.yaml
+++ b/webservice/webservice.yaml
@@ -25,7 +25,7 @@ metadata-client:
correct:
in-folder: /gpfs/exfel/exp/{instrument}/{cycle}/p{proposal}/raw
out-folder: /gpfs/exfel/d/proc/{instrument}/{cycle}/p{proposal}/{run}
- sched-prio: 100
+ sched-prio: 80
dark:
in-folder: /gpfs/exfel/exp/{instrument}/{cycle}/p{proposal}/raw
--
GitLab