Skip to content
Merged
Changes from all commits
Commits
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
10 changes: 7 additions & 3 deletions src/DIRAC/WorkloadManagementSystem/Client/JobStatus.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,8 @@
#:
STAGING = "Staging"
#:
SCOUTING = "Scouting"
#:
WAITING = "Waiting"
#:
MATCHED = "Matched"
Expand Down Expand Up @@ -49,6 +51,7 @@
SUBMITTING,
RECEIVED,
CHECKING,
SCOUTING,
STAGING,
WAITING,
MATCHED,
Expand Down Expand Up @@ -92,9 +95,10 @@ def __init__(self, state):
RESCHEDULED: State(6, [WAITING, RECEIVED, DELETED, FAILED], defState=RESCHEDULED),
MATCHED: State(5, [RUNNING, FAILED, RESCHEDULED, KILLED], defState=MATCHED),
WAITING: State(4, [MATCHED, RESCHEDULED, DELETED], defState=WAITING),
STAGING: State(3, [CHECKING, WAITING, FAILED, KILLED], defState=STAGING),
CHECKING: State(2, [STAGING, WAITING, RESCHEDULED, FAILED, DELETED], defState=CHECKING),
RECEIVED: State(1, [CHECKING, WAITING, FAILED, DELETED], defState=RECEIVED),
STAGING: State(3, [WAITING, FAILED, KILLED], defState=STAGING),

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@fstagni at least give people that still care about v7r3 a chance to review!
The CHECKING must not be dropped here
4d3e477

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

oops I missed that one!

@michmx can you create a new PR amending this (and correct #7121 ?)

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sorry for that, I copy-pasted from our own patch in the server! I will fix it ASAP.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks!

SCOUTING: State(2, [CHECKING, FAILED, STALLED, KILLED], defState=SCOUTING),
CHECKING: State(2, [SCOUTING, STAGING, WAITING, RESCHEDULED, FAILED, DELETED], defState=CHECKING),
RECEIVED: State(1, [SCOUTING, CHECKING, WAITING, FAILED, DELETED], defState=RECEIVED),
SUBMITTING: State(0, [RECEIVED, CHECKING, DELETED], defState=SUBMITTING), # initial state
}

Expand Down