From a630ab795bf1c6b5b593429c0a7eb6d44a893fd5 Mon Sep 17 00:00:00 2001
From: Karim Ahmed <karim.ahmed@xfel.eu>
Date: Mon, 3 Feb 2020 19:01:20 +0100
Subject: [PATCH] delete file only after finishing all jobs
---
reportservice/report_service.py | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/reportservice/report_service.py b/reportservice/report_service.py
index 130885c78..e2441227d 100644
--- a/reportservice/report_service.py
+++ b/reportservice/report_service.py
@@ -157,8 +157,10 @@ async def build_dc_report(dc_folder, report_fmt):
if "Submitted batch job " in line:
jobid = line.split(" ")[3]
logging.info("Submitted job for building a report: {}".format(jobid))
- await wait_jobs([jobid])
- asyncio.ensure_future(del_folder("{}/slurm-{}.out".format(temp_path, jobid)))
+
+ await asyncio.wait_for(wait_jobs([jobid]), timeout=7200) # timeout=2hours
+ # delete folder only after the pending slurm jobs finishes
+ await del_folder("{}/slurm-{}.out".format(temp_path, jobid))
async def push_figures(repo_master, addf):
--
GitLab