fix: removed several unused RPC calls

Author: fstagni

src/DIRAC/MonitoringSystem/Service/WebAppHandler.py

@@ -6,7 +6,6 @@
 from DIRAC.ConfigurationSystem.Client.Helpers.Operations import Operations
 from DIRAC.ConfigurationSystem.Client.Helpers.Resources import getSites
 from DIRAC.Core.DISET.RequestHandler import RequestHandler
-from DIRAC.Core.Utilities.JEncode import strToIntDict
 from DIRAC.Core.Utilities.ObjectLoader import ObjectLoader
 from DIRAC.RequestManagementSystem.Client.Operation import Operation
 from DIRAC.RequestManagementSystem.Client.Request import Request

src/DIRAC/WorkloadManagementSystem/Client/JobMonitoringClient.py

@@ -38,15 +38,6 @@ def getJobParameters(self, jobIDs, parName=None):
             res["Value"] = strToIntDict(res["Value"])
         return res
 
-    @ignoreEncodeWarning
-    def getJobsParameters(self, jobIDs, parameters):
-        res = self._getRPC().getJobsParameters(jobIDs, parameters)
-
-        # Cast the str keys to int
-        if res["OK"]:
-            res["Value"] = strToIntDict(res["Value"])
-        return res
-
     @ignoreEncodeWarning
     def getJobsMinorStatus(self, jobIDs):
         res = self._getRPC().getJobsMinorStatus(jobIDs)

src/DIRAC/WorkloadManagementSystem/DB/JobDB.py

@@ -1190,64 +1190,6 @@ def rescheduleJob(self, jobID):
 
         return retVal
 
-    #############################################################################
-    def getSiteSummary(self):
-        """Get the summary of jobs in a given status on all the sites"""
-
-        waitingList = ['"Submitted"', '"Assigned"', '"Waiting"', '"Matched"']
-        waitingString = ",".join(waitingList)
-
-        result = self.getDistinctJobAttributes("Site")
-        if not result["OK"]:
-            return result
-
-        siteList = result["Value"]
-        siteDict = {}
-        totalDict = {
-            JobStatus.WAITING: 0,
-            JobStatus.RUNNING: 0,
-            JobStatus.STALLED: 0,
-            JobStatus.DONE: 0,
-            JobStatus.FAILED: 0,
-        }
-
-        for site in siteList:
-            if site == "ANY":
-                continue
-            # Waiting
-            siteDict[site] = {}
-            ret = self._escapeString(site)
-            if not ret["OK"]:
-                return ret
-            e_site = ret["Value"]
-
-            req = f"SELECT COUNT(JobID) FROM Jobs WHERE Status IN ({waitingString}) AND Site={e_site}"
-            result = self._query(req)
-            if result["OK"]:
-                count = result["Value"][0][0]
-            else:
-                return S_ERROR("Failed to get Site data from the JobDB")
-            siteDict[site][JobStatus.WAITING] = count
-            totalDict[JobStatus.WAITING] += count
-            # Running,Stalled,Done,Failed
-            for status in [
-                f'"{JobStatus.RUNNING}"',
-                f'"{JobStatus.STALLED}"',
-                f'"{JobStatus.DONE}"',
-                f'"{JobStatus.FAILED}"',
-            ]:
-                req = f"SELECT COUNT(JobID) FROM Jobs WHERE Status={status} AND Site={e_site}"
-                result = self._query(req)
-                if result["OK"]:
-                    count = result["Value"][0][0]
-                else:
-                    return S_ERROR("Failed to get Site data from the JobDB")
-                siteDict[site][status.replace('"', "")] = count
-                totalDict[status.replace('"', "")] += count
-
-        siteDict["Total"] = totalDict
-        return S_OK(siteDict)
-
     #################################################################################
     def getSiteSummaryWeb(self, selectDict, sortList, startItem, maxItems):
         """Get the summary of jobs in a given status on all the sites in the standard Web form"""

src/DIRAC/WorkloadManagementSystem/Service/JobMonitoringHandler.py

@@ -10,7 +10,6 @@
 from DIRAC.Core.Utilities.DEncode import ignoreEncodeWarning
 from DIRAC.Core.Utilities.JEncode import strToIntDict
 from DIRAC.Core.Utilities.ObjectLoader import ObjectLoader
-from DIRAC.WorkloadManagementSystem.Client.PilotManagerClient import PilotManagerClient
 from DIRAC.WorkloadManagementSystem.Utilities.JobParameters import getJobParameters
 
 
