From 70af16724d1155da184e3066436dc23c4fb9090c Mon Sep 17 00:00:00 2001 From: Ernst Hellbar Date: Fri, 20 Jun 2025 14:27:45 +0200 Subject: [PATCH 1/2] DPL: set data processing and exit transition timeouts by default to enable new EoS --- Framework/Core/src/O2ControlHelpers.cxx | 4 ++-- Framework/Core/src/runDataProcessing.cxx | 6 ++++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/Framework/Core/src/O2ControlHelpers.cxx b/Framework/Core/src/O2ControlHelpers.cxx index 48d564e4ee4f0..273950e5047f0 100644 --- a/Framework/Core/src/O2ControlHelpers.cxx +++ b/Framework/Core/src/O2ControlHelpers.cxx @@ -369,8 +369,8 @@ void dumpTask(std::ostream& dumpOut, const DeviceSpec& spec, const DeviceExecuti dumpOut << indLevel << "defaults:\n"; dumpOut << indLevel << indScheme << "log_task_stdout: none\n"; dumpOut << indLevel << indScheme << "log_task_stderr: none\n"; - std::string exitTransitionTimeout = "15"; // Allow 15 seconds to finish processing and calibrations - std::string dataProcessingTimeout = "10"; // Allow only ten seconds to finish processing + std::string exitTransitionTimeout = "25"; // Allow 25 seconds to finish processing and calibrations + std::string dataProcessingTimeout = "20"; // Allow only 20 seconds to finish processing if (execution.args.size() > 2) { for (size_t i = 0; i < execution.args.size() - 1; ++i) { if (strcmp(execution.args[i], "--exit-transition-timeout") == 0) { diff --git a/Framework/Core/src/runDataProcessing.cxx b/Framework/Core/src/runDataProcessing.cxx index a7e80134a2cc0..f1111da79edd5 100644 --- a/Framework/Core/src/runDataProcessing.cxx +++ b/Framework/Core/src/runDataProcessing.cxx @@ -1033,10 +1033,12 @@ int doChild(int argc, char** argv, ServiceRegistry& serviceRegistry, std::string defaultInfologgerMode = ""; o2::framework::DeploymentMode deploymentMode = o2::framework::DefaultsHelpers::deploymentMode(); if (deploymentMode == o2::framework::DeploymentMode::OnlineDDS) { - defaultExitTransitionTimeout = "20"; + defaultExitTransitionTimeout = "40"; + defaultDataProcessingTimeout = "20"; defaultInfologgerMode = "infoLoggerD"; } else if (deploymentMode == o2::framework::DeploymentMode::OnlineECS) { - defaultExitTransitionTimeout = "20"; + defaultExitTransitionTimeout = "25"; + defaultDataProcessingTimeout = "20"; } boost::program_options::options_description optsDesc; ConfigParamsHelper::populateBoostProgramOptions(optsDesc, spec.options, gHiddenDeviceOptions); From 5a69e3769b2bf62eb96a14d14e84861acba7c24f Mon Sep 17 00:00:00 2001 From: Ernst Hellbar Date: Mon, 23 Jun 2025 13:35:51 +0200 Subject: [PATCH 2/2] adjust data processing and exit transition timeouts in O2Control test --- .../test/test_FrameworkDataFlowToO2Control.cxx | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/Framework/Core/test/test_FrameworkDataFlowToO2Control.cxx b/Framework/Core/test/test_FrameworkDataFlowToO2Control.cxx index 9cdbc357f9674..32dd0b5922a4f 100644 --- a/Framework/Core/test/test_FrameworkDataFlowToO2Control.cxx +++ b/Framework/Core/test/test_FrameworkDataFlowToO2Control.cxx @@ -138,8 +138,8 @@ const std::vector expectedTasks{ defaults: log_task_stdout: none log_task_stderr: none - exit_transition_timeout: 15 - data_processing_timeout: 10 + exit_transition_timeout: 25 + data_processing_timeout: 20 _module_cmdline: >- source /etc/profile.d/modules.sh && MODULEPATH={{ modulepath }} module load O2 QualityControl Control-OCCPlugin && {{ dpl_command }} | bcsadc/foo @@ -236,8 +236,8 @@ const std::vector expectedTasks{ defaults: log_task_stdout: none log_task_stderr: none - exit_transition_timeout: 15 - data_processing_timeout: 10 + exit_transition_timeout: 25 + data_processing_timeout: 20 _module_cmdline: >- source /etc/profile.d/modules.sh && MODULEPATH={{ modulepath }} module load O2 QualityControl Control-OCCPlugin && {{ dpl_command }} | foo @@ -336,8 +336,8 @@ const std::vector expectedTasks{ defaults: log_task_stdout: none log_task_stderr: none - exit_transition_timeout: 15 - data_processing_timeout: 10 + exit_transition_timeout: 25 + data_processing_timeout: 20 _module_cmdline: >- source /etc/profile.d/modules.sh && MODULEPATH={{ modulepath }} module load O2 QualityControl Control-OCCPlugin && {{ dpl_command }} | foo @@ -436,8 +436,8 @@ const std::vector expectedTasks{ defaults: log_task_stdout: none log_task_stderr: none - exit_transition_timeout: 15 - data_processing_timeout: 10 + exit_transition_timeout: 25 + data_processing_timeout: 20 _module_cmdline: >- source /etc/profile.d/modules.sh && MODULEPATH={{ modulepath }} module load O2 QualityControl Control-OCCPlugin && {{ dpl_command }} | foo