Skip to content

fix: move setCredentials back to its original location in SD #8512

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

Open
aldbr wants to merge 1 commit into
base: integration
Choose a base branch
from
+9 −7
Open

fix: move setCredentials back to its original location in SD #8512

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
16 changes: 9 additions & 7 deletions src/DIRAC/WorkloadManagementSystem/Agent/SiteDirector.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -302,6 +302,15 @@ def _submitPilotsPerQueue(self, queueName: str):
self.failedQueues[queueName] += 1
return S_OK(0)

# Get CE instance
ce = self.queueDict[queueName]["CE"]

# Set credentials: needed for authenticated CE operations (e.g. ce.available() on AREX)
result = self._setCredentials(ce, 3600)
if not result["OK"]:
self.log.error("Failed to set credentials:", result["Message"])
return result

# Get the number of available slots on the target site/queue
totalSlots, waitingPilots = self._getQueueSlots(queueName)
if totalSlots <= 0:
Expand All @@ -322,7 +331,6 @@ def _submitPilotsPerQueue(self, queueName: str):
)

# Now really submitting
ce = self.queueDict[queueName]["CE"]
result = self._submitPilotsToQueue(pilotsToSubmit, ce, queueName)
if not result["OK"]:
self.log.info("Failed pilot submission", f"Queue: {queueName}")
Expand Down Expand Up @@ -439,12 +447,6 @@ def _submitPilotsToQueue(self, pilotsToSubmit: int, ce: ComputingElement, queue:
jobProxy = result["Value"]
executable = self._getExecutable(queue, proxy=jobProxy, jobExecDir=jobExecDir, envVariables=envVariables)

# Add the credentials to the CE
result = self._setCredentials(ce, 3600)
if not result["OK"]:
self.log.error("Failed to set credentials:", result["Message"])
return result

# Submit the job
submitResult = ce.submitJob(executable, "", pilotsToSubmit)
# In case the CE does not need the executable after the submission, we delete it
Expand Down
Loading