Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion Framework/Core/src/O2ControlHelpers.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -369,7 +369,7 @@ 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 = "25"; // Allow 25 seconds to finish processing and calibrations
std::string exitTransitionTimeout = "40"; // Allow 40 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) {
Expand Down
2 changes: 1 addition & 1 deletion Framework/Core/src/runDataProcessing.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -1038,7 +1038,7 @@ int doChild(int argc, char** argv, ServiceRegistry& serviceRegistry,
defaultDataProcessingTimeout = "20";
defaultInfologgerMode = "infoLoggerD";
} else if (deploymentMode == o2::framework::DeploymentMode::OnlineECS) {
defaultExitTransitionTimeout = "25";
defaultExitTransitionTimeout = "40";
defaultDataProcessingTimeout = "20";
}
boost::program_options::options_description optsDesc;
Expand Down
8 changes: 4 additions & 4 deletions Framework/Core/test/test_FrameworkDataFlowToO2Control.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ const std::vector expectedTasks{
defaults:
log_task_stdout: none
log_task_stderr: none
exit_transition_timeout: 25
exit_transition_timeout: 40
data_processing_timeout: 20
_module_cmdline: >-
source /etc/profile.d/modules.sh && MODULEPATH={{ modulepath }} module load O2 QualityControl Control-OCCPlugin &&
Expand Down Expand Up @@ -236,7 +236,7 @@ const std::vector expectedTasks{
defaults:
log_task_stdout: none
log_task_stderr: none
exit_transition_timeout: 25
exit_transition_timeout: 40
data_processing_timeout: 20
_module_cmdline: >-
source /etc/profile.d/modules.sh && MODULEPATH={{ modulepath }} module load O2 QualityControl Control-OCCPlugin &&
Expand Down Expand Up @@ -336,7 +336,7 @@ const std::vector expectedTasks{
defaults:
log_task_stdout: none
log_task_stderr: none
exit_transition_timeout: 25
exit_transition_timeout: 40
data_processing_timeout: 20
_module_cmdline: >-
source /etc/profile.d/modules.sh && MODULEPATH={{ modulepath }} module load O2 QualityControl Control-OCCPlugin &&
Expand Down Expand Up @@ -436,7 +436,7 @@ const std::vector expectedTasks{
defaults:
log_task_stdout: none
log_task_stderr: none
exit_transition_timeout: 25
exit_transition_timeout: 40
data_processing_timeout: 20
_module_cmdline: >-
source /etc/profile.d/modules.sh && MODULEPATH={{ modulepath }} module load O2 QualityControl Control-OCCPlugin &&
Expand Down