@@ -37,7 +36,6 @@ def initializeHandler(cls, svcInfoDict):
             return result
         cls.elasticJobParametersDB = result["Value"](parentLogger=cls.log)
 
-        cls.pilotManager = PilotManagerClient()
         return S_OK()
 
     def initializeRequest(self):
@@ -148,20 +146,6 @@ def export_getJobs(cls, attrDict=None, cutDate=None):
 
         return cls.jobDB.selectJobs(attrDict, newer=cutDate)
 
-    ##############################################################################
-    types_getJobOwner = [int]
-
-    @classmethod
-    def export_getJobOwner(cls, jobID):
-        return cls.jobDB.getJobAttribute(jobID, "Owner")
-
-    ##############################################################################
-    types_getJobSite = [int]
-
-    @classmethod
-    def export_getJobSite(cls, jobID):
-        return cls.jobDB.getJobAttribute(jobID, "Site")
-
     ##############################################################################
     types_getJobJDL = [int, bool]
 
@@ -176,14 +160,6 @@ def export_getJobJDL(cls, jobID, original):
     def export_getJobLoggingInfo(cls, jobID):
         return cls.jobLoggingDB.getJobLoggingInfo(jobID)
 
-    ##############################################################################
-    types_getJobsParameters = [[str, int, list], list]
-
-    @classmethod
-    @ignoreEncodeWarning
-    def export_getJobsParameters(cls, jobIDs, parameters):
-        return cls.getJobsAttributes(jobIDs, parameters)
-
     ##############################################################################
     types_getJobsStates = [[str, int, list]]
 
@@ -252,13 +228,6 @@ def export_getJobParameter(self, jobID, parName):
             return res
         return S_OK(res["Value"].get(int(jobID), {}))
 
-    ##############################################################################
-    types_getJobOptParameters = [int]
-
-    @classmethod
-    def export_getJobOptParameters(cls, jobID):
-        return cls.jobDB.getJobOptParameters(jobID)
-
     ##############################################################################
     types_getJobParameters = [[str, int, list]]
 
@@ -274,15 +243,6 @@ def export_getJobParameters(self, jobIDs, parName=None):
 
         return getJobParameters(jobIDs, parName, self.vo or "")
 
-    ##############################################################################
-    types_getAtticJobParameters = [int]
-
-    @classmethod
-    def export_getAtticJobParameters(cls, jobID, parameters=None, rescheduleCycle=-1):
-        if not parameters:
-            parameters = []
-        return cls.jobDB.getAtticJobParameters(jobID, parameters, rescheduleCycle)
-
     ##############################################################################
     types_getJobAttributes = [int]
 
@@ -307,13 +267,6 @@ def export_getJobAttribute(cls, jobID, attribute):
 
         return cls.jobDB.getJobAttribute(jobID, attribute)
 
-    ##############################################################################
-    types_getSiteSummary = []
-
-    @classmethod
-    def export_getSiteSummary(cls):
-        return cls.jobDB.getSiteSummary()
-
     ##############################################################################
     types_getJobHeartBeatData = [int]
 
@@ -330,9 +283,6 @@ def export_getInputData(cls, jobID):
         return cls.jobDB.getInputData(jobID)
 
 
-##############################################################################
-
-
 class JobMonitoringHandler(JobMonitoringHandlerMixin, RequestHandler):
     def initialize(self):
         return self.initializeRequest()

tests/Integration/FutureClient/WorkloadManagement/Test_JobMonitoring.py

@@ -18,12 +18,6 @@ def test_getApplicationStates():
     pytest.skip()
 
 
-def test_getAtticJobParameters():
-    # JobMonitoringClient().getAtticJobParameters(jobID: int, parameters = None, rescheduleCycle = -1)
-    method = JobMonitoringClient().getAtticJobParameters
-    pytest.skip()
-
-
 def test_getCounters():
     # JobMonitoringClient().getCounters(attrList: list, attrDict = None, cutDate = )
     method = JobMonitoringClient().getCounters
@@ -72,18 +66,6 @@ def test_getJobLoggingInfo():
     pytest.skip()
 
 
