MR comments

webservice/webservice.py

@@ -689,7 +689,8 @@ async def server_runner(config, mode):
                                             "EPIX", "EPIX10K"]:
                         priority = '0'
                     cmd = ["python", "-m", "xfel_calibrate.calibrate",
-                           detector, "DARK", '--priority', priority, '--slurm-priority', '10']
+                           detector, "DARK", '--priority', priority,
+                           '--slurm-scheduling', str(config[action]['sched-prio'])]  #noqa
 
                     # Avoid giving a reservation parameter after the
                     # ITDM changes for giving xcal high priority by default
@@ -757,7 +758,8 @@ async def server_runner(config, mode):
                     if "-" in detector:
                         detector, _ = detector.split("-")
                     cmd = ["python", "-m", "xfel_calibrate.calibrate",
-                           detector, "CORRECT",  '--slurm-priority', '100']
+                           detector, "CORRECT", '--slurm-scheduling',
+                           str(config[action]['sched-prio'])]
 
                     cmd = await parse_config(cmd, dconfig)
 

webservice/webservice.yaml

@@ -25,8 +25,10 @@ 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
 
 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
 

xfel_calibrate/calibrate.py

@@ -53,10 +53,12 @@ def make_initial_parser():
                         help="Do not run as a cluster job")
 
     parser.add_argument('--report-to', type=str,
-                        help='Filename (and optionally path) for output report')
+                        help='Filename (and optionally path) for output'
+                             ' report')
 
     parser.add_argument('--priority', type=int, default=2,
-                        help="Priority of batch jobs. If priority<=1, reserved nodes become available.")
+                        help="Priority of batch jobs. If priority<=1, reserved"
+                             " nodes become available.")
 
     parser.add_argument('--vector-figs', action="store_true", default=False,
                         help="Use vector graphics for figures in the report.")
@@ -67,8 +69,10 @@ def make_initial_parser():
     parser.add_argument('--slurm-name', type=str, default='xfel_calibrate',
                         help='Name of slurm job')
 
-    parser.add_argument('--slurm-priority', type=int, default=0,
-                        help='Change priority of srurm job +- 2147483645 (negative value increases priority)')
+    parser.add_argument('--slurm-scheduling', type=int, default=0,
+                        help='Change scheduling priority for a slurm job '
+                             '+- 2147483645 (negative value increases '
+                             'priority)')
 
     parser.add_argument_group('required arguments')