Skip to content

DPL: enable new EoS by default and set data processing and exit transition timeouts #14429

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
ehellbar merged 2 commits into from
Jun 24, 2025
Merged

DPL: enable new EoS by default and set data processing and exit transition timeouts #14429

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
70af167
DPL: set data processing and exit transition timeouts by default to e…
ehellbar Jun 20, 2025
5a69e37
adjust data processing and exit transition timeouts in O2Control test
ehellbar Jun 23, 2025
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
4 changes: 2 additions & 2 deletions Framework/Core/src/O2ControlHelpers.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
6 changes: 4 additions & 2 deletions Framework/Core/src/runDataProcessing.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
16 changes: 8 additions & 8 deletions Framework/Core/test/test_FrameworkDataFlowToO2Control.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down