Merge pull request #7179 from fstagni/81_fixes14

[8.1] hackathon fixes
DIRACGrid · Aug 29, 2023 · ed56d47 · ed56d47
2 parents 538ad38 + 0b4d508
commit ed56d47
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 7 deletions.
diff --git a/src/DIRAC/WorkloadManagementSystem/Agent/SiteDirector.py b/src/DIRAC/WorkloadManagementSystem/Agent/SiteDirector.py
@@ -842,7 +842,6 @@ def _addPilotTQReference(self, queue, taskQueueDict, pilotList, stampDict):
                 pilotsList,
                 tqID,
                 self.pilotGroup,
-                self.localhost,
                 self.queueDict[queue]["CEType"],
                 stampDict,
             )

diff --git a/src/DIRAC/WorkloadManagementSystem/Service/PilotManagerHandler.py b/src/DIRAC/WorkloadManagementSystem/Service/PilotManagerHandler.py
@@ -79,7 +79,7 @@ def export_addPilotTQReference(
     ):
         """Add a new pilot job reference"""
 
-        return cls.pilotAgentsDB.addPilotTQReference(pilotRef, taskQueueID, gridType, pilotStampDict)
+        return cls.pilotAgentsDB.addPilotTQReference(pilotRef, taskQueueID, ownerGroup, gridType, pilotStampDict)
 
     types_addPilotTQRef = [list, int, str]
 

diff --git a/src/DIRAC/WorkloadManagementSystem/Service/WMSUtilities.py b/src/DIRAC/WorkloadManagementSystem/Service/WMSUtilities.py
@@ -1,23 +1,22 @@
 """ A set of utilities used in the WMS services
     Requires the Nordugrid ARC plugins. In particular : nordugrid-arc-python
 """
-from tempfile import mkdtemp
 import shutil
+from tempfile import mkdtemp
 
-from DIRAC import S_OK, S_ERROR, gLogger, gConfig
-from DIRAC.ConfigurationSystem.Client.Helpers.Resources import getQueue
+from DIRAC import S_ERROR, S_OK, gConfig, gLogger
+from DIRAC.ConfigurationSystem.Client.Helpers.Operations import Operations
 from DIRAC.ConfigurationSystem.Client.Helpers.Registry import (
     getDNForUsername,
     getGroupOption,
     getVOForGroup,
 )
-from DIRAC.ConfigurationSystem.Client.Helpers.Operations import Operations
+from DIRAC.ConfigurationSystem.Client.Helpers.Resources import getQueue
 from DIRAC.FrameworkSystem.Client.ProxyManagerClient import gProxyManager
 from DIRAC.FrameworkSystem.Client.TokenManagerClient import gTokenManager
 from DIRAC.Resources.Computing.ComputingElementFactory import ComputingElementFactory
 from DIRAC.WorkloadManagementSystem.Client.PilotScopes import PILOT_SCOPES
 
-
 # List of files to be inserted/retrieved into/from pilot Output Sandbox
 # first will be defined as StdOut in JDL and the second as StdErr
 outputSandboxFiles = ["StdOut", "StdErr"]