Skip to content

Commit 616159e

Browse files
shahor02shahor02
committed
Use defaultIPCFolder() to build metric channel name
Take into account that on the Grid the framework decorated metric channel name by the ALIEN_JOB_ID
1 parent 1592850 commit 616159e

3 files changed

Lines changed: 9 additions & 6 deletions

File tree

‎Detectors/CTF/workflow/src/ctf-reader-workflow.cxx‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
#include "Framework/Logger.h"
1515
#include "Framework/ControlService.h"
1616
#include "Framework/ConfigParamRegistry.h"
17+
#include "Framework/ChannelSpecHelpers.h"
1718
#include "Framework/InputSpec.h"
1819
#include "CommonUtils/NameConf.h"
1920
#include "CTFWorkflow/CTFReaderSpec.h"
@@ -67,7 +68,7 @@ void customize(std::vector<o2::framework::ConfigParamSpec>& workflowOptions)
6768
options.push_back(ConfigParamSpec{"mft-digits", VariantType::Bool, false, {"convert MFT clusters to digits"}});
6869

6970
options.push_back(ConfigParamSpec{"timeframes-shm-limit", VariantType::String, "0", {"Minimum amount of SHM required in order to publish data"}});
70-
options.push_back(ConfigParamSpec{"metric-feedback-channel-format", VariantType::String, "name=metric-feedback,type=pull,method=connect,address=ipc://@metric-feedback-{},transport=shmem,rateLogging=0", {"format for the metric-feedback channel for TF rate limiting"}});
71+
options.push_back(ConfigParamSpec{"metric-feedback-channel-format", VariantType::String, "name=metric-feedback,type=pull,method=connect,address=ipc://{}metric-feedback-{},transport=shmem,rateLogging=0", {"format for the metric-feedback channel for TF rate limiting"}});
7172
std::swap(workflowOptions, options);
7273
}
7374

@@ -122,7 +123,7 @@ WorkflowSpec defineDataProcessing(ConfigContext const& configcontext)
122123
int rateLimitingIPCID = std::stoi(configcontext.options().get<std::string>("timeframes-rate-limit-ipcid"));
123124
std::string chanFmt = configcontext.options().get<std::string>("metric-feedback-channel-format");
124125
if (rateLimitingIPCID > -1 && !chanFmt.empty()) {
125-
ctfInput.metricChannel = fmt::format(chanFmt, rateLimitingIPCID);
126+
ctfInput.metricChannel = fmt::format(chanFmt, o2::framework::ChannelSpecHelpers::defaultIPCFolder(), rateLimitingIPCID);
126127
}
127128

128129
specs.push_back(o2::ctf::getCTFReaderSpec(ctfInput));

‎Detectors/Raw/TFReaderDD/src/tf-reader-workflow.cxx‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111

1212
#include "CommonUtils/ConfigurableParam.h"
1313
#include "Framework/ConfigParamRegistry.h"
14+
#include "Framework/ChannelSpecHelpers.h"
1415
#include "Framework/Logger.h"
1516
#include <string>
1617
#include <bitset>
@@ -42,7 +43,7 @@ void customize(std::vector<ConfigParamSpec>& workflowOptions)
4243
options.push_back(ConfigParamSpec{"configKeyValues", VariantType::String, "", {"semicolon separated key=value strings"}});
4344

4445
options.push_back(ConfigParamSpec{"timeframes-shm-limit", VariantType::String, "0", {"Minimum amount of SHM required in order to publish data"}});
45-
options.push_back(ConfigParamSpec{"metric-feedback-channel-format", VariantType::String, "name=metric-feedback,type=pull,method=connect,address=ipc://@metric-feedback-{},transport=shmem,rateLogging=0", {"format for the metric-feedback channel for TF rate limiting"}});
46+
options.push_back(ConfigParamSpec{"metric-feedback-channel-format", VariantType::String, "name=metric-feedback,type=pull,method=connect,address=ipc://{}metric-feedback-{},transport=shmem,rateLogging=0", {"format for the metric-feedback channel for TF rate limiting"}});
4647

4748
// options for error-check suppression
4849

@@ -78,7 +79,7 @@ WorkflowSpec defineDataProcessing(ConfigContext const& configcontext)
7879
int rateLimitingIPCID = std::stoi(configcontext.options().get<std::string>("timeframes-rate-limit-ipcid"));
7980
std::string chanFmt = configcontext.options().get<std::string>("metric-feedback-channel-format");
8081
if (rateLimitingIPCID > -1 && !chanFmt.empty()) {
81-
rinp.metricChannel = fmt::format(chanFmt, rateLimitingIPCID);
82+
rinp.metricChannel = fmt::format(chanFmt, o2::framework::ChannelSpecHelpers::defaultIPCFolder(), rateLimitingIPCID);
8283
}
8384

8485
WorkflowSpec specs;

‎Detectors/Raw/src/rawfile-reader-workflow.cxx‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
#include "DetectorsRaw/RawFileReader.h"
1414
#include "CommonUtils/NameConf.h"
1515
#include "CommonUtils/ConfigurableParam.h"
16+
#include "Framework/ChannelSpecHelpers.h"
1617
#include "Framework/Logger.h"
1718
#include <string>
1819
#include <bitset>
@@ -44,7 +45,7 @@ void customize(std::vector<o2::framework::ConfigParamSpec>& workflowOptions)
4445
options.push_back(ConfigParamSpec{"send-diststf-0xccdb", VariantType::Bool, false, {"send explicit FLP/DISTSUBTIMEFRAME/0xccdb output"}});
4546
options.push_back(ConfigParamSpec{"hbfutils-config", VariantType::String, std::string(o2::base::NameConf::DIGITIZATIONCONFIGFILE), {"configKeyValues ini file for HBFUtils (used if exists)"}});
4647
options.push_back(ConfigParamSpec{"timeframes-shm-limit", VariantType::String, "0", {"Minimum amount of SHM required in order to publish data"}});
47-
options.push_back(ConfigParamSpec{"metric-feedback-channel-format", VariantType::String, "name=metric-feedback,type=pull,method=connect,address=ipc://@metric-feedback-{},transport=shmem,rateLogging=0", {"format for the metric-feedback channel for TF rate limiting"}});
48+
options.push_back(ConfigParamSpec{"metric-feedback-channel-format", VariantType::String, "name=metric-feedback,type=pull,method=connect,address=ipc://{}metric-feedback-{},transport=shmem,rateLogging=0", {"format for the metric-feedback channel for TF rate limiting"}});
4849
// options for error-check suppression
4950

5051
for (int i = 0; i < RawFileReader::NErrorsDefined; i++) {
@@ -89,7 +90,7 @@ WorkflowSpec defineDataProcessing(ConfigContext const& configcontext)
8990
int rateLimitingIPCID = std::stoi(configcontext.options().get<std::string>("timeframes-rate-limit-ipcid"));
9091
std::string chanFmt = configcontext.options().get<std::string>("metric-feedback-channel-format");
9192
if (rateLimitingIPCID > -1 && !chanFmt.empty()) {
92-
rinp.metricChannel = fmt::format(chanFmt, rateLimitingIPCID);
93+
rinp.metricChannel = fmt::format(chanFmt, o2::framework::ChannelSpecHelpers::defaultIPCFolder(), rateLimitingIPCID);
9394
}
9495
o2::conf::ConfigurableParam::updateFromString(configcontext.options().get<std::string>("configKeyValues"));
9596
auto hbfini = configcontext.options().get<std::string>("hbfutils-config");

0 commit comments

Comments
 (0)