32
32
from DIRAC .Resources .Storage .StorageElement import StorageElement
33
33
from DIRAC .TransformationSystem .Client import TransformationStatus
34
34
from DIRAC .TransformationSystem .Client .TransformationClient import TransformationClient
35
- from DIRAC .WorkloadManagementSystem .Client .JobMonitoringClient import JobMonitoringClient
36
35
from DIRAC .WorkloadManagementSystem .Client .WMSClient import WMSClient
37
36
from DIRAC .WorkloadManagementSystem .DB .JobDB import JobDB
38
37
@@ -44,7 +43,6 @@ class TransformationCleaningAgent(AgentModule):
44
43
"""
45
44
.. class:: TransformationCleaningAgent
46
45
47
- :param ~DIRAC.DataManagementSystem.Client.DataManager.DataManager dm: DataManager instance
48
46
:param ~TransformationClient.TransformationClient transClient: TransformationClient instance
49
47
:param ~FileCatalogClient.FileCatalogClient metadataClient: FileCatalogClient instance
50
48
@@ -126,8 +124,6 @@ def initialize(self):
126
124
self .reqClient = ReqClient ()
127
125
# # file catalog client
128
126
self .metadataClient = FileCatalogClient ()
129
- # # job monitoring client
130
- self .jobMonitoringClient = JobMonitoringClient ()
131
127
# # job DB
132
128
self .jobDB = JobDB ()
133
129
@@ -227,7 +223,8 @@ def finalize(self):
227
223
So, we should just clean from time to time.
228
224
What I added here is done only when the agent finalize, and it's quite light-ish operation anyway.
229
225
"""
230
- res = self .jobDB .getDistinctJobAttributes ("JobGroup" , None , datetime .utcnow () - timedelta (days = 365 ))
226
+
227
+ res = self .jobDB .getDistinctJobAttributes ("JobGroup" , older = datetime .utcnow () - timedelta (days = 365 ))
231
228
if not res ["OK" ]:
232
229
self .log .error ("Failed to get job groups" , res ["Message" ])
233
230
return res
@@ -271,7 +268,7 @@ def finalize(self):
271
268
272
269
# Remove JobIDs that were unknown to the TransformationSystem
273
270
jobGroupsToCheck = [str (transDict ["TransformationID" ]).zfill (8 ) for transDict in toClean + toArchive ]
274
- res = self .jobMonitoringClient . getJobs ({"JobGroup" : jobGroupsToCheck })
271
+ res = self .jobDB . selectJobs ({"JobGroup" : jobGroupsToCheck })
275
272
if not res ["OK" ]:
276
273
return res
277
274
jobIDsToRemove = [int (jobID ) for jobID in res ["Value" ]]
0 commit comments