fix: use ComputingElement instead of DestinationSite

Author: fstagni

src/DIRAC/MonitoringSystem/Client/Types/PilotsHistory.py

@@ -17,7 +17,7 @@ def __init__(self):
 
         super().__init__()
 
-        self.keyFields = ["GridSite", "GridType", "Status", "VO"]
+        self.keyFields = ["GridSite", "ComputingElement", "GridType", "Status", "VO"]
 
         self.monitoringFields = ["NumOfPilots"]
 
@@ -26,6 +26,7 @@ def __init__(self):
         self.addMapping(
             {
                 "GridSite": {"type": "keyword"},
+                "ComputingElement": {"type": "keyword"},
                 "GridType": {"type": "keyword"},
                 "Status": {"type": "keyword"},
                 "VO": {"type": "keyword"},

src/DIRAC/WorkloadManagementSystem/DB/PilotAgentsDB.sql

@@ -73,11 +73,11 @@ CREATE TABLE `PilotOutput` (
 DROP TABLE IF EXISTS `PilotsHistorySummary`;
 CREATE TABLE `PilotsHistorySummary` (
   `GridSite` VARCHAR(128),
-  `DestinationSite` VARCHAR(128),
+  `ComputingElement` VARCHAR(128),
   `Status` VARCHAR(32),
   `VO` VARCHAR(64),
   `PilotCount` INT,
-  PRIMARY KEY (`GridSite`,`DestinationSite`,`Status`, `VO`)
+  PRIMARY KEY (`GridSite`,`ComputingElement`,`Status`, `VO`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
 
 
@@ -89,7 +89,7 @@ CREATE TRIGGER trg_PilotAgents_insert
 AFTER INSERT ON PilotAgents
 FOR EACH ROW
 BEGIN
-  INSERT INTO PilotsHistorySummary (GridSite, DestinationSite, Status, VO, PilotCount)
+  INSERT INTO PilotsHistorySummary (GridSite, ComputingElement, Status, VO, PilotCount)
   VALUES (NEW.GridSite, NEW.DestinationSite, NEW.Status, NEW.VO, 1)
   ON DUPLICATE KEY UPDATE PilotCount = PilotCount + 1;
 END;
@@ -102,15 +102,15 @@ BEGIN
   UPDATE PilotsHistorySummary
   SET PilotCount = PilotCount - 1
   WHERE GridSite = OLD.GridSite
-    AND DestinationSite = OLD.DestinationSite
+    AND ComputingElement = OLD.DestinationSite
     AND Status = OLD.Status
     AND VO = OLD.VO;
 
   -- Remove zero rows
   DELETE FROM PilotsHistorySummary
   WHERE PilotCount = 0
     AND GridSite = OLD.GridSite
-    AND DestinationSite = OLD.DestinationSite
+    AND ComputingElement = OLD.DestinationSite
     AND Status = OLD.Status
     AND VO = OLD.VO;
 END;
@@ -126,15 +126,15 @@ BEGIN
     UPDATE PilotsHistorySummary
     SET PilotCount = PilotCount - 1
     WHERE GridSite = OLD.GridSite
-      AND DestinationSite = OLD.DestinationSite
+      AND ComputingElement = OLD.DestinationSite
       AND Status = OLD.Status
       AND VO = OLD.VO;
 
     -- Delete row if count drops to zero
     DELETE FROM PilotsHistorySummary WHERE PilotCount = 0;
 
     -- Increase count for new status
-    INSERT INTO PilotsHistorySummary (GridSite, DestinationSite, Status, VO, PilotCount)
+    INSERT INTO PilotsHistorySummary (GridSite, ComputingElement, Status, VO, PilotCount)
     VALUES (NEW.GridSite, NEW.DestinationSite, NEW.Status, NEW.VO, 1)
     ON DUPLICATE KEY UPDATE PilotCount = PilotCount + 1;