Skip to content

Commit 37c66a9

Browse files
authored
QC-1231 Remove the remaining code for obsolete reconfig. mechanism (#2439)
1 parent f87e83a commit 37c66a9

4 files changed

Lines changed: 1 addition & 27 deletions

File tree

Framework/src/AggregatorRunnerFactory.cxx

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,6 @@ DataProcessorSpec AggregatorRunnerFactory::create(const core::CommonSpec& common
4747
AlgorithmSpec{},
4848
aggRunnerConfig.options
4949
};
50-
newAggregatorRunner.labels.emplace_back(o2::framework::ecs::qcReconfigurable);
5150
newAggregatorRunner.labels.emplace_back(AggregatorRunner::getLabel());
5251
framework::DataProcessorLabel resilientLabel = { "resilient" };
5352
newAggregatorRunner.labels.emplace_back(resilientLabel);

Framework/src/CheckRunnerFactory.cxx

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,6 @@ DataProcessorSpec CheckRunnerFactory::create(CheckRunnerConfig checkRunnerConfig
4343
Outputs{ qcCheckRunner.getOutputs() },
4444
AlgorithmSpec{},
4545
options };
46-
newCheckRunner.labels.emplace_back(o2::framework::ecs::qcReconfigurable);
4746
newCheckRunner.labels.emplace_back(CheckRunner::getCheckRunnerLabel());
4847
newCheckRunner.labels.emplace_back(framework::DataProcessorLabel{ "resilient" });
4948
newCheckRunner.algorithm = adaptFromTask<CheckRunner>(std::move(qcCheckRunner));
@@ -60,8 +59,7 @@ DataProcessorSpec CheckRunnerFactory::createSinkDevice(const CheckRunnerConfig&
6059
Outputs{ qcCheckRunner.getOutputs() },
6160
adaptFromTask<CheckRunner>(std::move(qcCheckRunner)),
6261
checkRunnerConfig.options,
63-
{},
64-
{ o2::framework::ecs::qcReconfigurable } };
62+
{} };
6563
newCheckRunner.labels.emplace_back(framework::DataProcessorLabel{ "resilient" });
6664
return newCheckRunner;
6765
}

Framework/src/TaskRunnerFactory.cxx

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,6 @@ o2::framework::DataProcessorSpec TaskRunnerFactory::create(const TaskRunnerConfi
5151
adaptFromTask<TaskRunner>(std::move(qcTask)),
5252
taskConfig.options
5353
};
54-
newTask.labels.emplace_back(o2::framework::ecs::qcReconfigurable);
5554
newTask.labels.emplace_back(TaskRunner::getTaskRunnerLabel());
5655
if (!taskConfig.critical) {
5756
framework::DataProcessorLabel expendableLabel = { "expendable" };

doc/DevelopersTips.md

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -333,28 +333,6 @@ Environment="ACCESS_LOG=/home/ccdb/logs/access_log"
333333
Environment="ACCESS_LOG_MIN_LEVEL=200"
334334
```
335335

336-
### ControlWorkflows
337-
338-
#### Parameter `qcConfiguration` in tasks
339-
340-
This parameter is used to point to the config file in consul that should be loaded and passed to the task, check
341-
and aggregator runners upon the Start transition. It looks like:
342-
```
343-
qcConfiguration: "{{ ToPtree(GetConfig('qc/ANY/any/stfb_to_daqtask-cru-ctp2'), 'json') }}"
344-
```
345-
Typically a task gets a config file via the command line options which is used to prepare the workflow and then the
346-
consul one is loaded, if available, when starting.
347-
348-
The reconfiguration is done only on devices that have the label `qc-reconfigurable` as defined in `Framework/Core/src/O2ControlLabels.cxx`,
349-
i.e. `o2::framework::ecs::qcReconfigurable`. This is the case for Tasks, Checks and Aggregators runners.
350-
351-
A more complex example with dumping the payload for debugging:
352-
```
353-
qcConfiguration: {{ ToPtree(Dump(GetConfigLegacy('qc/ANY/any/stfb_to_daqtask-alio2-cr1-mvs03'), '/tmp/QcTaskPayload-' + environment_id + '.dump'), 'json') }}
354-
```
355-
356-
Related issue: QC-310
357-
358336
### ccdb-test connection
359337

360338
Ask Costin to put your key on the server.

0 commit comments

Comments
 (0)