Skip to content

Cycle must be 10 seconds minimum #937

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
Barthelemy merged 3 commits into from
Nov 4, 2021
Merged

Cycle must be 10 seconds minimum #937

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ef6b12a
Cycle must be 10 seconds minimum
Barthelemy Nov 2, 2021
1270107
Move validation to TaskRunnerFactory
Barthelemy Nov 3, 2021
c6bbad5
format
Barthelemy Nov 3, 2021
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/basic.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
"className": "o2::quality_control_modules::skeleton::SkeletonTask",
"moduleName": "QcSkeleton",
"detectorName": "TST",
"cycleDurationSeconds": "10",
"cycleDurationSeconds": "10", "": "10 seconds minimum",
"maxNumberCycles": "-1",
"": "The other type of dataSource is \"direct\", see basic-no-sampling.json.",
"dataSource": {
Expand Down
1 change: 0 additions & 1 deletion Framework/src/InfrastructureSpecReader.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,6 @@ TaskSpec InfrastructureSpecReader::readSpecEntry<TaskSpec>(std::string taskName,
ts.detectorName = taskTree.get<std::string>("detectorName");
ts.cycleDurationSeconds = taskTree.get<int>("cycleDurationSeconds");
ts.dataSource = readSpecEntry<DataSourceSpec>("", taskTree.get_child("dataSource"), wholeTree);

ts.active = taskTree.get<bool>("active", ts.active);
ts.maxNumberCycles = taskTree.get<int>("maxNumberCycles", ts.maxNumberCycles);
ts.resetAfterCycles = taskTree.get<size_t>("resetAfterCycles", ts.resetAfterCycles);
Expand Down
7 changes: 6 additions & 1 deletion Framework/src/TaskRunnerFactory.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,11 @@ TaskRunnerConfig TaskRunnerFactory::extractConfig(const CommonSpec& globalConfig
if (!taskSpec.dataSource.isOneOf(DataSourceType::DataSamplingPolicy, DataSourceType::Direct)) {
throw std::runtime_error("This data source of the task '" + taskSpec.taskName + "' is not supported.");
}
auto cycleDurationSeconds = taskSpec.cycleDurationSeconds;
if (cycleDurationSeconds < 10) {
ILOG(Error, Support) << "Cycle duration is too short (" << cycleDurationSeconds << "), replaced by a duration of 10 seconds." << ENDM;
cycleDurationSeconds = 10;
}
auto inputs = taskSpec.dataSource.inputs;
inputs.emplace_back("timer-cycle",
TaskRunner::createTaskDataOrigin(),
Expand All @@ -76,7 +81,7 @@ TaskRunnerConfig TaskRunnerFactory::extractConfig(const CommonSpec& globalConfig
taskSpec.taskName,
taskSpec.moduleName,
taskSpec.className,
taskSpec.cycleDurationSeconds,
cycleDurationSeconds,
taskSpec.maxNumberCycles,
globalConfig.consulUrl,
globalConfig.conditionDBUrl,
Expand Down
2 changes: 1 addition & 1 deletion doc/Advanced.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -806,7 +806,7 @@ the "tasks" path.
"className": "namespace::of::Task", "": "Class name of the QC Task with full namespace.",
"moduleName": "QcSkeleton", "": "Library name. It can be found in CMakeLists of the detector module.",
"detectorName": "TST", "": "3-letter code of the detector.",
"cycleDurationSeconds": "10", "": "Duration of one cycle (how often MonitorObjects are published).",
"cycleDurationSeconds": "10", "": "Cycle duration (how often objects are published), 10 seconds minimum.",
"maxNumberCycles": "-1", "": "Number of cycles to perform. Use -1 for infinite.",
"dataSource": { "": "Data source of the QC Task.",
"type": "dataSamplingPolicy", "": "Type of the data source, \"dataSamplingPolicy\" or \"direct\".",
Expand Down
2 changes: 1 addition & 1 deletion doc/QuickStart.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ The configuration for the QC is made of many parameters described in an [advance
"active": "true",
"className": "o2::quality_control_modules::skeleton::SkeletonTask",
"moduleName": "QcSkeleton",
"cycleDurationSeconds": "10",
"cycleDurationSeconds": "10", "": "10 seconds minimum",
(...)
```
Try and change the name of the task by replacing `QcTask` by a name of your choice (there are 2 places to update in the config file!). Relaunch the workflows. You should now see the object published under a different directory in the QCG.
Expand Down