Skip to content

Commit d10afe5

Browse files
authored
Merge pull request #8083 from aldbr/v8.0_FIX_condor-v24
[8.0] fix: condor and delegated proxies
2 parents 3206156 + 1f22ee4 commit d10afe5

1 file changed

Lines changed: 7 additions & 1 deletion

File tree

src/DIRAC/Resources/Computing/HTCondorCEComputingElement.py

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,9 @@ def __writeSub(self, executable, location, processors, pilotStamps, tokenFile=No
172172

173173
executable = os.path.join(self.workingDirectory, executable)
174174

175-
useCredentials = ""
175+
# For now, we still need to include a proxy in the submit file
176+
# HTCondor extracts VOMS attribute from it for the sites
177+
useCredentials = "use_x509userproxy = true"
176178
# If tokenFile is present, then we transfer it to the worker node
177179
if tokenFile:
178180
useCredentials += textwrap.dedent(
@@ -274,6 +276,10 @@ def _executeCondorCommand(self, cmd, keepTokenFile=False):
274276
htcEnv = {
275277
"_CONDOR_SEC_CLIENT_AUTHENTICATION_METHODS": "SCITOKENS",
276278
"_CONDOR_SCITOKENS_FILE": self.tokenFile.name,
279+
# This options is needed because we are still passing the proxy in the JDL (see use_x509userproxy)
280+
# In condor v24.4, there is a bug preventing us from delegating the proxy, so we have to set
281+
# it to false: https://opensciencegrid.atlassian.net/browse/HTCONDOR-2904
282+
"_CONDOR_DELEGATE_JOB_GSI_CREDENTIALS": "false",
277283
}
278284
if cas := getCAsLocation():
279285
htcEnv["_CONDOR_AUTH_SSL_CLIENT_CADIR"] = cas

0 commit comments

Comments
 (0)