Skip to content

Commit 33c01bc

Browse files
committed
fix: StalledJobAgent talks directly to PilotAgentsDB
1 parent a96df0d commit 33c01bc

File tree

2 files changed

+3
-4
lines changed

2 files changed

+3
-4
lines changed

src/DIRAC/WorkloadManagementSystem/Agent/StalledJobAgent.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -518,8 +518,7 @@ def _checkLoggingInfo(self, jobID, jobDict):
518518
return startTime, endTime
519519

520520
def _kickStuckJobs(self):
521-
"""Reschedule jobs stuck in initialization status Rescheduled,
522-
Matched."""
521+
"""Reschedule jobs stuck in initialization status Rescheduled, Matched."""
523522

524523
message = ""
525524

@@ -550,7 +549,7 @@ def _kickStuckJobs(self):
550549

551550
jobIDs = result["Value"]
552551
if jobIDs:
553-
self.log.info(f"Rescheduling {len(jobIDs)} jobs stuck in Rescheduled status")
552+
self.log.info(f"Rescheduling {len(jobIDs)} jobs stuck in {JobStatus.RESCHEDULED} status")
554553
result = jobManagerClient.rescheduleJob(jobIDs)
555554
if not result["OK"]:
556555
message = f"Failed to reschedule jobs stuck in {JobStatus.RESCHEDULED} status"

src/DIRAC/WorkloadManagementSystem/Service/JobMonitoringHandler.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -276,7 +276,7 @@ def export_getJobParameters(self, jobIDs, parName=None):
276276
return res
277277
parameters = res["Value"]
278278
else: # a service is connecting, no proxy, e.g. StalledJobAgent
279-
q = "SELECT JobID, VO FROM Jobs WHERE JobID IN (%s)" % ",".join([str(jobID) for jobID in jobIDs])
279+
q = f"SELECT JobID, VO FROM Jobs WHERE JobID IN ({','.join([str(jobID) for jobID in jobIDs])})"
280280
res = self.jobDB._query(q)
281281
if not res["OK"]:
282282
return res

0 commit comments

Comments
 (0)