feat: added foreign keys

Author: fstagni

src/DIRAC/WorkloadManagementSystem/DB/PilotAgentsDB.py

@@ -194,19 +194,13 @@ def deletePilots(self, pilotIDs, conn=False):
         if not isinstance(pilotIDs, list):
             return S_ERROR("Input argument is not a List")
 
-        failed = []
-
         result = self._escapeValues(pilotIDs)
         if not result["OK"]:
             return S_ERROR(f"Failed to remove pilot: {result['Value']}")
         stringIDs = ",".join(result["Value"])
-        for table in ["PilotOutput", "JobToPilotMapping", "PilotAgents"]:
-            result = self._update(f"DELETE FROM {table} WHERE PilotID in ({stringIDs})", conn=conn)
-            if not result["OK"]:
-                failed.append(table)
-
-        if failed:
-            return S_ERROR(f"Failed to remove pilot from {', '.join(failed)} tables")
+        result = self._update(f"DELETE FROM PilotAgents WHERE PilotID in ({stringIDs})", conn=conn)
+        if not result["OK"]:
+            return S_ERROR("Failed to remove pilots: ", result["Message"])
         return S_OK(pilotIDs)
 
     ##########################################################################################

src/DIRAC/WorkloadManagementSystem/DB/PilotAgentsDB.sql

@@ -55,14 +55,15 @@ CREATE TABLE `JobToPilotMapping` (
   `PilotID` INT(11) UNSIGNED NOT NULL,
   `JobID` INT(11) UNSIGNED NOT NULL,
   `StartTime` DATETIME NOT NULL,
-  KEY `JobID` (`JobID`),
-  KEY `PilotID` (`PilotID`)
+  PRIMARY KEY (`PilotID`, `JobID`),
+  FOREIGN KEY (`PilotID`) REFERENCES `PilotAgents`(`PilotID`) ON DELETE CASCADE
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
 
 DROP TABLE IF EXISTS `PilotOutput`;
 CREATE TABLE `PilotOutput` (
   `PilotID` INT(11) UNSIGNED NOT NULL,
   `StdOutput` MEDIUMTEXT,
   `StdError` MEDIUMTEXT,
-  PRIMARY KEY (`PilotID`)
+  PRIMARY KEY (`PilotID`),
+  FOREIGN KEY (`PilotID`) REFERENCES `PilotAgents`(`PilotID`) ON DELETE CASCADE
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;

src/DIRAC/WorkloadManagementSystem/DB/SandboxMetadataDB.py

@@ -1,5 +1,5 @@
-""" SandboxMetadataDB class is a front-end to the metadata for sandboxes
-"""
+"""SandboxMetadataDB class is a front-end to the metadata for sandboxes"""
+
 from DIRAC import S_ERROR, S_OK
 from DIRAC.ConfigurationSystem.Client.Helpers import Registry
 from DIRAC.Core.Base.DB import DB
@@ -61,10 +61,11 @@ def __initializeDB(self):
             "Fields": {
                 "SBId": "INTEGER(10) UNSIGNED NOT NULL",
                 "EntityId": "VARCHAR(128) NOT NULL",
-                "Type": "VARCHAR(64) NOT NULL",
+                "Type": "ENUM('Input', 'Output') NOT NULL",
             },
             "Indexes": {"Entity": ["EntityId"], "SBIndex": ["SBId"]},
             "PrimaryKey": ["SBId", "EntityId", "Type"],
+            "ForeignKeys": {"SBId": "sb_SandBoxes.SBId"},
         }
 
         for tableName in self.__tablesDesc:

tests/Integration/WorkloadManagementSystem/Test_SandboxMetadataDB.py

@@ -20,14 +20,15 @@ def test_SandboxMetadataDB():
 
     sbSE = "ProductionSandboxSE"
     sbPFN = "/sb/pfn/1.tar.bz2"
+    sbType = "Input"
 
     res = smDB.registerAndGetSandbox(owner, ownerGroup, VO, sbSE, sbPFN, 123)
     assert res["OK"], res["Message"]
     sbId, newSandbox = res["Value"]
     print(f"sbId:{sbId}")
     print(f"newSandbox:{newSandbox}")
 
-    assignTo = {owner: [(f"SB:{sbSE}|{sbPFN}", ownerGroup)]}
+    assignTo = {owner: [(f"SB:{sbSE}|{sbType}", ownerGroup)]}
     res = smDB.assignSandboxesToEntities(assignTo, owner, ownerGroup)
     assert res["OK"], res["Message"]
     assert res["Value"] == 1