Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
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
4 changes: 2 additions & 2 deletions Framework/Core/src/O2ControlHelpers.cxx
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
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