Skip to content
Snippets Groups Projects
Commit b0e44622 authored by Charlotte Hausman's avatar Charlotte Hausman Committed by Sam Kagan
Browse files

let's not run disabled capabilities...

parent 6107e0d3
No related branches found
No related tags found
No related merge requests found
......@@ -734,7 +734,7 @@ class CapabilityInfo:
COALESCE((SELECT in_state FROM queue_states WHERE c.capability_name = queue_states.capability_name AND queue_state = 'Queued'), 0) AS waiting,
COALESCE((SELECT in_state FROM queue_states WHERE c.capability_name = queue_states.capability_name AND queue_state = 'Running'), 0) AS running,
max_jobs
FROM capabilities c WHERE NOT c.paused"""
FROM capabilities c WHERE NOT c.paused AND c.enabled"""
)
):
result.append(QueueReport(row[0], row[1], row[2], row[3]))
......@@ -786,9 +786,11 @@ class RestrictedInfo(CapabilityInfo):
# Store the previous execution's spool directory for reusing bits of it
# Note: This is currently limited to capabilities that update the fetch stage
if (request.current_version.workflow_metadata
and "processing_dir" in request.current_version.workflow_metadata
and "fetch_end_time" in request.current_version.workflow_metadata):
if (
request.current_version.workflow_metadata
and "processing_dir" in request.current_version.workflow_metadata
and "fetch_end_time" in request.current_version.workflow_metadata
):
parameters["prev_processing_dir"] = request.current_version.workflow_metadata["processing_dir"]
version = CapabilityVersion(
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment