Merge pull request #5933 from fstagni/80_fixes23

[8.0] removed last SubmitPool entries

Author: fstagni

src/DIRAC/Interfaces/API/Job.py

@@ -463,23 +463,6 @@ def setPlatform(self, platform):
 
         return S_OK()
 
-    #############################################################################
-    def setSubmitPool(self, backend):
-        """Developer function.
-
-        Choose submission pool on which job is executed.
-        Default in place for users.
-        """
-        # should add protection here for list of supported platforms
-        kwargs = {"backend": backend}
-        if not isinstance(backend, str):
-            return self._reportError("Expected string for SubmitPool", **kwargs)
-
-        if not backend.lower() == "any":
-            self._addParameter(self.workflow, "SubmitPools", "JDL", backend, "Submit Pool")
-
-        return S_OK()
-
     #############################################################################
     def setCPUTime(self, timeInSecs):
         """Helper function.

src/DIRAC/WorkloadManagementSystem/DB/TaskQueueDB.py

@@ -18,10 +18,10 @@
 
 # For checks at insertion time, and not only
 singleValueDefFields = ("OwnerDN", "OwnerGroup", "Setup", "CPUTime")
-multiValueDefFields = ("Sites", "GridCEs", "BannedSites", "Platforms", "SubmitPools", "JobTypes", "Tags")
+multiValueDefFields = ("Sites", "GridCEs", "BannedSites", "Platforms", "JobTypes", "Tags")
 
 # Used for matching
-multiValueMatchFields = ("GridCE", "Site", "Platform", "SubmitPool", "JobType", "Tag")
+multiValueMatchFields = ("GridCE", "Site", "Platform", "JobType", "Tag")
 bannedJobMatchFields = ("Site",)
 mandatoryMatchFields = ("Setup", "CPUTime")
 priorityIgnoredFields = ("Sites", "BannedSites")

src/DIRAC/WorkloadManagementSystem/Executor/JobScheduling.py

@@ -447,14 +447,12 @@ def __sendToTQ(self, jobState, jobManifest, sites, bannedSites, onlineSites=None
 
         # Job multivalue requirement keys are specified as singles in the job descriptions
         # but for backward compatibility can be also plurals
-        for key in ("SubmitPools", "SubmitPool", "JobType", "GridRequiredCEs", "GridCE", "Tags"):
+        for key in ("JobType", "GridRequiredCEs", "GridCE", "Tags"):
             reqKey = key
             if key == "JobType":
                 reqKey = "JobTypes"
             elif key == "GridRequiredCEs" or key == "GridCE":  # Remove obsolete GridRequiredCEs
                 reqKey = "GridCEs"
-            elif key == "SubmitPools" or key == "SubmitPool":  # Check: one of these 2 is obsolete
-                reqKey = "SubmitPools"
             if key in jobManifest:
                 reqCfg.setOption(reqKey, ", ".join(jobManifest.getOption(key, [])))
 

src/DIRAC/WorkloadManagementSystem/Utilities/QueueUtilities.py

@@ -181,7 +181,7 @@ def matchQueue(jobJDL, queueDict, fullMatch=False):
             return S_OK({"Match": False, "Reason": noMatchReasons[0]})
 
     # 2. Multi-value match requirements
-    for parameter in ["Site", "GridCE", "Platform", "SubmitPool", "JobType"]:
+    for parameter in ["Site", "GridCE", "Platform", "JobType"]:
         if parameter in queueDict:
             valueSet = set(job.getListFromExpression(parameter))
             if not valueSet:

src/DIRAC/WorkloadManagementSystem/scripts/dirac_admin_show_task_queues.py

@@ -65,7 +65,6 @@ def main():
             "OwnerGroup",
             "Sites",
             "Platforms",
-            "SubmitPools",
             "Priority",
         ]
         records = []