Skip to content
Snippets Groups Projects

[master] Allow EndDate to override ForceActiveInput and fix dirac-production-request-run-local

Merged Chris Burr requested to merge cburr/LHCbDIRAC:ap-dev into master
2 files
+ 4
9
Compare changes
  • Side-by-side
  • Inline
Files
2
@@ -572,13 +572,6 @@ class ProductionStatusAgent(AgentModule):
f"{tID} ({prID}) as the input query has an end date",
)
continue
if "hasActiveInput" in tInfo:
self.log.info(
"hasActiveInput has been overridden for",
f"{tID} ({prID}) to be {tInfo['hasActiveInput']}",
)
tInfo["hasActiveInput"] = True
continue
for inputID in tInfo["inputIDs"]:
if inputID in summary["prods"]:
inputState = summary["prods"][inputID]["state"]
@@ -615,7 +608,9 @@ class ProductionStatusAgent(AgentModule):
return S_ERROR("Too dangerous to continue")
inputBkQuery = retVal["Value"]
tInfo["hasEndDate"] = "EndDate" in inputBkQuery
if inputBkQuery.get("ConfigVersion") in Operations().getValue("AnalysisProductions/ForceActiveInput", []):
if not tInfo["hasEndDate"] and inputBkQuery.get("ConfigVersion") in Operations().getValue(
"AnalysisProductions/ForceActiveInput", []
):
tInfo["hasActiveInput"] = True
if "ProductionID" in inputBkQuery:
tInfo["inputIDs"] = [inputBkQuery["ProductionID"]]
Loading