Skip to content

Commit

Permalink
Merge pull request #384 from PanDAWMS/tania_dev
Browse files Browse the repository at this point in the history
task profile | remove merging from job final statuses list
  • Loading branch information
tkorchug authored Aug 30, 2024
2 parents 881c2e3 + c34e6f3 commit 2769268
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 3 deletions.
3 changes: 1 addition & 2 deletions core/constants.py
Original file line number Diff line number Diff line change
Expand Up @@ -57,8 +57,7 @@
'finished',
'failed',
'cancelled',
'closed',
'merging'
'closed'
)

EVENT_STATES = MappingProxyType({
Expand Down
2 changes: 1 addition & 1 deletion core/libs/job.py
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ def get_job_walltime(job):
endtime = parse_datetime(job['endtime']) if not isinstance(job['endtime'], datetime) else job['endtime']

if endtime is None:
if 'jobstatus' in job and job['jobstatus'] not in const.JOB_STATES_FINAL:
if 'jobstatus' in job and job['jobstatus'] not in (const.JOB_STATES_FINAL + ('merging',)):
# for active job take time up to now
endtime = datetime.now()
else:
Expand Down

0 comments on commit 2769268

Please sign in to comment.