feat: removed SandboxStore.unassignEntities

Author: fstagni

src/DIRAC/WorkloadManagementSystem/Agent/JobCleaningAgent.py

@@ -36,9 +36,9 @@
 from DIRAC.RequestManagementSystem.Client.Request import Request
 from DIRAC.WorkloadManagementSystem.Client import JobStatus
 from DIRAC.WorkloadManagementSystem.Client.JobMonitoringClient import JobMonitoringClient
-from DIRAC.WorkloadManagementSystem.Client.SandboxStoreClient import SandboxStoreClient
 from DIRAC.WorkloadManagementSystem.Client.WMSClient import WMSClient
 from DIRAC.WorkloadManagementSystem.DB.JobDB import JobDB
+from DIRAC.WorkloadManagementSystem.DB.SandboxMetadataDB import SandboxMetadataDB
 
 
 class JobCleaningAgent(AgentModule):
@@ -152,10 +152,12 @@ def removeDeletedJobs(self):
             return S_OK()
 
         self.log.info("Unassigning sandboxes from soon to be deleted jobs", f"({len(jobList)})")
-        result = SandboxStoreClient(useCertificates=True).unassignJobs(jobList)
-        if not result["OK"]:
-            self.log.error("Cannot unassign jobs to sandboxes", result["Message"])
-            return result
+
+        entitiesList = [f"Job:{jobId}" for jobId in jobList]
+        res = SandboxMetadataDB().unassignEntities(entitiesList)
+        if not res["OK"]:
+            self.log.error("Cannot unassign jobs to sandboxes", res["Message"])
+            return res
 
         self.log.info("Attempting to remove deleted jobs", f"({len(jobList)})")
 

src/DIRAC/WorkloadManagementSystem/Client/SandboxStoreClient.py

@@ -241,15 +241,6 @@ def assignSandboxesToJob(self, jobId, sbList, ownerName="", ownerGroup=""):
             return SandboxStoreClient.__smdb.assignSandboxesToEntities({eId: sbList}, ownerName, ownerGroup)
         return self.__getRPCClient().assignSandboxesToEntities({eId: sbList}, ownerName, ownerGroup)
 
-    def unassignJobs(self, jobIdList):
-        """Unassign SB to a job"""
-        if isinstance(jobIdList, int):
-            jobIdList = [jobIdList]
-        entitiesList = []
-        for jobId in jobIdList:
-            entitiesList.append(f"Job:{jobId}")
-        return self.__getRPCClient().unassignEntities(entitiesList)
-
     def downloadSandboxForJob(self, jobId, sbType, destinationPath="", inMemory=False, unpack=True):
         """Download SB for a job"""
         result = self.__getRPCClient().getSandboxesAssignedToEntity(f"Job:{jobId}")

src/DIRAC/WorkloadManagementSystem/DB/SandboxMetadataDB.py

@@ -220,48 +220,22 @@ def assignSandboxesToEntities(self, enDict, requesterName, requesterGroup, owner
             return result
         return S_OK(assigned)
 
-    def __entitiesByRequesterCond(self, requesterName, requesterGroup):
-        sqlCond = []
-        requesterProps = Registry.getPropertiesForEntity(requesterGroup, name=requesterName)
-        if Properties.JOB_ADMINISTRATOR in requesterProps:
-            # Do nothing, just ensure it doesn't fit in the other cases
-            pass
-        elif Properties.JOB_SHARING in requesterProps:
-            sqlCond.append(f"o.OwnerGroup='{requesterGroup}'")
-        elif Properties.NORMAL_USER in requesterProps:
-            sqlCond.append(f"o.OwnerGroup='{requesterGroup}'")
-            sqlCond.append(f"o.Owner='{requesterName}'")
-        else:
-            return S_ERROR("Not authorized to access sandbox")
-        return sqlCond
-
     @convertToReturnValue
-    def unassignEntities(self, entities, requesterName, requesterGroup):
+    def unassignEntities(self, entities: list):
         """
-        Unassign jobs to sandboxes
+        Unassign entities to sandboxes. Entities are a list of strings, e.g. ['job:1234', 'job:5678'].
 
         :param list entities: list of entities to unassign
         """
         if not entities:
             return None
-        conds = self.__entitiesByRequesterCond(requesterName, requesterGroup)
 
         sqlCmd = "CREATE TEMPORARY TABLE to_delete_EntityId (EntityId VARCHAR(128) NOT NULL, PRIMARY KEY (EntityId)) ENGINE=MEMORY;"
         returnValueOrRaise(self._update(sqlCmd))
         try:
             sqlCmd = "INSERT INTO to_delete_EntityId (EntityId) VALUES ( %s )"
             returnValueOrRaise(self._updatemany(sqlCmd, [(e,) for e in entities]))
             sqlCmd = "DELETE m from `sb_EntityMapping` m JOIN to_delete_EntityId t USING (EntityId)"
-            if conds:
-                sqlCmd = " ".join(
-                    [
-                        sqlCmd,
-                        "JOIN `sb_SandBoxes` s ON s.SBId = m.SBId",
-                        "JOIN `sb_Owners` o ON s.OwnerId = o.OwnerId",
-                        "WHERE",
-                        " AND ".join(conds),
-                    ]
-                )
             returnValueOrRaise(self._update(sqlCmd))
         finally:
             sqlCmd = "DROP TEMPORARY TABLE to_delete_EntityId"

src/DIRAC/WorkloadManagementSystem/Service/SandboxStoreHandler.py

@@ -343,18 +343,6 @@ def export_assignSandboxesToEntities(self, enDict, ownerName="", ownerGroup=""):
             enDict, credDict["username"], credDict["group"], ownerName, ownerGroup
         )
 
-    ##################
-    # Unassign sbs to jobs
-
-    types_unassignEntities = [(list, tuple)]
-
-    def export_unassignEntities(self, entitiesList):
-        """
-        Unassign a list of jobs
-        """
-        credDict = self.getRemoteCredentials()
-        return self.sandboxDB.unassignEntities(entitiesList, credDict["username"], credDict["group"])
-
     ##################
     # Getting assigned sandboxes
 

tests/Integration/WorkloadManagementSystem/Test_SandboxStoreClient.py

@@ -38,26 +38,15 @@
 from DIRAC.tests.Utilities.utils import find_all
 from DIRAC.WorkloadManagementSystem.Client.SandboxStoreClient import SandboxStoreClient
 
-
 gLogger.setLevel("DEBUG")
 
 
 def test_SSCChain():
     """full test of functionalities"""
     ssc = SandboxStoreClient()
 
-    jobId = 1
-
     exeScriptLocation = find_all("exe-script.py", "../..", "/DIRAC/tests/Integration")[0]
     fileList = [exeScriptLocation]
 
     res = ssc.uploadFilesAsSandbox(fileList)
     assert res["OK"], res["Message"]
-
-    # TODO : FIXME
-    # res = ssc.downloadSandboxForJob(jobId, "Input")  # to run this we need the RSS on
-    # print(res)  # for debug...
-    # assert res["OK"], res["Message"]
-
-    res = ssc.unassignJobs([jobId])
-    assert res["OK"], res["Message"]