feat: PilotAgentsDB: remove Broker

Author: fstagni

src/DIRAC/Interfaces/scripts/dirac_admin_get_job_pilots.py

@@ -10,14 +10,12 @@
   $ dirac-admin-get-job-pilots 1848
   {'https://marlb.in2p3.fr:9000/bqYViq6KrVgGfr6wwgT45Q': {'AccountingSent': 'False',
                                                           'BenchMark': 8.1799999999999997,
-                                                          'Broker': 'marwms.in2p3.fr',
                                                           'DestinationSite': 'lpsc-ce.in2p3.fr',
                                                           'GridSite': 'LCG.LPSC.fr',
                                                           'GridType': 'gLite',
                                                           'Jobs': [1848L],
                                                           'LastUpdateTime': datetime.datetime(2011, 2, 21, 12, 39, 10),
                                                           'OutputReady': 'True',
-                                                          'OwnerDN': '/O=GRID/C=FR/O=CNRS/OU=LPC/CN=Sebastien Guizard',
                                                           'OwnerGroup': '/biomed',
                                                           'ParentID': 0L,
                                                           'PilotID': 2247L,

src/DIRAC/Interfaces/scripts/dirac_admin_get_pilot_info.py

@@ -10,13 +10,11 @@
   $ dirac-admin-get-pilot-info https://marlb.in2p3.fr:9000/26KCLKBFtxXKHF4_ZrQjkw
   {'https://marlb.in2p3.fr:9000/26KCLKBFtxXKHF4_ZrQjkw': {'AccountingSent': 'False',
                                                           'BenchMark': 0.0,
-                                                          'Broker': 'marwms.in2p3.fr',
                                                           'DestinationSite': 'cclcgceli01.in2p3.fr',
                                                           'GridSite': 'LCG.IN2P3.fr',
                                                           'GridType': 'gLite',
                                                           'LastUpdateTime': datetime.datetime(2011, 2, 21, 12, 49, 14),
                                                           'OutputReady': 'False',
-                                                          'OwnerDN': '/O=GRID/C=FR/O=CNRS/OU=LPC/CN=Sebastien Guizard',
                                                           'OwnerGroup': '/biomed',
                                                           'ParentID': 0L,
                                                           'PilotID': 2241L,

src/DIRAC/WorkloadManagementSystem/Agent/PilotStatusAgent.py

@@ -208,7 +208,7 @@ def _addPilotsAccountingReport(self, pilotsData):
                 pA.setValueByKey("Site", "Unknown")
             pA.setValueByKey("GridCE", pData["DestinationSite"])
             pA.setValueByKey("GridMiddleware", pData["GridType"])
-            pA.setValueByKey("GridResourceBroker", pData["Broker"])
+            pA.setValueByKey("GridResourceBroker", "DIRAC")
             pA.setValueByKey("GridStatus", pData["Status"])
             if "Jobs" not in pData:
                 pA.setValueByKey("Jobs", 0)

src/DIRAC/WorkloadManagementSystem/Agent/SiteDirector.py

@@ -1354,7 +1354,7 @@ def sendPilotAccounting(self, pilotDict):
                 pA.setValueByKey("Site", "Unknown")
             pA.setValueByKey("GridCE", pilotDict[pRef]["DestinationSite"])
             pA.setValueByKey("GridMiddleware", pilotDict[pRef]["GridType"])
-            pA.setValueByKey("GridResourceBroker", pilotDict[pRef]["Broker"])
+            pA.setValueByKey("GridResourceBroker", "DIRAC")
             pA.setValueByKey("GridStatus", pilotDict[pRef]["Status"])
             if "Jobs" not in pilotDict[pRef]:
                 pA.setValueByKey("Jobs", 0)

src/DIRAC/WorkloadManagementSystem/DB/PilotAgentsDB.py

@@ -38,9 +38,7 @@ def __init__(self, parentLogger=None):
         self.lock = threading.Lock()
 
     ##########################################################################################
-    def addPilotTQReference(
-        self, pilotRef, taskQueueID, ownerGroup, broker="Unknown", gridType="DIRAC", pilotStampDict={}
-    ):
+    def addPilotTQReference(self, pilotRef, taskQueueID, ownerGroup, gridType="DIRAC", pilotStampDict={}):
         """Add a new pilot job reference"""
 
         err = "PilotAgentsDB.addPilotTQReference: Failed to retrieve a new Id."
@@ -52,9 +50,9 @@ def addPilotTQReference(
 
             req = (
                 "INSERT INTO PilotAgents( PilotJobReference, TaskQueueID, "
-                + "OwnerGroup, Broker, GridType, SubmissionTime, LastUpdateTime, Status, PilotStamp ) "
-                + "VALUES ('%s',%d,'%s','%s','%s',UTC_TIMESTAMP(),UTC_TIMESTAMP(),'Submitted','%s')"
-                % (ref, int(taskQueueID), ownerGroup, broker, gridType, stamp)
+                + "OwnerGroup, GridType, SubmissionTime, LastUpdateTime, Status, PilotStamp ) "
+                + "VALUES ('%s',%d,'%s','%s',UTC_TIMESTAMP(),UTC_TIMESTAMP(),'Submitted','%s')"
+                % (ref, int(taskQueueID), ownerGroup, gridType, stamp)
             )
 
             result = self._update(req)
@@ -272,7 +270,6 @@ def getPilotInfo(self, pilotRef=False, parentId=False, conn=False, paramNames=[]
                 "PilotJobReference",
                 "OwnerGroup",
                 "GridType",
-                "Broker",
                 "Status",
                 "DestinationSite",
                 "BenchMark",
@@ -1024,7 +1021,7 @@ def getPilotSummaryWeb(self, selectDict, sortList, startItem, maxItems):
     def getPilotMonitorSelectors(self):
         """Get distinct values for the Pilot Monitor page selectors"""
 
-        paramNames = ["OwnerGroup", "GridType", "Broker", "Status", "DestinationSite", "GridSite"]
+        paramNames = ["OwnerGroup", "GridType", "Status", "DestinationSite", "GridSite"]
 
         resultDict = {}
         for param in paramNames:
@@ -1087,7 +1084,6 @@ def getPilotMonitorWeb(self, selectDict, sortList, startItem, maxItems):
             "PilotJobReference",
             "OwnerGroup",
             "GridType",
-            "Broker",
             "Status",
             "DestinationSite",
             "BenchMark",

src/DIRAC/WorkloadManagementSystem/Service/PilotManagerHandler.py

@@ -75,7 +75,7 @@ def export_getCurrentPilotCounters(cls, attrDict={}):
     @deprecated("Use addPilotTQRef")
     @classmethod
     def export_addPilotTQReference(
-        cls, pilotRef, taskQueueID, ownerDN, ownerGroup, broker="Unknown", gridType="DIRAC", pilotStampDict={}
+        cls, pilotRef, taskQueueID, ownerDN, ownerGroup, gridType="DIRAC", pilotStampDict={}
     ):
         """Add a new pilot job reference"""
 
@@ -84,13 +84,9 @@ def export_addPilotTQReference(
     types_addPilotTQRef = [list, int, str, str]
 
     @classmethod
-    def export_addPilotTQRef(
-        cls, pilotRef, taskQueueID, ownerGroup, broker="Unknown", gridType="DIRAC", pilotStampDict={}
-    ):
+    def export_addPilotTQRef(cls, pilotRef, taskQueueID, ownerGroup, gridType="DIRAC", pilotStampDict={}):
         """Add a new pilot job reference"""
-        return cls.pilotAgentsDB.addPilotTQReference(
-            pilotRef, taskQueueID, ownerGroup, broker, gridType, pilotStampDict
-        )
+        return cls.pilotAgentsDB.addPilotTQReference(pilotRef, taskQueueID, ownerGroup, gridType, pilotStampDict)
 
     ##############################################################################
     types_getPilotOutput = [str]

tests/Integration/WorkloadManagementSystem/Test_PilotsClient.py

@@ -69,7 +69,6 @@ def test_PilotsDB():
         "GridType": ["DIRAC"],
         "OwnerGroup": ["ownerGroup"],
         "DestinationSite": ["NotAssigned"],
-        "Broker": ["Unknown"],
         "Status": ["Submitted"],
         "GridSite": ["Unknown"],
     }