Skip to content

Commit 8f03dec

Browse files
committed
fix: TransformationCleaningAgent calls directly JobDB
1 parent 57245b6 commit 8f03dec

File tree

1 file changed

+3
-6
lines changed

1 file changed

+3
-6
lines changed

src/DIRAC/TransformationSystem/Agent/TransformationCleaningAgent.py

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@
3232
from DIRAC.Resources.Storage.StorageElement import StorageElement
3333
from DIRAC.TransformationSystem.Client import TransformationStatus
3434
from DIRAC.TransformationSystem.Client.TransformationClient import TransformationClient
35-
from DIRAC.WorkloadManagementSystem.Client.JobMonitoringClient import JobMonitoringClient
3635
from DIRAC.WorkloadManagementSystem.Client.WMSClient import WMSClient
3736
from DIRAC.WorkloadManagementSystem.DB.JobDB import JobDB
3837

@@ -44,7 +43,6 @@ class TransformationCleaningAgent(AgentModule):
4443
"""
4544
.. class:: TransformationCleaningAgent
4645
47-
:param ~DIRAC.DataManagementSystem.Client.DataManager.DataManager dm: DataManager instance
4846
:param ~TransformationClient.TransformationClient transClient: TransformationClient instance
4947
:param ~FileCatalogClient.FileCatalogClient metadataClient: FileCatalogClient instance
5048
@@ -126,8 +124,6 @@ def initialize(self):
126124
self.reqClient = ReqClient()
127125
# # file catalog client
128126
self.metadataClient = FileCatalogClient()
129-
# # job monitoring client
130-
self.jobMonitoringClient = JobMonitoringClient()
131127
# # job DB
132128
self.jobDB = JobDB()
133129

@@ -227,7 +223,8 @@ def finalize(self):
227223
So, we should just clean from time to time.
228224
What I added here is done only when the agent finalize, and it's quite light-ish operation anyway.
229225
"""
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))
231228
if not res["OK"]:
232229
self.log.error("Failed to get job groups", res["Message"])
233230
return res
@@ -271,7 +268,7 @@ def finalize(self):
271268

272269
# Remove JobIDs that were unknown to the TransformationSystem
273270
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})
275272
if not res["OK"]:
276273
return res
277274
jobIDsToRemove = [int(jobID) for jobID in res["Value"]]

0 commit comments

Comments
 (0)