fix(traces): allow cancelling SENT traces and resolve SENT traces on reboot/poweroff
ogcore-debian-package/pipeline/tag This commit looks good Details
testing/ogcore-api/pipeline/head There was a failure building this commit Details
ogcore-debian-package/pipeline/head This commit looks good Details

devel 1.14.1
Juan Manuel Bardallo 2026-10-22 13:27:42 +02:00
parent 90605c7b11
commit f6ff7c1e7d
3 changed files with 26 additions and 1 deletions

View File

@ -1,5 +1,12 @@
# Changelog
## [1.14.1] - 2026-10-22
### Fixed
- **Resolución y Cancelación de Tareas en Estado Enviado (`StatusController`, `CancelMultipleTracesAction`)**:
- `CancelMultipleTracesAction`: Permite cancelar de forma explícita trazas que se encuentran en estado `sent` (`SENT`), eliminando el bloqueo que impedía cancelar tareas en vuelo o pendientes de respuesta.
- `StatusController`: En el webhook de reinicio y apagado (`REBOOT` / `POWEROFF`), se resuelven automáticamente a éxito tanto las trazas en progreso (`IN_PROGRESS`) como las enviadas (`SENT`), asegurando que los scripts que provocan el reinicio del equipo (como los scripts de congelación/descongelación) cierren su ciclo de ejecución correctamente.
## [1.14.0] - 2026-10-22
### Added

View File

@ -36,6 +36,17 @@ class CancelMultipleTracesAction extends AbstractController
$this->killJobService->kill($trace, (string) $trace->getJobId());
} elseif ($trace->getStatus() === TraceStatus::PENDING) {
$trace->setStatus(TraceStatus::CANCELLED);
$trace->setFinishedAt(new \DateTime());
$this->entityManager->persist($trace);
} elseif ($trace->getStatus() === TraceStatus::SENT) {
if ($trace->getJobId()) {
try {
$this->killJobService->kill($trace, (string) $trace->getJobId());
} catch (\Throwable) {
}
}
$trace->setStatus(TraceStatus::CANCELLED);
$trace->setFinishedAt(new \DateTime());
$this->entityManager->persist($trace);
} else {
$failed[] = ['trace' => $trace->getUuid(), 'reason' => 'not cancellable'];

View File

@ -173,7 +173,14 @@ class StatusController extends AbstractController
$clientIp = $data['iph'] ?? $request->getClientIp();
$client = $this->entityManager->getRepository(Client::class)->findOneBy(['ip' => $clientIp]);
if ($client) {
$traces = $this->entityManager->getRepository(Trace::class)->findBy(['client' => $client, 'status' => TraceStatus::IN_PROGRESS]);
$traces = $this->entityManager->getRepository(Trace::class)
->createQueryBuilder('t')
->where('t.client = :client')
->andWhere('t.status IN (:statuses)')
->setParameter('client', $client)
->setParameter('statuses', [TraceStatus::IN_PROGRESS, TraceStatus::SENT])
->getQuery()
->getResult();
foreach ($traces as $trace) {
$trace->setStatus(TraceStatus::SUCCESS);
$trace->setFinishedAt(new \DateTime());