Skip to content

Commit 7380cae

Browse files
authored
DPL: Remove use of obsolete reconfiguration mechanism in ECS (#13539)
1 parent d9e8f04 commit 7380cae

File tree

3 files changed

+0
-35
lines changed

3 files changed

+0
-35
lines changed

Framework/Core/include/Framework/O2ControlLabels.h

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,6 @@ const extern DataProcessorLabel uniqueProxyLabel;
3131
// Thus, AliECS will not perform host and port allocation automatically. It takes priority over `uniqueProxyLabel`.
3232
const extern DataProcessorLabel preserveRawChannelsLabel;
3333

34-
// This label makes AliECS templates add the property `qcConfiguration` to the tasks, allowing them
35-
// to reconfigure in init with a freshly templated config.
36-
const extern DataProcessorLabel qcReconfigurable;
37-
3834
} // namespace ecs
3935
} // namespace o2::framework
4036

Framework/Core/src/O2ControlHelpers.cxx

Lines changed: 0 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -207,11 +207,6 @@ bool shouldPreserveRawChannels(const DeviceSpec& spec)
207207
return std::find(spec.labels.begin(), spec.labels.end(), ecs::preserveRawChannelsLabel) != spec.labels.end();
208208
}
209209

210-
bool isQcReconfigurable(const DeviceSpec& spec)
211-
{
212-
return std::find(spec.labels.begin(), spec.labels.end(), ecs::qcReconfigurable) != spec.labels.end();
213-
}
214-
215210
bool isCritical(const DeviceSpec& spec)
216211
{
217212
// DPL's expendable Data Processor corresponds to a non-critical task in ECS
@@ -220,27 +215,6 @@ bool isCritical(const DeviceSpec& spec)
220215
return std::find(spec.labels.begin(), spec.labels.end(), DataProcessorLabel{"expendable"}) == spec.labels.end();
221216
}
222217

223-
void dumpProperties(std::ostream& dumpOut, const DeviceExecution& execution, const DeviceSpec& spec, const std::string& indLevel)
224-
{
225-
// get the argument `--config`
226-
std::string configPath;
227-
auto it = std::find_if(execution.args.begin(), execution.args.end(), [](char* v) { return v != nullptr && strcmp(v, "--config") == 0; });
228-
229-
// get the next argument and find `/o2/components/` in it, then take what comes after in the string.
230-
if (it != execution.args.end()) {
231-
std::string configParam = *(++it);
232-
std::string prefix = "/o2/components/"; // keep only the path to the config file, i.e. stuff after "/o2/components/"
233-
size_t pos = configParam.find(prefix);
234-
if (pos != std::string::npos) {
235-
configPath = configParam.substr(pos + prefix.length());
236-
}
237-
}
238-
239-
dumpOut << indLevel << "properties:\n";
240-
std::string qcConfigFullCommand = configPath.empty() ? "\"\"" : "\"{{ ToPtree(config.Get('" + configPath + "'), 'json') }}\"";
241-
dumpOut << indLevel << indScheme << "qcConfiguration: " << qcConfigFullCommand << "\n";
242-
}
243-
244218
void dumpCommand(std::ostream& dumpOut, const DeviceExecution& execution, std::string indLevel)
245219
{
246220
dumpOut << indLevel << "shell: true\n";
@@ -461,10 +435,6 @@ void dumpTask(std::ostream& dumpOut, const DeviceSpec& spec, const DeviceExecuti
461435
}
462436
}
463437

464-
if (implementation::isQcReconfigurable(spec)) {
465-
implementation::dumpProperties(dumpOut, execution, spec, indLevel);
466-
}
467-
468438
dumpOut << indLevel << "command:\n";
469439
implementation::dumpCommand(dumpOut, execution, indLevel + indScheme);
470440
}

Framework/Core/src/O2ControlLabels.cxx

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,5 +16,4 @@ namespace o2::framework::ecs
1616

1717
const DataProcessorLabel uniqueProxyLabel = {"ecs-unique-proxy"};
1818
const DataProcessorLabel preserveRawChannelsLabel = {"ecs-preserve-raw-channels"};
19-
const DataProcessorLabel qcReconfigurable = {"qc-reconfigurable"};
2019
}

0 commit comments

Comments
 (0)