Skip to content

Commit 7f9d0f6

Browse files
committed
fix: getting the ownerDN only when needed
1 parent 3f26305 commit 7f9d0f6

File tree

1 file changed

+7
-5
lines changed

1 file changed

+7
-5
lines changed

src/DIRAC/WorkloadManagementSystem/Service/JobManagerHandler.py

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,6 @@ def initializeRequest(self):
8383
self.maxParametricJobs = self.srv_getCSOption("MaxParametricJobs", MAX_PARAMETRIC_JOBS)
8484
self.jobPolicy = JobPolicy(self.owner, self.ownerGroup, self.userProperties)
8585
self.jobPolicy.jobDB = self.jobDB
86-
self.ownerDN = getDNForUsername(self.owner)["Value"][0]
8786
return S_OK()
8887

8988
def __sendJobsToOptimizationMind(self, jids):
@@ -126,6 +125,8 @@ def export_submitJob(self, jobDesc):
126125
:return: S_OK/S_ERROR, a list of newly created job IDs in case of S_OK.
127126
"""
128127

128+
ownerDN = getDNForUsername(self.owner)["Value"][0]
129+
129130
if self.peerUsesLimitedProxy:
130131
return S_ERROR(EWMSSUBM, "Can't submit using a limited proxy")
131132

@@ -188,7 +189,7 @@ def export_submitJob(self, jobDesc):
188189
JobDescriptionModel(
189190
**baseJobDescritionModel.dict(exclude_none=True),
190191
owner=self.owner,
191-
ownerDN=self.ownerDN,
192+
ownerDN=ownerDN,
192193
ownerGroup=self.ownerGroup,
193194
vo=getVOForGroup(self.ownerGroup),
194195
)
@@ -216,9 +217,9 @@ def export_submitJob(self, jobDesc):
216217
jobIDList.append(jobID)
217218

218219
# Set persistency flag
219-
retVal = gProxyManager.getUserPersistence(self.ownerDN, self.ownerGroup)
220+
retVal = gProxyManager.getUserPersistence(ownerDN, self.ownerGroup)
220221
if "Value" not in retVal or not retVal["Value"]:
221-
gProxyManager.setPersistency(self.ownerDN, self.ownerGroup, True)
222+
gProxyManager.setPersistency(ownerDN, self.ownerGroup, True)
222223

223224
if parametricJob:
224225
result = S_OK(jobIDList)
@@ -293,7 +294,8 @@ def __checkIfProxyUploadIsRequired(self):
293294
294295
:return: bool
295296
"""
296-
result = gProxyManager.userHasProxy(self.ownerDN, self.ownerGroup, validSeconds=18000)
297+
ownerDN = getDNForUsername(self.owner)["Value"][0]
298+
result = gProxyManager.userHasProxy(ownerDN, self.ownerGroup, validSeconds=18000)
297299
if not result["OK"]:
298300
self.log.error("Can't check if the user has proxy uploaded", result["Message"])
299301
return True

0 commit comments

Comments
 (0)