From 02ef3e61f218538a45e5b205236f09d2b2c5efeb Mon Sep 17 00:00:00 2001
From: Jorrit Schaap <schaap@astron.nl>
Date: Fri, 14 Jun 2019 09:19:41 +0000
Subject: [PATCH] SW-699: cleanup of obsolete empty job directories
---
.../lib/ingestjobmanagementserver.py | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/LTA/LTAIngest/LTAIngestServer/LTAIngestAdminServer/lib/ingestjobmanagementserver.py b/LTA/LTAIngest/LTAIngestServer/LTAIngestAdminServer/lib/ingestjobmanagementserver.py
index 0c95cc0f10d..405a26ff768 100644
--- a/LTA/LTAIngest/LTAIngestServer/LTAIngestAdminServer/lib/ingestjobmanagementserver.py
+++ b/LTA/LTAIngest/LTAIngestServer/LTAIngestAdminServer/lib/ingestjobmanagementserver.py
@@ -430,6 +430,15 @@ class IngestJobManager:
shutil.move(current_path, new_path)
job_admin_dict['path'] = new_path
+ # nice cleanup of obsolete empty directories
+ try:
+ old_dirname = os.path.dirname(current_path)
+ if old_dirname.startswith(self.__jobs_dir) and len(os.listdir(old_dirname)) == 0:
+ logger.info('removing empty jobs directory: %s', old_dirname)
+ os.rmdir(old_dirname)
+ except OSError as e:
+ logger.error(e)
+
if new_status == JobRemoved or new_status == JobFailed:
# send notification
# this is (also) picked up by the ingestmomadapter
--
GitLab