Merge pull request #7213 from aldbr/v8.1_REMOVE_owner-dn-refs-in-site…

…director [8.1] hackathon fixes
DIRACGrid · Sep 25, 2023 · 4a3efe8 · 4a3efe8
2 parents a83d5bf + aa2b2b6
commit 4a3efe8
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 12 deletions.
diff --git a/src/DIRAC/WorkloadManagementSystem/Agent/JobAgent.py b/src/DIRAC/WorkloadManagementSystem/Agent/JobAgent.py
@@ -254,7 +254,7 @@ def execute(self):
                 )
 
         self.jobReport.setJobStatus(minorStatus="Job Received by Agent", sendFlag=False)
-        ownerDN = getDNForUsername(owner)["Value"]
+        ownerDN = getDNForUsername(owner)["Value"][0]
         result_setupProxy = self._setupProxy(ownerDN, jobGroup)
         if not result_setupProxy["OK"]:
             result = self._rescheduleFailedJob(jobID, result_setupProxy["Message"])

diff --git a/src/DIRAC/WorkloadManagementSystem/Agent/PilotStatusAgent.py b/src/DIRAC/WorkloadManagementSystem/Agent/PilotStatusAgent.py
@@ -190,16 +190,7 @@ def _addPilotsAccountingReport(self, pilotsData):
             pA = PilotAccounting()
             pA.setEndTime(pData["LastUpdateTime"])
             pA.setStartTime(pData["SubmissionTime"])
-            retVal = Registry.getUsernameForDN(pData["OwnerDN"])
-            if not retVal["OK"]:
-                userName = "unknown"
-                self.log.error(
-                    "Can't determine username for dn",
-                    f": {pData['OwnerDN']} : {retVal['Message']}",
-                )
-            else:
-                userName = retVal["Value"]
-            pA.setValueByKey("User", userName)
+            pA.setValueByKey("User", "unknown")
             pA.setValueByKey("UserGroup", pData["OwnerGroup"])
             result = getCESiteMapping(pData["DestinationSite"])
             if result["OK"] and pData["DestinationSite"] in result["Value"]:

diff --git a/src/DIRAC/WorkloadManagementSystem/Agent/SiteDirector.py b/src/DIRAC/WorkloadManagementSystem/Agent/SiteDirector.py
@@ -1338,7 +1338,7 @@ def sendPilotAccounting(self, pilotDict):
             pA = PilotAccounting()
             pA.setEndTime(pilotDict[pRef]["LastUpdateTime"])
             pA.setStartTime(pilotDict[pRef]["SubmissionTime"])
-            retVal = Registry.getUsernameForDN(pilotDict[pRef]["OwnerDN"])
+            retVal = Registry.getUsernameForDN(self.pilotDN)
             if not retVal["OK"]:
                 username = "unknown"
                 self.log.error("Can't determine username for dn", pilotDict[pRef]["OwnerDN"])