fix: do not request StorageManagementDB

Author: fstagni

src/DIRAC/TransformationSystem/Agent/TransformationCleaningAgent.py

@@ -7,6 +7,7 @@
   :caption: TransformationCleaningAgent options
 
 """
+
 # # imports
 import ast
 import errno
@@ -69,7 +70,6 @@ def __init__(self, *args, **kwargs):
         self.jobDB = None
         self.pilotAgentsDB = None
         self.taskQueueDB = None
-        self.storageManagementDB = None
 
         # # transformations types
         self.transformationTypes = None
@@ -144,11 +144,6 @@ def initialize(self):
             return result
         self.taskQueueDB = result["Value"]()
 
-        result = ObjectLoader().loadObject("StorageManagementSystem.DB.StorageManagementDB", "StorageManagementDB")
-        if not result["OK"]:
-            return result
-        self.storageManagementDB = result["Value"]()
-
         return S_OK()
 
     #############################################################################
@@ -640,7 +635,6 @@ def __removeWMSTasks(self, transJobIDs):
             jobdb=self.jobDB,
             taskqueuedb=self.taskQueueDB,
             pilotagentsdb=self.pilotAgentsDB,
-            storagemanagementdb=self.storageManagementDB,
         )
         # Prevent 0 job IDs
         jobIDs = [int(j) for j in transJobIDs if int(j)]

src/DIRAC/WorkloadManagementSystem/Agent/StalledJobAgent.py

@@ -41,7 +41,6 @@ def __init__(self, *args, **kwargs):
         self.logDB = None
         self.taskQueueDB = None
         self.pilotAgentsDB = None
-        self.storageManagementDB = None
         self.matchedTime = 7200
         self.rescheduledTime = 600
         self.submittingTime = 300
@@ -73,11 +72,6 @@ def initialize(self):
             return result
         self.pilotAgentsDB = result["Value"]()
 
-        result = ObjectLoader().loadObject("StorageManagementSystem.DB.StorageManagementDB", "StorageManagementDB")
-        if not result["OK"]:
-            return result
-        self.storageManagementDB = result["Value"]()
-
         # getting parameters
 
         if not self.am_getOption("Enable", True):
@@ -267,7 +261,6 @@ def _failStalledJobs(self, jobID):
                 jobdb=self.jobDB,
                 taskqueuedb=self.taskQueueDB,
                 pilotagentsdb=self.pilotAgentsDB,
-                storagemanagementdb=self.storageManagementDB,
             )
             if not res["OK"]:
                 self.log.error("Failed to kill job", jobID)

src/DIRAC/WorkloadManagementSystem/DB/StatusUtils.py

@@ -1,6 +1,6 @@
 from DIRAC import S_ERROR, S_OK, gLogger
-from DIRAC.WorkloadManagementSystem.Client import JobStatus
 from DIRAC.Core.Utilities.ObjectLoader import ObjectLoader
+from DIRAC.WorkloadManagementSystem.Client import JobStatus
 from DIRAC.WorkloadManagementSystem.Service.JobPolicy import RIGHT_DELETE, RIGHT_KILL
 from DIRAC.WorkloadManagementSystem.Utilities.jobAdministration import _filterJobStateTransition
 
@@ -96,11 +96,6 @@ def kill_delete_jobs(
         if not result["OK"]:
             return result
         pilotagentsdb = result["Value"]()
-    if storagemanagementdb is None:
-        result = ObjectLoader().loadObject("StorageManagementSystem.DB.StorageManagementDB", "StorageManagementDB")
-        if not result["OK"]:
-            return result
-        storagemanagementdb = result["Value"]()
 
     badIDs = []
 
@@ -133,6 +128,14 @@ def kill_delete_jobs(
         stagingJobList = [jobID for jobID, sDict in jobStates.items() if sDict["Status"] == JobStatus.STAGING]
 
         if stagingJobList:
+            if storagemanagementdb is None:
+                result = ObjectLoader().loadObject(
+                    "StorageManagementSystem.DB.StorageManagementDB", "StorageManagementDB"
+                )
+                if not result["OK"]:
+                    return result
+                storagemanagementdb = result["Value"]()
+
             gLogger.info("Going to send killing signal to stager as well!")
             result = storagemanagementdb.killTasksBySourceTaskID(stagingJobList)
             if not result["OK"]:

src/DIRAC/WorkloadManagementSystem/Service/JobManagerHandler.py

@@ -1,14 +1,15 @@
-""" JobManagerHandler is the implementation of the JobManager service
-    in the DISET framework
+"""JobManagerHandler is the implementation of the JobManager service
+in the DISET framework
 
-    The following methods are available in the Service interface
+The following methods are available in the Service interface
 
-    submitJob()
-    rescheduleJob()
-    deleteJob()
-    killJob()
+submitJob()
+rescheduleJob()
+deleteJob()
+killJob()
 
 """
+
 from pydantic import ValidationError
 
 from DIRAC import S_ERROR, S_OK
@@ -65,11 +66,6 @@ def initializeHandler(cls, serviceInfoDict):
                 return result
             cls.pilotAgentsDB = result["Value"](parentLogger=cls.log)
 
-            result = ObjectLoader().loadObject("StorageManagementSystem.DB.StorageManagementDB", "StorageManagementDB")
-            if not result["OK"]:
-                return result
-            cls.storageManagementDB = result["Value"](parentLogger=cls.log)
-
         except RuntimeError as excp:
             return S_ERROR(f"Can't connect to DB: {excp!r}")
 
@@ -468,7 +464,6 @@ def export_deleteJob(self, jobIDs, force=False):
             jobdb=self.jobDB,
             taskqueuedb=self.taskQueueDB,
             pilotagentsdb=self.pilotAgentsDB,
-            storagemanagementdb=self.storageManagementDB,
         )
 
         result["requireProxyUpload"] = len(ownerJobList) > 0 and self.__checkIfProxyUploadIsRequired()
@@ -506,7 +501,6 @@ def export_killJob(self, jobIDs, force=False):
             jobdb=self.jobDB,
             taskqueuedb=self.taskQueueDB,
             pilotagentsdb=self.pilotAgentsDB,
-            storagemanagementdb=self.storageManagementDB,
         )
 
         result["requireProxyUpload"] = len(ownerJobList) > 0 and self.__checkIfProxyUploadIsRequired()