From 36c65b9b2fce19e9ed5721b5930c68ab1182de41 Mon Sep 17 00:00:00 2001
From: Jorrit Schaap <schaap@astron.nl>
Date: Fri, 14 Jun 2019 09:11:30 +0000
Subject: [PATCH] SW-699: group jobs per job_group_id in most status-folders
---
.../LTAIngestAdminServer/lib/ingestjobmanagementserver.py | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/LTA/LTAIngest/LTAIngestServer/LTAIngestAdminServer/lib/ingestjobmanagementserver.py b/LTA/LTAIngest/LTAIngestServer/LTAIngestAdminServer/lib/ingestjobmanagementserver.py
index 953436f3fee..0c95cc0f10d 100644
--- a/LTA/LTAIngest/LTAIngestServer/LTAIngestAdminServer/lib/ingestjobmanagementserver.py
+++ b/LTA/LTAIngest/LTAIngestServer/LTAIngestAdminServer/lib/ingestjobmanagementserver.py
@@ -218,8 +218,11 @@ class IngestJobManager:
if job_status == JobRetry and retry_attempt != None:
return os.path.join(base_dir, group_dir, str(retry_attempt))
+ elif job_status in [JobToDo, JobProduced, JobRemoved, JobFailed]:
+ group_dir = '%s_%s' % (job_type, job_group_id)
+ return os.path.join(base_dir, group_dir)
- return os.path.join(base_dir, group_dir)
+ return base_dir
def jobPath(self, job_admin_dict):
dir = self.jobDir(job_admin_dict)
--
GitLab