Skip to content

Commit 0efa45e

Browse files
authored
Merge pull request #8132 from fstagni/90_set_status
[9.0] fix: properly set status and minorStatus
2 parents 385126f + c97eb34 commit 0efa45e

File tree

1 file changed

+10
-11
lines changed

1 file changed

+10
-11
lines changed

src/DIRAC/RequestManagementSystem/Client/ReqClient.py

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -6,26 +6,25 @@
66
77
"""
88

9+
import datetime
10+
import json
911
import os
10-
import time
1112
import random
12-
import json
13-
import datetime
13+
import time
1414
from functools import cached_property
1515

1616
# # from DIRAC
17-
from DIRAC import gLogger, S_OK, S_ERROR
18-
from DIRAC.Core.Utilities.List import randomize, fromChar
19-
from DIRAC.Core.Utilities.JEncode import strToIntDict
17+
from DIRAC import S_ERROR, S_OK, gLogger
18+
from DIRAC.ConfigurationSystem.Client import PathFinder
19+
from DIRAC.Core.Base.Client import Client, createClient
2020
from DIRAC.Core.Utilities.DEncode import ignoreEncodeWarning
21+
from DIRAC.Core.Utilities.JEncode import strToIntDict
22+
from DIRAC.Core.Utilities.List import fromChar, randomize
2123
from DIRAC.Core.Utilities.ObjectLoader import ObjectLoader
2224
from DIRAC.Core.Utilities.ReturnValues import returnValueOrRaise
23-
from DIRAC.ConfigurationSystem.Client import PathFinder
24-
from DIRAC.Core.Base.Client import Client, createClient
2525
from DIRAC.RequestManagementSystem.Client.Request import Request
2626
from DIRAC.RequestManagementSystem.private.RequestValidator import RequestValidator
27-
from DIRAC.WorkloadManagementSystem.Client import JobStatus
28-
from DIRAC.WorkloadManagementSystem.Client import JobMinorStatus
27+
from DIRAC.WorkloadManagementSystem.Client import JobMinorStatus, JobStatus
2928
from DIRAC.WorkloadManagementSystem.Client.JobMonitoringClient import JobMonitoringClient
3029
from DIRAC.WorkloadManagementSystem.Client.JobStateUpdateClient import JobStateUpdateClient
3130
from DIRAC.WorkloadManagementSystem.Utilities.JobStatusUtility import JobStatusUtility
@@ -718,7 +717,7 @@ def setJobStatus(self, jobID: int, newStatus: str, minorStatus: str, source: str
718717
int(jobID), status=newStatus, minorStatus=minorStatus, source=source
719718
)
720719
else:
721-
return self._client.setJobStatus(jobID, minorStatus, minorStatus, source)
720+
return self._client.setJobStatus(jobID, newStatus, minorStatus, source)
722721

723722
def setJobApplicationStatus(self, jobID: int, appStatus: str, source: str):
724723
if self._useCertificates:

0 commit comments

Comments
 (0)