Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[8.0] fix: condor and delegated proxies #8083

Merged
merged 1 commit into from
Mar 7, 2025
Merged

[8.0] fix: condor and delegated proxies #8083

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion src/DIRAC/Resources/Computing/HTCondorCEComputingElement.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,9 @@ def __writeSub(self, executable, location, processors, pilotStamps, tokenFile=No

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

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