Skip to content
Snippets Groups Projects
Commit 18f1004d authored by Robert Rosca's avatar Robert Rosca Committed by Thomas Kluyver
Browse files

Apply 3 suggestion(s) to 1 file(s)

parent 0c6e9c10
No related branches found
No related tags found
1 merge request!668[Webservice] Monitor Slurm jobs in separate process
...@@ -106,11 +106,11 @@ def update_job_db(config): ...@@ -106,11 +106,11 @@ def update_job_db(config):
c = conn.cursor() c = conn.cursor()
c.execute("SELECT * FROM jobs WHERE status IN ('R', 'PD', 'CG') ") c.execute("SELECT * FROM jobs WHERE status IN ('R', 'PD', 'CG') ")
combined = {} combined = {}
log.debug("SLURM info {}".format(statii)) log.debug(f"SLURM info {statii}")
for r in c.fetchall(): for r in c.fetchall():
rid, jobid, proposal, run, status, _time, det, action = r rid, jobid, proposal, run, status, _time, det, action = r
log.debug("DB info {}".format(r)) log.debug(f"DB info {r}")
cflg, cstatus, *_ = combined.setdefault((rid, action), ( cflg, cstatus, *_ = combined.setdefault((rid, action), (
[], [], proposal, run, det [], [], proposal, run, det
...@@ -121,7 +121,7 @@ def update_job_db(config): ...@@ -121,7 +121,7 @@ def update_job_db(config):
c.execute(query, (slstatus, runtime, jobid)) c.execute(query, (slstatus, runtime, jobid))
cflg.append('R') cflg.append('R')
cstatus.append("{}-{}".format(slstatus, runtime)) cstatus.append(f"{slstatus}-{runtime}")
else: else:
_, sltime, slstatus = slurm_job_status(jobid) _, sltime, slstatus = slurm_job_status(jobid)
query = "UPDATE jobs SET status=? WHERE jobid LIKE ?" query = "UPDATE jobs SET status=? WHERE jobid LIKE ?"
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment