Skip to content

fix: cache SandboxMetadataDB instance instead of recreating per job #8457

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
aldbr merged 1 commit into from
Feb 16, 2026
Merged

fix: cache SandboxMetadataDB instance instead of recreating per job #8457

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
4 changes: 3 additions & 1 deletion src/DIRAC/WorkloadManagementSystem/Agent/JobCleaningAgent.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@ def __init__(self, *args, **kwargs):

# clients
self.jobDB = None
self.sandboxDB = None

self.maxJobsAtOnce = 500
self.prodTypes = []
Expand All @@ -66,6 +67,7 @@ def initialize(self):
"""Sets defaults"""

self.jobDB = JobDB()
self.sandboxDB = SandboxMetadataDB()

agentTSTypes = self.am_getOption("ProductionTypes", [])
if agentTSTypes:
Expand Down Expand Up @@ -156,7 +158,7 @@ def removeDeletedJobs(self):
self.log.info("Unassigning sandboxes from soon to be deleted jobs", f"({len(jobList)})")

entitiesList = [f"Job:{jobId}" for jobId in jobList]
if not (result := SandboxMetadataDB().unassignEntities(entitiesList))["OK"]:
if not (result := self.sandboxDB.unassignEntities(entitiesList))["OK"]:
self.log.error("Cannot unassign jobs to sandboxes", result["Message"])
return result

Expand Down
4 changes: 4 additions & 0 deletions src/DIRAC/WorkloadManagementSystem/Agent/test/Test_Agent_JobCleaningAgent.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,9 @@ def jca(mocker):
)
mocker.patch("DIRAC.WorkloadManagementSystem.Agent.JobCleaningAgent.JobDB.selectJobs", side_effect=mockReply)
mocker.patch("DIRAC.WorkloadManagementSystem.Agent.JobCleaningAgent.JobDB.__init__", side_effect=mockNone)
mocker.patch(
"DIRAC.WorkloadManagementSystem.Agent.JobCleaningAgent.SandboxMetadataDB.__init__", side_effect=mockNone
)
mocker.patch("DIRAC.WorkloadManagementSystem.Agent.JobCleaningAgent.ReqClient", return_value=mockNone)

jca = JobCleaningAgent()
Expand Down Expand Up @@ -126,6 +129,7 @@ def test_deleteJobOversizedSandbox(mocker, inputs, params, expected):
mocker.patch("DIRAC.WorkloadManagementSystem.Agent.JobCleaningAgent.AgentModule.__init__")
mocker.patch("DIRAC.WorkloadManagementSystem.Agent.JobCleaningAgent.AgentModule.am_getOption", return_value=mockAM)
mocker.patch("DIRAC.WorkloadManagementSystem.Agent.JobCleaningAgent.JobDB", return_value=mockNone)
mocker.patch("DIRAC.WorkloadManagementSystem.Agent.JobCleaningAgent.SandboxMetadataDB", return_value=mockNone)
mocker.patch("DIRAC.WorkloadManagementSystem.Agent.JobCleaningAgent.ReqClient", return_value=mockNone)
mocker.patch(
"DIRAC.WorkloadManagementSystem.Agent.JobCleaningAgent.getDNForUsername", return_value=S_OK(["/bih/boh/DN"])
Expand Down
3 changes: 2 additions & 1 deletion src/DIRAC/WorkloadManagementSystem/Executor/JobSanity.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ class JobSanity(OptimizerExecutor):
@classmethod
def initializeOptimizer(cls):
"""Initialize specific parameters for JobSanityAgent."""
cls.sandboxDB = SandboxMetadataDB()
return S_OK()

def optimizeJob(self, jid, jobState):
Expand Down Expand Up @@ -57,7 +58,7 @@ def checkInputSandbox(self, jobState, manifest):
return S_OK(0)
self.jobLog.info("Assigning sandboxes", f"({numSBsToAssign} on behalf of {ownerName}@{ownerGroup}@{vo})")
eId = f"Job:{jobState.jid}"
result = SandboxMetadataDB().assignSandboxesToEntities({eId: sbsToAssign}, ownerName, ownerGroup)
result = self.sandboxDB.assignSandboxesToEntities({eId: sbsToAssign}, ownerName, ownerGroup)
if not result["OK"]:
self.jobLog.error("Could not assign sandboxes in the SandboxStore")
return result
Expand Down
Loading