-def test_getJobOptParameters():
-    # JobMonitoringClient().getJobOptParameters(jobID: int)
-    method = JobMonitoringClient().getJobOptParameters
-    pytest.skip()
-
-
-def test_getJobOwner():
-    # JobMonitoringClient().getJobOwner(jobID: int)
-    method = JobMonitoringClient().getJobOwner
-    pytest.skip()
-
-
 def test_getJobPageSummaryWeb():
     # JobMonitoringClient().getJobPageSummaryWeb(self: dict, selectDict: list, sortList: int, startItem: int, maxItems, selectJobs = True)
     method = JobMonitoringClient().getJobPageSummaryWeb
@@ -102,12 +84,6 @@ def test_getJobParameters():
     pytest.skip()
 
 
-def test_getJobSite():
-    # JobMonitoringClient().getJobSite(jobID: int)
-    method = JobMonitoringClient().getJobSite
-    pytest.skip()
-
-
 def test_getJobSummary():
     # JobMonitoringClient().getJobSummary(jobID: int)
     method = JobMonitoringClient().getJobSummary
@@ -140,12 +116,6 @@ def test_getJobsMinorStatus(jobIDs):
     compare_results(partial(method, jobIDs))
 
 
-def test_getJobsParameters():
-    # JobMonitoringClient().getJobsParameters(jobIDs: str | int | list, parameters: list)
-    method = JobMonitoringClient().getJobsParameters
-    pytest.skip()
-
-
 @pytest.mark.parametrize("jobIDs", TEST_JOB_IDS)
 def test_getJobsSites(jobIDs):
     # JobMonitoringClient().getJobsSites(jobIDs: str | int | list)
@@ -191,12 +161,6 @@ def test_getOwners():
     pytest.skip()
 
 
-def test_getSiteSummary():
-    # JobMonitoringClient().getSiteSummary()
-    method = JobMonitoringClient().getSiteSummary
-    pytest.skip()
-
-
 def test_getSites():
     # JobMonitoringClient().getSites(condDict = None, older = None, newer = None)
     method = JobMonitoringClient().getSites

tests/Integration/WorkloadManagementSystem/Test_Client_WMS.py

@@ -181,17 +181,8 @@ def test_submitJob_parametricJob() -> None:
     res = dirac.submitJob(job)
     assert res["OK"], res["Message"]
     jobIDList = res["Value"]
-
-    try:
-        assert len(jobIDList) == 3
-
-        res = jobMonitoringClient.getJobsParameters(jobIDList, ["JobName"])
-        assert res["OK"], res["Message"]
-        jobNames = [res["Value"][jobID]["JobName"] for jobID in res["Value"]]
-        assert set(jobNames) == {f"parametric_helloWorld_{nJob}" for nJob in range(3)}
-
-    finally:
-        jobManagerClient.removeJob(jobIDList)
+    assert len(jobIDList) == 3
+    jobManagerClient.removeJob(jobIDList)
 
 
 def test_WMSClient_rescheduleJob() -> None:
@@ -216,11 +207,6 @@ def test_WMSClient_rescheduleJob() -> None:
         assert jobDescription.lookupAttribute("Priority") is True
         assert jobDescription.lookupAttribute("JobID") is True
 
-        # Check that the owner
-        res = jobMonitoringClient.getJobOwner(jobID)
-        assert res["OK"], res["Message"]
-        assert res["Value"] == jobDescription.getAttributeString("Owner")
-
         # resourceDescription = {
         #     "OwnerGroup": jobDescription.getAttributeString("OwnerGroup"),
         #     "VirtualOrganization": jobDescription.getAttributeString("VirtualOrganization"),
@@ -295,9 +281,7 @@ def test_JobStateUpdateAndJobMonitoring() -> None:
         assert res["OK"], res["Message"]
         res = jobMonitoringClient.getJobJDL(jobID, False)
         assert res["OK"], res["Message"]
-        res = jobMonitoringClient.getJobsParameters([jobID], [])
-        assert res["OK"], res["Message"]
-        res = jobMonitoringClient.getJobOwner(jobID)
+        res = jobMonitoringClient.getJobParameters(jobID, [])
         assert res["OK"], res["Message"]
 
         # Adding stuff
@@ -368,9 +352,6 @@ def test_JobStateUpdateAndJobMonitoring() -> None:
         res = jobMonitoringClient.getJobSummary(jobID)
         assert res["OK"], res["Message"]
 
-        res = jobMonitoringClient.getAtticJobParameters(jobID)
-        assert res["OK"], res["Message"]
-
         res = jobStateUpdateClient.setJobStatus(jobID, JobStatus.DONE, "MinorStatus", "Unknown")
         assert res["OK"], res["Message"]