Skip to content

Commit 3cce21c

Browse files
aldbrweb-flow
authored andcommitted
sweep: #8083 fix: condor and delegated proxies
1 parent d0535e1 commit 3cce21c

File tree

1 file changed

+7
-1
lines changed

1 file changed

+7
-1
lines changed

src/DIRAC/Resources/Computing/HTCondorCEComputingElement.py

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

171171
executable = os.path.join(self.workingDirectory, executable)
172172

173-
useCredentials = ""
173+
# For now, we still need to include a proxy in the submit file
174+
# HTCondor extracts VOMS attribute from it for the sites
175+
useCredentials = "use_x509userproxy = true"
174176
# If tokenFile is present, then we transfer it to the worker node
175177
if tokenFile:
176178
useCredentials += textwrap.dedent(
@@ -271,6 +273,10 @@ def _executeCondorCommand(self, cmd, keepTokenFile=False):
271273
htcEnv = {
272274
"_CONDOR_SEC_CLIENT_AUTHENTICATION_METHODS": "SCITOKENS",
273275
"_CONDOR_SCITOKENS_FILE": self.tokenFile.name,
276+
# This options is needed because we are still passing the proxy in the JDL (see use_x509userproxy)
277+
# In condor v24.4, there is a bug preventing us from delegating the proxy, so we have to set
278+
# it to false: https://opensciencegrid.atlassian.net/browse/HTCONDOR-2904
279+
"_CONDOR_DELEGATE_JOB_GSI_CREDENTIALS": "false",
274280
}
275281
if cas := getCAsLocation():
276282
htcEnv["_CONDOR_AUTH_SSL_CLIENT_CADIR"] = cas

0 commit comments

Comments
 (0)