Skip to content

Commit e1a32f7

Browse files
authored
DPL: enable new EoS by default and set data processing and exit transition timeouts (#14429)
* DPL: set data processing and exit transition timeouts by default to enable new EoS * adjust data processing and exit transition timeouts in O2Control test
1 parent 3c55949 commit e1a32f7

File tree

3 files changed

+14
-12
lines changed

3 files changed

+14
-12
lines changed

Framework/Core/src/O2ControlHelpers.cxx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -369,8 +369,8 @@ void dumpTask(std::ostream& dumpOut, const DeviceSpec& spec, const DeviceExecuti
369369
dumpOut << indLevel << "defaults:\n";
370370
dumpOut << indLevel << indScheme << "log_task_stdout: none\n";
371371
dumpOut << indLevel << indScheme << "log_task_stderr: none\n";
372-
std::string exitTransitionTimeout = "15"; // Allow 15 seconds to finish processing and calibrations
373-
std::string dataProcessingTimeout = "10"; // Allow only ten seconds to finish processing
372+
std::string exitTransitionTimeout = "25"; // Allow 25 seconds to finish processing and calibrations
373+
std::string dataProcessingTimeout = "20"; // Allow only 20 seconds to finish processing
374374
if (execution.args.size() > 2) {
375375
for (size_t i = 0; i < execution.args.size() - 1; ++i) {
376376
if (strcmp(execution.args[i], "--exit-transition-timeout") == 0) {

Framework/Core/src/runDataProcessing.cxx

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1033,10 +1033,12 @@ int doChild(int argc, char** argv, ServiceRegistry& serviceRegistry,
10331033
std::string defaultInfologgerMode = "";
10341034
o2::framework::DeploymentMode deploymentMode = o2::framework::DefaultsHelpers::deploymentMode();
10351035
if (deploymentMode == o2::framework::DeploymentMode::OnlineDDS) {
1036-
defaultExitTransitionTimeout = "20";
1036+
defaultExitTransitionTimeout = "40";
1037+
defaultDataProcessingTimeout = "20";
10371038
defaultInfologgerMode = "infoLoggerD";
10381039
} else if (deploymentMode == o2::framework::DeploymentMode::OnlineECS) {
1039-
defaultExitTransitionTimeout = "20";
1040+
defaultExitTransitionTimeout = "25";
1041+
defaultDataProcessingTimeout = "20";
10401042
}
10411043
boost::program_options::options_description optsDesc;
10421044
ConfigParamsHelper::populateBoostProgramOptions(optsDesc, spec.options, gHiddenDeviceOptions);

Framework/Core/test/test_FrameworkDataFlowToO2Control.cxx

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -138,8 +138,8 @@ const std::vector expectedTasks{
138138
defaults:
139139
log_task_stdout: none
140140
log_task_stderr: none
141-
exit_transition_timeout: 15
142-
data_processing_timeout: 10
141+
exit_transition_timeout: 25
142+
data_processing_timeout: 20
143143
_module_cmdline: >-
144144
source /etc/profile.d/modules.sh && MODULEPATH={{ modulepath }} module load O2 QualityControl Control-OCCPlugin &&
145145
{{ dpl_command }} | bcsadc/foo
@@ -236,8 +236,8 @@ const std::vector expectedTasks{
236236
defaults:
237237
log_task_stdout: none
238238
log_task_stderr: none
239-
exit_transition_timeout: 15
240-
data_processing_timeout: 10
239+
exit_transition_timeout: 25
240+
data_processing_timeout: 20
241241
_module_cmdline: >-
242242
source /etc/profile.d/modules.sh && MODULEPATH={{ modulepath }} module load O2 QualityControl Control-OCCPlugin &&
243243
{{ dpl_command }} | foo
@@ -336,8 +336,8 @@ const std::vector expectedTasks{
336336
defaults:
337337
log_task_stdout: none
338338
log_task_stderr: none
339-
exit_transition_timeout: 15
340-
data_processing_timeout: 10
339+
exit_transition_timeout: 25
340+
data_processing_timeout: 20
341341
_module_cmdline: >-
342342
source /etc/profile.d/modules.sh && MODULEPATH={{ modulepath }} module load O2 QualityControl Control-OCCPlugin &&
343343
{{ dpl_command }} | foo
@@ -436,8 +436,8 @@ const std::vector expectedTasks{
436436
defaults:
437437
log_task_stdout: none
438438
log_task_stderr: none
439-
exit_transition_timeout: 15
440-
data_processing_timeout: 10
439+
exit_transition_timeout: 25
440+
data_processing_timeout: 20
441441
_module_cmdline: >-
442442
source /etc/profile.d/modules.sh && MODULEPATH={{ modulepath }} module load O2 QualityControl Control-OCCPlugin &&
443443
{{ dpl_command }} | foo

0 commit comments

Comments
 (0)