Merge branch 'AliceO2Group:master' into alexianStuff

Author: jjuracka

CMakeLists.txt

@@ -13,7 +13,7 @@ include(GNUInstallDirs)
 # ---- Project ----
 
 project(QualityControl
-        VERSION 1.185.0
+        VERSION 1.186.0
         DESCRIPTION "O2 Data Quality Control Framework"
         LANGUAGES C CXX)
 

Framework/src/AggregatorRunner.cxx

@@ -380,11 +380,7 @@ void AggregatorRunner::start(ServiceRegistryRef services)
   // register ourselves to the BK
   if (!gSystem->Getenv("O2_QC_DONT_REGISTER_IN_BK")) { // Set this variable to disable the registration
     ILOG(Debug, Devel) << "Registering aggregator to BookKeeping" << ENDM;
-    try {
-      Bookkeeping::getInstance().registerProcess(mActivity->mId, mDeviceName, AggregatorRunner::getDetectorName(mAggregators), bkp::DplProcessType::QC_AGGREGATOR, "");
-    } catch (std::runtime_error& error) {
-      ILOG(Warning, Devel) << "Failed registration to the BookKeeping: " << error.what() << ENDM;
-    }
+    Bookkeeping::getInstance().registerProcess(mActivity->mId, mDeviceName, AggregatorRunner::getDetectorName(mAggregators), bkp::DplProcessType::QC_AGGREGATOR, "");
   }
 }
 

Framework/src/Bookkeeping.cxx

@@ -22,6 +22,7 @@
 #include <unistd.h>
 #include <filesystem>
 #include <fstream>
+#include <thread>
 
 using namespace o2::bkp::api;
 
@@ -113,7 +114,14 @@ void Bookkeeping::registerProcess(int runNumber, const std::string& name, const
   if (!mInitialized) {
     return;
   }
-  mClient->dplProcessExecution()->registerProcessExecution(runNumber, type, getHostName(), name, args, detector);
+
+  std::thread([this, runNumber, type, name, args, detector]() {
+    try {
+      this->mClient->dplProcessExecution()->registerProcessExecution(runNumber, type, getHostName(), name, args, detector);
+    } catch (std::runtime_error& error) { // catch here because we are in a thread
+      ILOG(Warning, Devel) << "Failed registration to the BookKeeping: " << error.what() << ENDM;
+    }
+  }).detach();
 }
 
 std::vector<int> Bookkeeping::sendFlagsForSynchronous(uint32_t runNumber, const std::string& detectorName, const std::vector<QcFlag>& qcFlags)

Framework/src/CheckRunner.cxx

@@ -458,11 +458,7 @@ void CheckRunner::start(ServiceRegistryRef services)
   // register ourselves to the BK
   if (!gSystem->Getenv("O2_QC_DONT_REGISTER_IN_BK")) { // Set this variable to disable the registration
     ILOG(Debug, Devel) << "Registering checkRunner to BookKeeping" << ENDM;
-    try {
-      Bookkeeping::getInstance().registerProcess(mActivity->mId, mDeviceName, mDetectorName, bkp::DplProcessType::QC_CHECKER, "");
-    } catch (std::runtime_error& error) {
-      ILOG(Warning, Devel) << "Failed registration to the BookKeeping: " << error.what() << ENDM;
-    }
+    Bookkeeping::getInstance().registerProcess(mActivity->mId, mDeviceName, mDetectorName, bkp::DplProcessType::QC_CHECKER, "");
   }
 }
 

Framework/src/InfrastructureGenerator.cxx

@@ -38,6 +38,7 @@
 #include <Framework/ExternalFairMQDeviceProxy.h>
 #include <Framework/DataDescriptorQueryBuilder.h>
 #include <Framework/O2ControlParameters.h>
+#include <Framework/CommonLabels.h>
 #include <Mergers/MergerInfrastructureBuilder.h>
 #include <Mergers/MergerBuilder.h>
 #include <DataSampling/DataSampling.h>
