Skip to content

Commit dd8bcb8

Browse files
committed
fix: removed JobManager.getMaxParametricJobs RPC
1 parent 0704d74 commit dd8bcb8

File tree

2 files changed

+10
-23
lines changed

2 files changed

+10
-23
lines changed

src/DIRAC/TransformationSystem/Agent/TaskManagerAgentBase.py

Lines changed: 10 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -7,21 +7,20 @@
77
In case you want to further extend it you are required to follow the note on the
88
initialize method and on the _getClients method.
99
"""
10-
import time
11-
import datetime
1210
import concurrent.futures
11+
import datetime
12+
import time
1313

14-
from DIRAC import S_OK
15-
14+
from DIRAC import S_OK, gConfig
15+
from DIRAC.ConfigurationSystem.Client.Helpers.Operations import Operations
1616
from DIRAC.Core.Base.AgentModule import AgentModule
1717
from DIRAC.Core.Security.ProxyInfo import getProxyInfo
18-
from DIRAC.Core.Utilities.List import breakListIntoChunks
1918
from DIRAC.Core.Utilities.Dictionaries import breakDictionaryIntoChunks
20-
from DIRAC.ConfigurationSystem.Client.Helpers.Operations import Operations
19+
from DIRAC.Core.Utilities.List import breakListIntoChunks
20+
from DIRAC.TransformationSystem.Agent.TransformationAgentsUtilities import TransformationAgentsUtilities
2121
from DIRAC.TransformationSystem.Client.FileReport import FileReport
22-
from DIRAC.TransformationSystem.Client.WorkflowTasks import WorkflowTasks
2322
from DIRAC.TransformationSystem.Client.TransformationClient import TransformationClient
24-
from DIRAC.TransformationSystem.Agent.TransformationAgentsUtilities import TransformationAgentsUtilities
23+
from DIRAC.TransformationSystem.Client.WorkflowTasks import WorkflowTasks
2524
from DIRAC.WorkloadManagementSystem.Client import JobStatus
2625
from DIRAC.WorkloadManagementSystem.Client.JobManagerClient import JobManagerClient
2726

@@ -193,11 +192,9 @@ def execute(self):
193192
else:
194193
# Get the transformations which should be submitted
195194
self.tasksPerLoop = self.am_getOption("TasksPerLoop", self.tasksPerLoop)
196-
res = self.jobManagerClient.getMaxParametricJobs()
197-
if not res["OK"]:
198-
self.log.warn("Could not get the maxParametricJobs from JobManager", res["Message"])
199-
else:
200-
self.maxParametricJobs = res["Value"]
195+
self.maxParametricJobs = gConfig.getValue(
196+
"/Systems/WorkloadManagement/Services/JobManager/MaxParametricJobs", self.maxParametricJobs
197+
)
201198

202199
self._addOperationForTransformations(
203200
self.operationsOnTransformationDict,

src/DIRAC/WorkloadManagementSystem/Service/JobManagerHandler.py

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -105,16 +105,6 @@ def __sendJobsToOptimizationMind(self, jids):
105105
return
106106
self.log.info("Optimize msg sent", f"for {len(jids)} jobs")
107107

108-
###########################################################################
109-
types_getMaxParametricJobs = []
110-
111-
def export_getMaxParametricJobs(self):
112-
"""Get the maximum number of parametric jobs
113-
114-
:return: S_OK()/S_ERROR()
115-
"""
116-
return S_OK(self.maxParametricJobs)
117-
118108
types_submitJob = [str]
119109

120110
def export_submitJob(self, jobDesc):

0 commit comments

Comments
 (0)