Skip to content

[QC-585] Pass Monitoring URL to Mergers #708

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
knopers8 merged 5 commits into from
Jun 23, 2021
Merged

[QC-585] Pass Monitoring URL to Mergers #708

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
e114966
[QC-585] Pass Monitoring URL to Mergers
knopers8 May 21, 2021
0ae9f44
Merge branch 'master' into pass-monitoring-to-mergers
knopers8 Jun 15, 2021
8409ba9
delete empty line
knopers8 Jun 15, 2021
d4a3b08
trigger new build
Barthelemy Jun 22, 2021
c4606ec
fix test
knopers8 Jun 22, 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
3 changes: 2 additions & 1 deletion Framework/include/QualityControl/InfrastructureGenerator.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,8 @@ class InfrastructureGenerator
std::string taskName,
size_t numberOfLocalMachines,
double cycleDurationSeconds,
std::string mergingMode);
std::string mergingMode,
std::string monitoringUrl);
static vector<framework::OutputSpec> generateCheckRunners(framework::WorkflowSpec& workflow, std::string configurationSource);
static void generateAggregator(framework::WorkflowSpec& workflow, std::string configurationSource, vector<framework::OutputSpec>& checkRunnerOutputs);
static void generatePostProcessing(framework::WorkflowSpec& workflow, std::string configurationSource);
Expand Down
8 changes: 5 additions & 3 deletions Framework/src/InfrastructureGenerator.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -198,7 +198,8 @@ o2::framework::WorkflowSpec InfrastructureGenerator::generateRemoteInfrastructur

generateMergers(workflow, taskName, numberOfLocalMachines,
taskConfig.get<double>("cycleDurationSeconds"),
taskConfig.get<std::string>("mergingMode", "delta"));
taskConfig.get<std::string>("mergingMode", "delta"),
config->get<std::string>("qc.config.monitoring.url"));

} else if (taskConfig.get<std::string>("location") == "remote") {

Expand Down Expand Up @@ -352,7 +353,7 @@ void InfrastructureGenerator::generateLocalTaskRemoteProxy(framework::WorkflowSp

void InfrastructureGenerator::generateMergers(framework::WorkflowSpec& workflow, std::string taskName,
size_t numberOfLocalMachines, double cycleDurationSeconds,
std::string mergingMode)
std::string mergingMode, std::string monitoringUrl)
{
Inputs mergerInputs;
for (size_t id = 1; id <= numberOfLocalMachines; id++) {
Expand All @@ -373,8 +374,9 @@ void InfrastructureGenerator::generateMergers(framework::WorkflowSpec& workflow,
mergerConfig.inputObjectTimespan = { (mergingMode.empty() || mergingMode == "delta") ? InputObjectsTimespan::LastDifference : InputObjectsTimespan::FullHistory };
mergerConfig.publicationDecision = { PublicationDecision::EachNSeconds, cycleDurationSeconds };
mergerConfig.mergedObjectTimespan = { MergedObjectTimespan::FullHistory, 0 };
// for now one merger should be enough, multiple layers to be supported later
// for now one merger should be enough, multiple layers will be supported later
mergerConfig.topologySize = { TopologySize::NumberOfLayers, 1 };
mergerConfig.monitoringUrl = monitoringUrl;
mergersBuilder.setConfig(mergerConfig);

mergersBuilder.generateInfrastructure(workflow);
Expand Down
3 changes: 3 additions & 0 deletions Framework/test/testSharedConfig.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,9 @@
"Activity": {
"number": "42",
"type": "2"
},
"monitoring": {
"url": "infologger:///debug?qc"
}
},
"tasks": {
Expand Down