Skip to content

[8.0] Use plain proxy for pilot bundle #7886

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

Merged
fstagni merged 1 commit into from
Nov 14, 2024
Merged

[8.0] Use plain proxy for pilot bundle #7886

Show file tree
Hide file tree
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
14 changes: 13 additions & 1 deletion src/DIRAC/WorkloadManagementSystem/Agent/SiteDirector.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,9 @@ def __init__(self, *args, **kwargs):
self.maxQueueLength = 86400 * 3
# Maximum number of times the Site Director is going to try to get a pilot output before stopping
self.maxRetryGetPilotOutput = 3
# Bundle proxy lifetime factor: Job bundled proxy lifetime will be this multiplied by the queue runtime length,
# should be high enough to accommodate the queuing time of the job.
self.bundleProxyLifetimeFactor = 1.5

self.pilotWaitingFlag = True
self.pilotLogLevel = "INFO"
Expand Down Expand Up @@ -734,7 +737,16 @@ def _submitPilotsToQueue(self, pilotsToSubmit, ce, queue):
jobExecDir = self.queueDict[queue]["ParametersDict"].get("JobExecDir", "")
envVariables = self.queueDict[queue]["ParametersDict"].get("EnvironmentVariables", None)

executable = self.getExecutable(queue, proxy=ce.proxy, jobExecDir=jobExecDir, envVariables=envVariables)
# We don't want to use the submission/"pilot" proxy for the job in the bundle:
# Instead we use a non-VOMS proxy which is then not limited in lifetime by the VOMS extension
proxyTimeSec = int(self.maxQueueLength * self.bundleProxyLifetimeFactor)
result = gProxyManager.downloadProxy(self.pilotDN, self.pilotGroup, limited=True, requiredTimeLeft=proxyTimeSec)
if not result["OK"]:
self.log.error("Failed to get job proxy", f"Queue {queue}:\n{result['Message']}")
return result
jobProxy = result["Value"]

executable = self.getExecutable(queue, proxy=jobProxy, jobExecDir=jobExecDir, envVariables=envVariables)

submitResult = ce.submitJob(executable, "", pilotsToSubmit)
# In case the CE does not need the executable after the submission, we delete it
Expand Down
7 changes: 7 additions & 0 deletions src/DIRAC/WorkloadManagementSystem/Agent/test/Test_Agent_SiteDirector.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,10 @@
mockPM.requestToken.return_value = {"OK": True, "Value": ("token", 1)}
mockPMReply = MagicMock()
mockPMReply.return_value = {"OK": True, "Value": ("token", 1)}
mockPMProxy = MagicMock()
mockPMProxy.dumpAllToString.return_value = {"OK": True, "Value": "fakeProxy"}
mockPMProxyReply = MagicMock()
mockPMProxyReply.return_value = {"OK": True, "Value": mockPMProxy}

mockCSGlobalReply = MagicMock()
mockCSGlobalReply.return_value = "TestSetup"
Expand All @@ -49,6 +53,9 @@ def sd(mocker):
mocker.patch(
"DIRAC.WorkloadManagementSystem.Agent.SiteDirector.gProxyManager.requestToken", side_effect=mockPMReply
)
mocker.patch(
"DIRAC.WorkloadManagementSystem.Agent.SiteDirector.gProxyManager.downloadProxy", side_effect=mockPMProxyReply
)
mocker.patch("DIRAC.WorkloadManagementSystem.Agent.SiteDirector.AgentModule", side_effect=mockAM)
sd = SiteDirector()
sd.log = gLogger
Expand Down