Skip to content

DPL: do not poll for configuration if there was none provided #5805

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
ktf merged 1 commit into from
Mar 30, 2021
Merged

DPL: do not poll for configuration if there was none provided #5805

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
16 changes: 15 additions & 1 deletion Framework/Core/src/runDataProcessing.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1734,6 +1734,19 @@ bool isOutputToPipe()
return ((s.st_mode & S_IFIFO) != 0);
}

bool isInputConfig()
{
struct stat s;
int r = fstat(STDIN_FILENO, &s);
// If stdin cannot be statted, we assume the shell is some sort of
// non-interactive container thing
if (r < 0) {
return false;
}
// If stdin is a pipe or a file, we try to fetch configuration from there
return ((s.st_mode & S_IFIFO) != 0 || (s.st_mode & S_IFREG) != 0);
}

void overrideCloning(ConfigContext& ctx, WorkflowSpec& workflow)
{
struct CloningSpec {
Expand Down Expand Up @@ -2085,7 +2098,8 @@ int doMain(int argc, char** argv, o2::framework::WorkflowSpec const& workflow,

std::vector<DataProcessorInfo> dataProcessorInfos;
CommandInfo commandInfo{};
if (isatty(STDIN_FILENO) == false) {

if (isatty(STDIN_FILENO) == false && isInputConfig()) {
std::vector<DataProcessorSpec> importedWorkflow;
WorkflowSerializationHelpers::import(std::cin, importedWorkflow, dataProcessorInfos, commandInfo);

Expand Down