Skip to content

Commit 9fe25df

Browse files
committed
feat: removed scripts that depend on agents
1 parent 0b31773 commit 9fe25df

File tree

5 files changed

+1
-97
lines changed

5 files changed

+1
-97
lines changed

setup.cfg

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -292,13 +292,10 @@ console_scripts =
292292
# TransformationSystem
293293
dirac-production-runjoblocal = DIRAC.TransformationSystem.scripts.dirac_production_runjoblocal:main
294294
dirac-transformation-add-files = DIRAC.TransformationSystem.scripts.dirac_transformation_add_files:main [admin]
295-
dirac-transformation-archive = DIRAC.TransformationSystem.scripts.dirac_transformation_archive:main [admin]
296-
dirac-transformation-clean = DIRAC.TransformationSystem.scripts.dirac_transformation_clean:main [admin]
297295
dirac-transformation-cli = DIRAC.TransformationSystem.scripts.dirac_transformation_cli:main [admin]
298296
dirac-transformation-get-files = DIRAC.TransformationSystem.scripts.dirac_transformation_get_files:main [admin]
299297
dirac-transformation-information = DIRAC.TransformationSystem.scripts.dirac_transformation_information:main [admin]
300298
dirac-transformation-recover-data = DIRAC.TransformationSystem.scripts.dirac_transformation_recover_data:main [admin]
301-
dirac-transformation-remove-output = DIRAC.TransformationSystem.scripts.dirac_transformation_remove_output:main [admin]
302299
dirac-transformation-replication = DIRAC.TransformationSystem.scripts.dirac_transformation_replication:main [admin]
303300
dirac-transformation-verify-outputdata = DIRAC.TransformationSystem.scripts.dirac_transformation_verify_outputdata:main [admin]
304301
dirac-transformation-update-derived = DIRAC.TransformationSystem.scripts.dirac_transformation_update_derived:main [admin]

src/DIRAC/TransformationSystem/Agent/TransformationCleaningAgent.py

Lines changed: 1 addition & 4 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.DB.JobDB import JobDB
3736
from DIRAC.WorkloadManagementSystem.Service.JobPolicy import (
3837
RIGHT_DELETE,
@@ -126,8 +125,6 @@ def initialize(self):
126125
self.reqClient = ReqClient()
127126
# # file catalog client
128127
self.metadataClient = FileCatalogClient()
129-
# # job monitoring client
130-
self.jobMonitoringClient = JobMonitoringClient()
131128
# # job DB
132129
self.jobDB = JobDB()
133130

@@ -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"]]

src/DIRAC/TransformationSystem/scripts/dirac_transformation_archive.py

Lines changed: 0 additions & 30 deletions
This file was deleted.

src/DIRAC/TransformationSystem/scripts/dirac_transformation_clean.py

Lines changed: 0 additions & 30 deletions
This file was deleted.

src/DIRAC/TransformationSystem/scripts/dirac_transformation_remove_output.py

Lines changed: 0 additions & 30 deletions
This file was deleted.

0 commit comments

Comments
 (0)