From 21de010ea31536a096debbd8af079100589bde22 Mon Sep 17 00:00:00 2001
From: Rafal Bielski <rafal.bielski@cern.ch>
Date: Fri, 21 Feb 2020 15:01:43 +0100
Subject: [PATCH] Run LogMergeStep only for steps which produce logs
---
.../python/TrigValSteering/CheckSteps.py | 15 +++++++++++++--
1 file changed, 13 insertions(+), 2 deletions(-)
diff --git a/Trigger/TrigValidation/TrigValTools/python/TrigValSteering/CheckSteps.py b/Trigger/TrigValidation/TrigValTools/python/TrigValSteering/CheckSteps.py
index 740a423ba22..d186e900c51 100644
--- a/Trigger/TrigValidation/TrigValTools/python/TrigValSteering/CheckSteps.py
+++ b/Trigger/TrigValidation/TrigValTools/python/TrigValSteering/CheckSteps.py
@@ -605,6 +605,15 @@ class MessageCountStep(Step):
return self.result, cmd
+def produces_log(step):
+ '''
+ Helper function checking whether a Step output_stream value
+ indicates that it will produce a log file
+ '''
+ return step.output_stream == Step.OutputStream.FILE_ONLY or \
+ step.output_stream == Step.OutputStream.FILE_AND_STDOUT
+
+
def default_check_steps(test):
'''
Create the default list of check steps for a test. The configuration
@@ -617,7 +626,7 @@ def default_check_steps(test):
# Log merging
if len(test.exec_steps) == 1:
exec_step = test.exec_steps[0]
- if exec_step.type == 'athenaHLT':
+ if exec_step.type == 'athenaHLT' and produces_log(exec_step):
logmerge = LogMergeStep()
logmerge.merged_name = 'athena.log'
logmerge.log_files = ['athenaHLT.log']
@@ -631,6 +640,8 @@ def default_check_steps(test):
logmerge.merged_name = 'athena.log'
logmerge.log_files = []
for exec_step in test.exec_steps:
+ if not produces_log(exec_step):
+ continue
logmerge.log_files.append(exec_step.get_log_file_name())
if exec_step.type == 'athenaHLT':
logmerge.extra_log_regex = 'athenaHLT:.*(.out|.err)'
@@ -647,7 +658,7 @@ def default_check_steps(test):
reco_tf_logmerge = LogMergeStep('LogMerge_Reco_tf')
reco_tf_logmerge.warn_if_missing = False
tf_names = ['HITtoRDO', 'RDOtoRDOTrigger', 'RAWtoESD', 'ESDtoAOD',
- 'PhysicsValidation', 'RAWtoALL', 'BSFTKCreator']
+ 'PhysicsValidation', 'RAWtoALL']
reco_tf_logmerge.log_files = ['log.'+tf_name for tf_name in tf_names]
reco_tf_logmerge.merged_name = 'athena.merged.log'
log_to_zip = reco_tf_logmerge.merged_name
--
GitLab