Initializing dcs-proxy from CCDB (#5456)

chiarazampolli · shahor02 · web-flow · commit c35a448cbd5d · 2021-02-12T16:53:49.000+01:00
* Initializing dcs-proxy from CCDB

clang

* Update README.md

* Install macro

Co-authored-by: Ruben Shahoyan &lt;shahor02@users.noreply.github.com&gt;
diff --git a/Detectors/DCS/CMakeLists.txt b/Detectors/DCS/CMakeLists.txt
@@ -58,6 +58,7 @@ if(BUILD_TESTING)
     COMPONENT_NAME dcs
     LABELS "dcs"
     PUBLIC_LINK_LIBRARIES O2::Framework O2::DetectorsDCS)
+  add_subdirectory(testWorkflow/macros)  
 endif()
 
 add_subdirectory(testWorkflow)
diff --git a/Detectors/DCS/testWorkflow/README.md b/Detectors/DCS/testWorkflow/README.md
@@ -51,6 +51,15 @@ o2::framework::WorkflowSpec defineDataProcessing(o2::framework::ConfigContext co
 
 A concrete example can be found in the `Detectors/TOF/calibration/testWorkflow` dir : `tof-calibration-dcs-sim-workflow`.
 
+# dcs-proxy
+
+It is the proxy to connect to the DCS machine.
+For test purposes, you can run with either hard-coded DPs (--test-mode), or reading a configuration entry from CCDB, which can be created with `testWorkflow/macros/makeCCDBEntryForDCS.C`. To validate the retrieval of data, you can attach the workflow `o2-dcs-data-client`, e.g.:
+
+```
+o2-dcs-proxy --dcs-proxy '--channel-config "name=dcs-proxy,type=pull,method=connect,address=tcp://10.11.28.22:60000,rateLogging=1,transport=zeromq"' --ccdb-url http://localhost:8080 --detector-list COMMON,COMMON1 -b | o2-dcs-data-client -b
+```
+
 
 
 
diff --git a/Detectors/DCS/testWorkflow/macros/CMakeLists.txt b/Detectors/DCS/testWorkflow/macros/CMakeLists.txt
@@ -0,0 +1,17 @@
+# Copyright CERN and copyright holders of ALICE O2. This software is distributed
+# under the terms of the GNU General Public License v3 (GPL Version 3), copied
+# verbatim in the file "COPYING".
+#
+# See http://alice-o2.web.cern.ch/license for full licensing information.
+#
+# In applying this license CERN does not waive the privileges and immunities
+# granted to it by virtue of its status as an Intergovernmental Organization or
+# submit itself to any jurisdiction.
+
+o2_add_test_root_macro(
+  makeCCDBEntryForDCS.C
+  PUBLIC_LINK_LIBRARIES O2::DetectorsDCS O2::CCDB)
+
+install(FILES makeCCDBEntryForDCS.C
+              DESTINATION share/macro/)
+              
diff --git a/Detectors/DCS/testWorkflow/macros/makeCCDBEntryForDCS.C b/Detectors/DCS/testWorkflow/macros/makeCCDBEntryForDCS.C
@@ -0,0 +1,57 @@
+// Copyright CERN and copyright holders of ALICE O2. This software is
+// distributed under the terms of the GNU General Public License v3 (GPL
+// Version 3), copied verbatim in the file "COPYING".
+//
+// See http://alice-o2.web.cern.ch/license for full licensing information.
+//
+// In applying this license CERN does not waive the privileges and immunities
+// granted to it by virtue of its status as an Intergovernmental Organization
+// or submit itself to any jurisdiction.
+
+#include <vector>
+#include <string>
+#include "TFile.h"
+#include "CCDB/CcdbApi.h"
+#include "DetectorsDCS/AliasExpander.h"
+#include "DetectorsDCS/DeliveryType.h"
+#include "DetectorsDCS/DataPointIdentifier.h"
+
+#include <unordered_map>
+#include <chrono>
+
+using DPID = o2::dcs::DataPointIdentifier;
+
+int makeCCDBEntryForDCS(const std::string url = "http://localhost:8080")
+{
+
+  //  std::string url(argv[0]);
+  // macro to populate CCDB for TOF with the configuration for DCS
+  std::unordered_map<DPID, std::string> dpid2DataDesc_Common;
+  std::unordered_map<DPID, std::string> dpid2DataDesc_Common_1;
+  std::vector<std::string> aliasesCommonStr = {"ADAPOS_LG/TEST_000100", "ADAPOS_LG/TEST_000110"};
+  std::vector<std::string> aliasesCommon_1_Int = {"ADAPOS_LG/TEST_000240"};
+  std::vector<std::string> aliasesCommon_1_Str = {"ADAPOS_LG/TEST_000200"};
+
+  DPID dpidtmp;
+  for (size_t i = 0; i < aliasesCommonStr.size(); ++i) {
+    DPID::FILL(dpidtmp, aliasesCommonStr[i], o2::dcs::DeliveryType::RAW_STRING);
+    dpid2DataDesc_Common[dpidtmp] = "COMMON";
+  }
+  for (size_t i = 0; i < aliasesCommon_1_Int.size(); ++i) {
+    DPID::FILL(dpidtmp, aliasesCommon_1_Int[i], o2::dcs::DeliveryType::RAW_INT);
+    dpid2DataDesc_Common_1[dpidtmp] = "COMMON1";
+  }
+  for (size_t i = 0; i < aliasesCommon_1_Str.size(); ++i) {
+    DPID::FILL(dpidtmp, aliasesCommon_1_Str[i], o2::dcs::DeliveryType::RAW_STRING);
+    dpid2DataDesc_Common_1[dpidtmp] = "COMMON1";
+  }
+
+  o2::ccdb::CcdbApi api;
+  api.init(url); // or http://localhost:8080 for a local installation
+  std::map<std::string, std::string> md;
+  long ts = std::chrono::duration_cast<std::chrono::milliseconds>(std::chrono::system_clock::now().time_since_epoch()).count();
+  api.storeAsTFileAny(&dpid2DataDesc_Common, "COMMON/DCSconfig", md, ts);
+  api.storeAsTFileAny(&dpid2DataDesc_Common_1, "COMMON1/DCSconfig", md, ts);
+
+  return 0;
+}
diff --git a/Detectors/DCS/testWorkflow/src/dcs-proxy.cxx b/Detectors/DCS/testWorkflow/src/dcs-proxy.cxx
@@ -23,19 +23,27 @@
 #include "DetectorsDCS/DataPointValue.h"
 #include "DetectorsDCS/DeliveryType.h"
 #include "DCStoDPLconverter.h"
+#include "CCDB/BasicCCDBManager.h"
+#include "CCDB/CcdbApi.h"
 #include <vector>
 #include <unordered_map>
+#include <regex>
+#include <string>
+#include <unistd.h>
 
 using namespace o2::framework;
 using DPID = o2::dcs::DataPointIdentifier;
 using DPVAL = o2::dcs::DataPointValue;
 using DeliveryType = o2::dcs::DeliveryType;
+using CcdbManager = o2::ccdb::BasicCCDBManager;
 
 // we need to add workflow options before including Framework/runDataProcessing
 void customize(std::vector<ConfigParamSpec>& workflowOptions)
 {
-  workflowOptions.push_back(
-    ConfigParamSpec{"verbose", VariantType::Bool, false, {"verbose output"}});
+  workflowOptions.push_back(ConfigParamSpec{"verbose", VariantType::Bool, false, {"verbose output"}});
+  workflowOptions.push_back(ConfigParamSpec{"test-mode", VariantType::Bool, false, {"test mode"}});
+  workflowOptions.push_back(ConfigParamSpec{"ccdb-url", VariantType::String, "http://ccdb-test.cern.ch:8080", {"url of CCDB to get the detectors DPs configuration"}});
+  workflowOptions.push_back(ConfigParamSpec{"detector-list", VariantType::String, "TOF, MCH", {"list of detectors for which to process DCS"}});
 }
 
 #include "Framework/runDataProcessing.h"
@@ -44,17 +52,41 @@ WorkflowSpec defineDataProcessing(ConfigContext const& config)
 {
 
   bool verbose = config.options().get<bool>("verbose");
-  DPID dpidtmp;
+  bool testMode = config.options().get<bool>("test-mode");
+  std::string url = config.options().get<std::string>("ccdb-url");
+  std::string detectorList = config.options().get<std::string>("detector-list");
 
   std::unordered_map<DPID, o2h::DataDescription> dpid2DataDesc;
-  DPID::FILL(dpidtmp, "ADAPOS_LG/TEST_000100", DeliveryType::RAW_STRING);
-  dpid2DataDesc[dpidtmp] = "COMMON"; // i.e. this will go to {DCS/COMMON/0} OutputSpec
-  DPID::FILL(dpidtmp, "ADAPOS_LG/TEST_000110", DeliveryType::RAW_STRING);
-  dpid2DataDesc[dpidtmp] = "COMMON";
-  DPID::FILL(dpidtmp, "ADAPOS_LG/TEST_000200", DeliveryType::RAW_STRING);
-  dpid2DataDesc[dpidtmp] = "COMMON1";
-  DPID::FILL(dpidtmp, "ADAPOS_LG/TEST_000240", DeliveryType::RAW_INT);
-  dpid2DataDesc[dpidtmp] = "COMMON1";
+
+  if (testMode) {
+    DPID dpidtmp;
+    DPID::FILL(dpidtmp, "ADAPOS_LG/TEST_000100", DeliveryType::RAW_STRING);
+    dpid2DataDesc[dpidtmp] = "COMMON"; // i.e. this will go to {DCS/COMMON/0} OutputSpec
+    DPID::FILL(dpidtmp, "ADAPOS_LG/TEST_000110", DeliveryType::RAW_STRING);
+    dpid2DataDesc[dpidtmp] = "COMMON";
+    DPID::FILL(dpidtmp, "ADAPOS_LG/TEST_000200", DeliveryType::RAW_STRING);
+    dpid2DataDesc[dpidtmp] = "COMMON1";
+    DPID::FILL(dpidtmp, "ADAPOS_LG/TEST_000240", DeliveryType::RAW_INT);
+    dpid2DataDesc[dpidtmp] = "COMMON1";
+  }
+
+  else {
+    auto& mgr = CcdbManager::instance();
+    mgr.setURL(url); // http://ccdb-test.cern.ch:8080 or http://localhost:8080 for a local installation
+    long ts = std::chrono::duration_cast<std::chrono::milliseconds>(std::chrono::system_clock::now().time_since_epoch()).count();
+    std::regex re("[\\s,-]+");
+    std::sregex_token_iterator it(detectorList.begin(), detectorList.end(), re, -1);
+    std::sregex_token_iterator reg_end;
+    for (; it != reg_end; ++it) {
+      LOG(INFO) << "DCS DPs configured for detector " << it->str();
+      std::unordered_map<DPID, std::string>* dpid2Det = mgr.getForTimeStamp<std::unordered_map<DPID, std::string>>(it->str() + "/DCSconfig", ts);
+      for (auto& el : *dpid2Det) {
+        o2::header::DataDescription tmpd;
+        tmpd.runtimeInit(el.second.c_str(), el.second.size());
+        dpid2DataDesc[el.first] = tmpd;
+      }
+    }
+  }
 
   // RS: here we should complete the attribution of different DPs to different outputs
   // ...
diff --git a/Detectors/TOF/calibration/macros/CMakeLists.txt b/Detectors/TOF/calibration/macros/CMakeLists.txt
@@ -9,5 +9,5 @@
 # submit itself to any jurisdiction.
 
 o2_add_test_root_macro(
-  makeCCDBEntryForDCS.C
+  makeTOFCCDBEntryForDCS.C
   PUBLIC_LINK_LIBRARIES O2::DetectorsDCS O2::CCDB)
diff --git a/Detectors/TOF/calibration/macros/makeTOFCCDBEntryForDCS.C b/Detectors/TOF/calibration/macros/makeTOFCCDBEntryForDCS.C
@@ -21,7 +21,7 @@
 
 using DPID = o2::dcs::DataPointIdentifier;
 
-int makeCCDBEntryForDCS(const std::string url = "http://localhost:8080")
+int makeTOFCCDBEntryForDCS(const std::string url = "http://localhost:8080")
 {
 
   //  std::string url(argv[0]);

Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@`
`21`	`21`
`22`	`22`	`using DPID = o2::dcs::DataPointIdentifier;`
`23`	`23`
`24`		`-int makeCCDBEntryForDCS(const std::string url = "http://localhost:8080")`
	`24`	`+int makeTOFCCDBEntryForDCS(const std::string url = "http://localhost:8080")`
`25`	`25`	`{`
`26`	`26`
`27`	`27`	`// std::string url(argv[0]);`