Skip to content

Fix of an environment problem affecting 2stage processing #2153

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sawenzel merged 1 commit into from
Oct 9, 2025
Merged

Fix of an environment problem affecting 2stage processing #2153

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
16 changes: 13 additions & 3 deletions MC/bin/o2_dpg_workflow_runner.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1029,6 +1029,12 @@ def __init__(self, workflowfile, args, jmax=100):
self.do_early_file_removal = True
self.file_removal_candidates = filegraph_expand_timeframes(filegraph_data, self.timeframeset, self.full_target_namelist)

def apply_global_env(self, environ_dict):
for e in self.globalinit['env']:
if environ_dict.get(e, None) == None:
value = self.globalinit['env'][e]
actionlogger.info("Applying global environment from init section " + str(e) + " : " + str(value))
environ_dict[e] = str(value)

def perform_early_file_removal(self, taskids):
"""
Expand Down Expand Up @@ -1259,9 +1265,13 @@ def submit(self, tid, nice):
if self.workflowspec['stages'][tid].get('env')!=None:
taskenv.update(self.workflowspec['stages'][tid]['env'])

# envfilename = "taskenv_" + str(tid) + ".json"
# with open(envfilename, "w") as file:
# json.dump(taskenv, file, indent=2)
# add global workflow environment
self.apply_global_env(taskenv)

if os.environ.get('PIPELINE_RUNNER_DUMP_TASKENVS') != None:
envfilename = "taskenv_" + str(tid) + ".log"
with open(envfilename, "w") as file:
json.dump(taskenv, file, indent=2)

p = psutil.Popen(['/bin/bash','-c',c], cwd=workdir, env=taskenv)
try:
Expand Down