@@ -568,6 +569,7 @@ void InfrastructureGenerator::generateLocalTaskRemoteProxy(framework::WorkflowSp
   if (!taskSpec.critical) {
     proxy.labels.emplace_back(framework::DataProcessorLabel{ "expendable" });
   }
+  proxy.labels.emplace_back(framework::suppressDomainInfoLabel); // QC-1320
   // if not in RUNNING, we should drop all the incoming messages, we set the corresponding proxy option.
   enableDraining(proxy.options);
   if (getenv("O2_QC_KILL_PROXIES") != nullptr) {
@@ -607,6 +609,7 @@ void InfrastructureGenerator::generateMergers(framework::WorkflowSpec& workflow,
   mergerConfig.monitoringUrl = std::move(monitoringUrl);
   mergerConfig.detectorName = detectorName;
   mergerConfig.labels.push_back({ "resilient" });
+  mergerConfig.labels.push_back(framework::suppressDomainInfoLabel); // QC-1320
   mergerConfig.publishMovingWindow = { enableMovingWindows ? PublishMovingWindow::Yes : PublishMovingWindow::No };
   mergerConfig.parallelismType = { (mergerConfig.inputObjectTimespan.value == InputObjectsTimespan::LastDifference) ? ParallelismType::RoundRobin : ParallelismType::SplitInputs };
   mergersBuilder.setConfig(mergerConfig);

Framework/src/PostProcessingRunner.cxx

@@ -189,11 +189,7 @@ void PostProcessingRunner::start(framework::ServiceRegistryRef dplServices)
   // register ourselves to the BK
   if (!gSystem->Getenv("O2_QC_DONT_REGISTER_IN_BK")) { // Set this variable to disable the registration
     ILOG(Debug, Devel) << "Registering pp task to BookKeeping" << ENDM;
-    try {
-      Bookkeeping::getInstance().registerProcess(mActivity.mId, mRunnerConfig.taskName, mRunnerConfig.detectorName, bkp::DplProcessType::QC_POSTPROCESSING, "");
-    } catch (std::runtime_error& error) {
-      ILOG(Warning, Devel) << "Failed registration to the BookKeeping: " << error.what() << ENDM;
-    }
+    Bookkeeping::getInstance().registerProcess(mActivity.mId, mRunnerConfig.taskName, mRunnerConfig.detectorName, bkp::DplProcessType::QC_POSTPROCESSING, "");
   }
 
   if (mTaskState == TaskState::Created || mTaskState == TaskState::Finished) {

Framework/src/TaskRunner.cxx

@@ -437,11 +437,7 @@ void TaskRunner::registerToBookkeeping()
   if (!gSystem->Getenv("O2_QC_DONT_REGISTER_IN_BK")) { // Set this variable to disable the registration
     // register ourselves to the BK at the first cycle
     ILOG(Debug, Devel) << "Registering taskRunner to BookKeeping" << ENDM;
-    try {
-      Bookkeeping::getInstance().registerProcess(mActivity.mId, mTaskConfig.taskName, mTaskConfig.detectorName, bkp::DplProcessType::QC_TASK, "");
-    } catch (std::runtime_error& error) {
-      ILOG(Warning, Devel) << "Failed registration to the BookKeeping: " << error.what() << ENDM;
-    }
+    Bookkeeping::getInstance().registerProcess(mActivity.mId, mTaskConfig.taskName, mTaskConfig.detectorName, bkp::DplProcessType::QC_TASK, "");
   }
 }
 

Modules/TPC/include/TPC/CalPadClusterReductor.h

@@ -17,7 +17,11 @@
 #define QC_MODULE_TPC_CALPADCLUSTERDUCTOR_H
 
 #include "QualityControl/ReductorTObject.h"
+#if __has_include("TPCBase/CalDet.h")
 #include "TPCBase/CalDet.h"
+#else
+#include "TPCBaseRecSim/CalDet.h"
+#endif
 #include "TPCBase/CalArray.h"
 #include "TPCQC/Clusters.h"
 

Modules/TPC/include/TPC/ROCReductor.h

@@ -18,7 +18,11 @@
 #define QC_MODULE_TPC_ROCREDUCTOR_H
 
 #include "QualityControl/ReductorTObject.h"
+#if __has_include("TPCBase/CalDet.h")
 #include "TPCBase/CalDet.h"
+#else
+#include "TPCBaseRecSim/CalDet.h"
+#endif
 //#include "CCDB/TObjectWrapper.h"
 
 namespace o2::quality_control_modules::tpc

Modules/TPC/include/TPC/Utility.h

@@ -20,7 +20,11 @@
 #include "QualityControl/ObjectsManager.h"
 #include "QualityControl/CustomParameters.h"
 
+#if __has_include("TPCBase/CalDet.h")
 #include "TPCBase/CalDet.h"
+#else
+#include "TPCBaseRecSim/CalDet.h"
+#endif
 #include "DataFormatsTPC/ClusterNative.h"
 #include "DataFormatsTPC/WorkflowHelper.h"
 #include "Framework/ProcessingContext.h"
@@ -114,4 +118,4 @@ void retrieveStatistics(std::vector<double>& values, std::vector<double>& errors
 /// \param stddev float&, reference to float that should store stddev of mean
 void calcMeanAndStddev(const std::vector<float>& values, float& mean, float& stddev);
 } // namespace o2::quality_control_modules::tpc
-#endif // QUALITYCONTROL_TPCUTILITY_H
+#endif // QUALITYCONTROL_TPCUTILITY_H