From 2aaea366b312495b0e6a4405458aecb004b9c95d Mon Sep 17 00:00:00 2001 From: Andrew McNab Date: Mon, 16 Dec 2024 11:10:29 +0000 Subject: [PATCH] Include MQL in first stage datasets --- agents/justin-wrapper-job | 3 +++ services/justin-wsgi-allocator | 3 +++ 2 files changed, 6 insertions(+) diff --git a/agents/justin-wrapper-job b/agents/justin-wrapper-job index 9e8c6fd..ae820af 100755 --- a/agents/justin-wrapper-job +++ b/agents/justin-wrapper-job @@ -1009,6 +1009,9 @@ for (fileName, fileSize, intPatternID, pattern) in outputFiles: } } + if stageID == 1: + datasetMetadata['dune.workflow']['mql'] = jobscriptDict['mql'] + # Find the destination for this pattern in the resultsResponseDict destination = resultsResponseDict['patterns'][strPatternID]['destination'] destinationNumber = \ diff --git a/services/justin-wsgi-allocator b/services/justin-wsgi-allocator index 8c1915e..8002fb7 100755 --- a/services/justin-wsgi-allocator +++ b/services/justin-wsgi-allocator @@ -293,6 +293,7 @@ def makeJobDict(jsonDict, jobscriptSecret = None): 'jobs.job_state,' 'jobs.jobscript_secret,' 'stages.max_distance,' + 'workflows.mql,' 'jobs.workflow_id,' 'jobs.stage_id,' 'jobs.justin_job_id,' @@ -357,6 +358,7 @@ def makeJobDict(jsonDict, jobscriptSecret = None): "job_state" : job['job_state'], "jobscript_secret" : job['jobscript_secret'], "max_distance" : job['max_distance'], + "mql" : job['mql'], "requested_processors" : job['requested_processors'], "requested_rss_bytes" : job['requested_rss_bytes'], "requested_wall_seconds" : job['requested_wall_seconds'], @@ -574,6 +576,7 @@ def makeJobscriptDict(jsonDict, jobDict): jobscriptDict['stage_id'] = jsonDict['stage_id'] jobscriptDict['scope'] = scopeName + jobscriptDict['mql'] = jobDict['mql'] jobscriptDict['requested_processors'] = jobDict['requested_processors'] jobscriptDict['requested_rss_bytes'] = jobDict['requested_rss_bytes'] jobscriptDict['requested_wall_seconds'] = jobDict['requested_wall_seconds']