fix: Removed every client function not used by anyone, and moved one from an agent.

Author: Robin VAN DE MERGHEL

src/DIRAC/WorkloadManagementSystem/Agent/PilotStatusAgent.py

@@ -70,7 +70,7 @@ def execute(self):
 
         connection.close()
 
-        result = self.pilots.clearPilots(self.clearPilotsDelay, self.clearAbortedDelay)
+        result = self.pilotDB.clearPilots(self.clearPilotsDelay, self.clearAbortedDelay)  # type: ignore
         if not result["OK"]:
             self.log.warn("Failed to clear old pilots in the PilotAgentsDB")
 

src/DIRAC/WorkloadManagementSystem/FutureClient/PilotManagerClient.py

@@ -29,12 +29,6 @@ def setPilotStatus(self, pilot_stamp, status, destination=None, reason=None, gri
             },
         )
 
-    @convertToReturnValue
-    def clearPilots(self, interval=30, aborted_interval=7):
-        with DiracXClient() as api:
-            api.pilots.delete_pilots(age_in_days=interval, delete_only_aborted=False)
-            api.pilots.delete_pilots(age_in_days=aborted_interval, delete_only_aborted=True)
-
     @convertToReturnValue
     def deletePilot(self, pilot_stamp):
         with DiracXClient() as api:
@@ -119,39 +113,3 @@ def deletePilots(self, pilot_stamps):
                 pilot_stamps = [pilot["PilotStamp"] for pilot in pilots]
 
             return api.pilots.delete_pilots(pilot_stamps=pilot_stamps)  # type: ignore
-
-    @convertToReturnValue
-    def setJobForPilot(self, job_id, pilot_stamp, destination=None):
-        raise NotImplementedError(
-            "This function is used by no one. I won't be adapted into DiracX via a legacy adaptor."
-        )
-
-    @convertToReturnValue
-    def countPilots(self, condDict, older=None, newer=None):
-        raise NotImplementedError(
-            "This function is used by no one. I won't be adapted into DiracX via a legacy adaptor."
-        )
-
-    @convertToReturnValue
-    def selectPilots(self, condDict):
-        raise NotImplementedError(
-            "This function is used by no one. I won't be adapted into DiracX via a legacy adaptor."
-        )
-
-    @convertToReturnValue
-    def getCurrentPilotCounters(self, attrDict={}):
-        raise NotImplementedError(
-            "This function is used by no one. I won't be adapted into DiracX via a legacy adaptor."
-        )
-
-    @convertToReturnValue
-    def setPilotBenchmark(self, pilotRef, mark):
-        raise NotImplementedError(
-            "This function is used by no one. I won't be adapted into DiracX via a legacy adaptor."
-        )
-
-    @convertToReturnValue
-    def setAccountingFlag(self, pilotRef, flag="True"):
-        raise NotImplementedError(
-            "This function is used by no one. I won't be adapted into DiracX via a legacy adaptor."
-        )

src/DIRAC/WorkloadManagementSystem/Service/PilotManagerHandler.py

@@ -166,15 +166,6 @@ def _getRemotePilotOutput(self, pilotReference, pilotDict):
         # return res, correct or not
         return res
 
-    ##############################################################################
-
-    types_storePilotOutput = [str, str, str]
-
-    @classmethod
-    def export_storePilotOutput(cls, pilotReference, output, error):
-        """Store the pilot output and error"""
-        return cls.pilotAgentsDB.storePilotOutput(pilotReference, output, error)
-
     ##############################################################################
     types_getPilotLoggingInfo = [str]
 
@@ -227,16 +218,6 @@ def export_getPilotSummary(cls, startdate="", enddate=""):
 
     # --------------- Moved to DiracX ---------------
 
-    types_selectPilots = [dict]
-
-    @classmethod
-    def export_selectPilots(cls, condDict):
-        """Select pilots given the selection conditions"""
-        # Used by no one
-        return cls.pilotAgentsDB.selectPilots(condDict)
-
-    #############################################
-
     types_getGroupedPilotSummary = [list]
 
     @classmethod
