From e1149663a05042c7cf99466e0205714097b4f07c Mon Sep 17 00:00:00 2001 From: Piotr Konopka Date: Fri, 21 May 2021 14:39:32 +0200 Subject: [PATCH 1/4] [QC-585] Pass Monitoring URL to Mergers --- Framework/include/QualityControl/InfrastructureGenerator.h | 3 ++- Framework/src/InfrastructureGenerator.cxx | 6 ++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/Framework/include/QualityControl/InfrastructureGenerator.h b/Framework/include/QualityControl/InfrastructureGenerator.h index 2f6a8bcc4f..e08e24b1c2 100644 --- a/Framework/include/QualityControl/InfrastructureGenerator.h +++ b/Framework/include/QualityControl/InfrastructureGenerator.h @@ -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 generateCheckRunners(framework::WorkflowSpec& workflow, std::string configurationSource); static void generateAggregator(framework::WorkflowSpec& workflow, std::string configurationSource, vector& checkRunnerOutputs); static void generatePostProcessing(framework::WorkflowSpec& workflow, std::string configurationSource); diff --git a/Framework/src/InfrastructureGenerator.cxx b/Framework/src/InfrastructureGenerator.cxx index d36162d9f0..62cee8260c 100644 --- a/Framework/src/InfrastructureGenerator.cxx +++ b/Framework/src/InfrastructureGenerator.cxx @@ -168,7 +168,8 @@ o2::framework::WorkflowSpec InfrastructureGenerator::generateRemoteInfrastructur generateMergers(workflow, taskName, numberOfLocalMachines, taskConfig.get("cycleDurationSeconds"), - taskConfig.get("mergingMode", "delta")); + taskConfig.get("mergingMode", "delta"), + config->get("qc.config.monitoring.url")); } else if (taskConfig.get("location") == "remote") { @@ -317,7 +318,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++) { @@ -340,6 +341,7 @@ void InfrastructureGenerator::generateMergers(framework::WorkflowSpec& workflow, mergerConfig.mergedObjectTimespan = { MergedObjectTimespan::FullHistory, 0 }; // for now one merger should be enough, multiple layers to be supported later mergerConfig.topologySize = { TopologySize::NumberOfLayers, 1 }; + mergerConfig.monitoringUrl = monitoringUrl; mergersBuilder.setConfig(mergerConfig); mergersBuilder.generateInfrastructure(workflow); From 8409ba92b4d5f177cdc1ed0c7a848bfccc5c373e Mon Sep 17 00:00:00 2001 From: Piotr Konopka Date: Tue, 15 Jun 2021 16:32:30 +0200 Subject: [PATCH 2/4] delete empty line --- Framework/src/InfrastructureGenerator.cxx | 1 - 1 file changed, 1 deletion(-) diff --git a/Framework/src/InfrastructureGenerator.cxx b/Framework/src/InfrastructureGenerator.cxx index db65926667..91099f0268 100644 --- a/Framework/src/InfrastructureGenerator.cxx +++ b/Framework/src/InfrastructureGenerator.cxx @@ -196,7 +196,6 @@ o2::framework::WorkflowSpec InfrastructureGenerator::generateRemoteInfrastructur } generateLocalTaskRemoteProxy(workflow, taskName, numberOfLocalMachines, remotePort.value_or(defaultRemotePort)); - generateMergers(workflow, taskName, numberOfLocalMachines, taskConfig.get("cycleDurationSeconds"), taskConfig.get("mergingMode", "delta"), From d4a3b08c8bf063b7bc01407f87634e3f4366ae73 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Barth=C3=A9l=C3=A9my=20von=20Haller?= Date: Tue, 22 Jun 2021 09:13:53 +0200 Subject: [PATCH 3/4] trigger new build --- Framework/src/InfrastructureGenerator.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Framework/src/InfrastructureGenerator.cxx b/Framework/src/InfrastructureGenerator.cxx index 91099f0268..6135586fa7 100644 --- a/Framework/src/InfrastructureGenerator.cxx +++ b/Framework/src/InfrastructureGenerator.cxx @@ -374,7 +374,7 @@ 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); From c4606ec6cf40a3331a64a359c9653dbbe92fa047 Mon Sep 17 00:00:00 2001 From: Piotr Konopka Date: Tue, 22 Jun 2021 11:43:49 +0200 Subject: [PATCH 4/4] fix test --- Framework/test/testSharedConfig.json | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Framework/test/testSharedConfig.json b/Framework/test/testSharedConfig.json index 5033cccae2..5d61a819b8 100644 --- a/Framework/test/testSharedConfig.json +++ b/Framework/test/testSharedConfig.json @@ -11,6 +11,9 @@ "Activity": { "number": "42", "type": "2" + }, + "monitoring": { + "url": "infologger:///debug?qc" } }, "tasks": {