Merge pull request #8156 from fstagni/90_killPilotsList

fix: can kill a list of pilots

Author: chrisburr

src/DIRAC/Interfaces/API/DiracAdmin.py

@@ -449,8 +449,8 @@ def killPilot(self, gridReference):
         :param gridReference: Pilot Job Reference
         :return: S_OK,S_ERROR
         """
-        if not isinstance(gridReference, str):
-            return self._errorReport("Expected string for pilot reference")
+        if not isinstance(gridReference, (str, list)):
+            return self._errorReport("Expected string or list of strings for pilot reference")
 
         result = PilotManagerClient().killPilot(gridReference)
         return result

src/DIRAC/WorkloadManagementSystem/Service/PilotManagerHandler.py

@@ -339,16 +339,15 @@ def export_getPilots(cls, jobID):
     def export_killPilot(cls, pilotRefList):
         """Kill the specified pilots"""
         # Make a list if it is not yet
-        pilotRefs = list(pilotRefList)
         if isinstance(pilotRefList, str):
-            pilotRefs = [pilotRefList]
+            pilotRefList = [pilotRefList]
 
         # Regroup pilots per site
         pilotRefDict = {}
-        for pilotReference in pilotRefs:
+        for pilotReference in pilotRefList:
             result = cls.pilotAgentsDB.getPilotInfo(pilotReference)
             if not result["OK"] or not result["Value"]:
-                return S_ERROR("Failed to get info for pilot " + pilotReference)
+                return S_ERROR(f"Failed to get info for pilot {pilotReference}")
 
             pilotDict = result["Value"][pilotReference]
             queue = "@@@".join(