@@ -250,46 +231,6 @@ def export_getGroupedPilotSummary(cls, columnList):
         """
         return cls.pilotAgentsDB.getGroupedPilotSummary(columnList)
 
-    types_countPilots = [dict]
-
-    @classmethod
-    def export_countPilots(cls, condDict, older=None, newer=None, timeStamp="SubmissionTime"):
-        """Count pilots"""
-        # Used by no one
-        return cls.pilotAgentsDB.countPilots(condDict, older, newer, timeStamp)
-
-    types_getCurrentPilotCounters = [dict]
-
-    @classmethod
-    def export_getCurrentPilotCounters(cls, attrDict={}):
-        """Get pilot counters per Status with attrDict selection. Final statuses are given for
-        the last day.
-        """
-        # Used by no one
-
-        result = cls.pilotAgentsDB.getCounters("PilotAgents", ["Status"], attrDict, timeStamp="LastUpdateTime")
-        if not result["OK"]:
-            return result
-        last_update = datetime.datetime.utcnow() - TimeUtilities.day
-        resultDay = cls.pilotAgentsDB.getCounters(
-            "PilotAgents", ["Status"], attrDict, newer=last_update, timeStamp="LastUpdateTime"
-        )
-        if not resultDay["OK"]:
-            return resultDay
-
-        resultDict = {}
-        for statusDict, count in result["Value"]:
-            status = statusDict["Status"]
-            resultDict[status] = count
-            if status in PilotStatus.PILOT_FINAL_STATES:
-                resultDict[status] = 0
-                for statusDayDict, ccount in resultDay["Value"]:
-                    if status == statusDayDict["Status"]:
-                        resultDict[status] = ccount
-                    break
-
-        return S_OK(resultDict)
-
     #############################################
     types_addPilotReferences = [list, str]
 
@@ -302,46 +243,6 @@ def export_addPilotReferences(cls, pilotStamps, VO, gridType="DIRAC", pilotRefDi
 
         return cls.pilotAgentsDB.addPilotReferences(pilot_references, VO, gridType, pilot_stamp_dict)
 
-    #############################################
-    types_setJobForPilot = [[str, int], str]
-
-    @classmethod
-    def export_setJobForPilot(cls, jobID, pilotRef, destination=None):
-        """Report the DIRAC job ID which is executed by the given pilot job"""
-        # Used by no one.
-
-        result = cls.pilotAgentsDB.setJobForPilot(int(jobID), pilotRef)
-        if not result["OK"]:
-            return result
-        result = cls.pilotAgentsDB.setCurrentJobID(pilotRef, int(jobID))
-        if not result["OK"]:
-            return result
-        if destination:
-            result = cls.pilotAgentsDB.setPilotDestinationSite(pilotRef, destination)
-
-        return result
-
-    #############################################
-    types_setPilotBenchmark = [str, float]
-
-    @classmethod
-    def export_setPilotBenchmark(cls, pilotRef, mark):
-        """Set the pilot agent benchmark"""
-        # Used by no one.
-        return cls.pilotAgentsDB.setPilotBenchmark(pilotRef, mark)
-
-    #############################################
-    types_setAccountingFlag = [str]
-
-    @classmethod
-    def export_setAccountingFlag(cls, pilotRef, flag="True"):
-        """Set the pilot AccountingSent flag"""
-        # Used by no one
-        return cls.pilotAgentsDB.setAccountingFlag(pilotRef, mark)
-
-    #############################################
-    types_setPilotStatus = [str, str]
-
     @classmethod
     def export_setPilotStatus(cls, pilotRef, status, destination=None, reason=None, gridSite=None, queue=None):
         """Set the pilot agent status"""
@@ -355,7 +256,7 @@ def export_setPilotStatus(cls, pilotRef, status, destination=None, reason=None,
 
     @classmethod
     def export_deletePilots(cls, pilotIDs):
-        # Used by no one.
+        # Used by no one. We keep it for tests.
         if isinstance(pilotIDs, str):
             return cls.pilotAgentsDB.deletePilot(pilotIDs)
 
@@ -373,13 +274,6 @@ def export_deletePilots(cls, pilotIDs):
 
         return S_OK()
 
-    #############################################
-    types_clearPilots = [int, int]
-
-    @classmethod
-    def export_clearPilots(cls, interval=30, aborted_interval=7):
-        return cls.pilotAgentsDB.clearPilots(interval, aborted_interval)
-
     #############################################
     types_getPilots = [[str, int]]
 

tests/Integration/WorkloadManagementSystem/Test_PilotsClient.py

@@ -35,63 +35,22 @@ def test_PilotsDB():
     assert not res["OK"], res
     assert "Conflict" in res["Message"]
 
-    # =================
-    # >>> Used by no one and the legacy adaptor won't forward it.
-    # res = pilots.getCurrentPilotCounters({})
-    # assert res["OK"], res["Message"]
-    # assert "Submitted" in res["Value"]
-    # =================
-
     res = pilots.deletePilots("aPilot")
     assert res["OK"], res["Message"]
 
-    # =================
-    # >>> Used by no one and the legacy adaptor won't forward it.
-    # res = pilots.getCurrentPilotCounters({})
-    # assert res["OK"], res["Message"]
-    # =================
-
     res = pilots.addPilotReferences(["anotherPilot"], "VO")
     assert res["OK"], res["Message"]
 
-    # =================
-    # >>> TODO: Not adapted yet in DiracX
-    # res = pilots.storePilotOutput("anotherPilot", "This is an output", "this is an error")
-    # assert res["OK"], res["Message"]
-    # res = pilots.getPilotOutput("anotherPilot")
-    # assert res["OK"], res["Message"]
-    # assert res["Value"] == {
-    #     "VO": "VO",
-    #     "StdErr": "this is an error",
-    #     "FileList": [],
-    #     "StdOut": "This is an output",
-    # }
-    # =================
-
     res = pilots.getPilotInfo("anotherPilot")
     assert res["OK"], res["Message"]
     assert res["Value"]["anotherPilot"]["AccountingSent"] == "False"
     assert res["Value"]["anotherPilot"]["PilotJobReference"] == "anotherPilot"
 
-    # =================
-    # >>> Used by no one and the legacy adaptor won't forward it.
-    # res = pilots.selectPilots({})
-    # assert res["OK"], res["Message"]
-    # =================
-
     # >>> TODO: Implement me
     # res = pilots.getPilotSummary("", "")
     # assert res["OK"], res["Message"]
     # assert res["Value"]["Total"]["Submitted"] >= 1
 
-    # =================
-    # >>> Used by no one and the legacy adaptor won't forward it.
-    # res = pilots.setAccountingFlag("anotherPilot", "True")
-    # assert res["OK"], res["Message"]
-    # ...
-    # assert res["Value"]["anotherPilot"]["AccountingSent"] == "True"
-    # =================
-
     res = pilots.setPilotStatus("anotherPilot", "Running")
     assert res["OK"], res["Message"]
     res = pilots.getPilotInfo("anotherPilot")
@@ -101,32 +60,8 @@ def test_PilotsDB():
     res = pilots.getGroupedPilotSummary([])
     assert res["OK"], res["Message"]  # We won't test result (hopefully tested in DiracX)
 
-    # =================
-    # >>> Used by no one and the legacy adaptor won't forward it.
-    # res = pilots.setJobForPilot(123, "anotherPilot")
-    # assert res["OK"], res["Message"]
-    # =================
-
-    # =================
-    # >>> Used by no one and the legacy adaptor won't forward it.
-    # res = pilots.setPilotBenchmark("anotherPilot", 12.3)
-    # assert res["OK"], res["Message"]
-    # =================
-
-    # =================
-    # >>> Used by no one and the legacy adaptor won't forward it.
-    # res = pilots.countPilots({})
-    # assert res["OK"], res["Message"]
-    # =================
-
     res = pilots.deletePilots("anotherPilot")
     assert res["OK"], res["Message"]
     # Delete twice, second time an error is raised
     res = pilots.deletePilots("anotherPilot")
     assert not res["OK"], res["Message"]
-
-    # =================
-    # >>> Used by no one and the legacy adaptor won't forward it.
-    # res = pilots.getCurrentPilotCounters({})
-    # assert res["OK"], res["Message"]
-    # =================