Skip to content

Commit

Permalink
QC-1231 Remove the remaining code for obsolete reconfig. mechanism (#…
Browse files Browse the repository at this point in the history
  • Loading branch information
knopers8 authored Sep 25, 2024
1 parent f87e83a commit 37c66a9
Show file tree
Hide file tree
Showing 4 changed files with 1 addition and 27 deletions.
1 change: 0 additions & 1 deletion Framework/src/AggregatorRunnerFactory.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,6 @@ DataProcessorSpec AggregatorRunnerFactory::create(const core::CommonSpec& common
AlgorithmSpec{},
aggRunnerConfig.options
};
newAggregatorRunner.labels.emplace_back(o2::framework::ecs::qcReconfigurable);
newAggregatorRunner.labels.emplace_back(AggregatorRunner::getLabel());
framework::DataProcessorLabel resilientLabel = { "resilient" };
newAggregatorRunner.labels.emplace_back(resilientLabel);
Expand Down
4 changes: 1 addition & 3 deletions Framework/src/CheckRunnerFactory.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,6 @@ DataProcessorSpec CheckRunnerFactory::create(CheckRunnerConfig checkRunnerConfig
Outputs{ qcCheckRunner.getOutputs() },
AlgorithmSpec{},
options };
newCheckRunner.labels.emplace_back(o2::framework::ecs::qcReconfigurable);
newCheckRunner.labels.emplace_back(CheckRunner::getCheckRunnerLabel());
newCheckRunner.labels.emplace_back(framework::DataProcessorLabel{ "resilient" });
newCheckRunner.algorithm = adaptFromTask<CheckRunner>(std::move(qcCheckRunner));
Expand All @@ -60,8 +59,7 @@ DataProcessorSpec CheckRunnerFactory::createSinkDevice(const CheckRunnerConfig&
Outputs{ qcCheckRunner.getOutputs() },
adaptFromTask<CheckRunner>(std::move(qcCheckRunner)),
checkRunnerConfig.options,
{},
{ o2::framework::ecs::qcReconfigurable } };
{} };
newCheckRunner.labels.emplace_back(framework::DataProcessorLabel{ "resilient" });
return newCheckRunner;
}
Expand Down
1 change: 0 additions & 1 deletion Framework/src/TaskRunnerFactory.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,6 @@ o2::framework::DataProcessorSpec TaskRunnerFactory::create(const TaskRunnerConfi
adaptFromTask<TaskRunner>(std::move(qcTask)),
taskConfig.options
};
newTask.labels.emplace_back(o2::framework::ecs::qcReconfigurable);
newTask.labels.emplace_back(TaskRunner::getTaskRunnerLabel());
if (!taskConfig.critical) {
framework::DataProcessorLabel expendableLabel = { "expendable" };
Expand Down
22 changes: 0 additions & 22 deletions doc/DevelopersTips.md
Original file line number Diff line number Diff line change
Expand Up @@ -333,28 +333,6 @@ Environment="ACCESS_LOG=/home/ccdb/logs/access_log"
Environment="ACCESS_LOG_MIN_LEVEL=200"
```

### ControlWorkflows

#### Parameter `qcConfiguration` in tasks

This parameter is used to point to the config file in consul that should be loaded and passed to the task, check
and aggregator runners upon the Start transition. It looks like:
```
qcConfiguration: "{{ ToPtree(GetConfig('qc/ANY/any/stfb_to_daqtask-cru-ctp2'), 'json') }}"
```
Typically a task gets a config file via the command line options which is used to prepare the workflow and then the
consul one is loaded, if available, when starting.

The reconfiguration is done only on devices that have the label `qc-reconfigurable` as defined in `Framework/Core/src/O2ControlLabels.cxx`,
i.e. `o2::framework::ecs::qcReconfigurable`. This is the case for Tasks, Checks and Aggregators runners.

A more complex example with dumping the payload for debugging:
```
qcConfiguration: {{ ToPtree(Dump(GetConfigLegacy('qc/ANY/any/stfb_to_daqtask-alio2-cr1-mvs03'), '/tmp/QcTaskPayload-' + environment_id + '.dump'), 'json') }}
```

Related issue: QC-310

### ccdb-test connection

Ask Costin to put your key on the server.
Expand Down

0 comments on commit 37c66a9

Please sign in to comment.