From e2d1483134b42bb1619e6de5688386bda5d642a8 Mon Sep 17 00:00:00 2001 From: jmbardallo Date: Thu, 23 Jul 2026 14:08:19 +0200 Subject: [PATCH] Fix(agent-api): prevent duplicate traces due to webhook race condition for START_SCRIPT --- CHANGELOG.md | 6 +++++- src/Controller/OgAgent/RunScriptAction.php | 20 +++++++++++++++---- .../OgAgent/Webhook/StatusController.php | 6 ++++++ 3 files changed, 27 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d122785..bfc3919 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,7 +1,11 @@ # Changelog -## [1.9.1] - 2026-07-17 +## [1.9.2] - 2026-07-23 +### Fixed +- Webhook (`StatusController` y `RunScriptAction`): Solucionado un problema de condición de carrera al ejecutar scripts de forma no administrativa que creaba trazas duplicadas (una con estado Enviado y otra exitosa). El webhook `START_SCRIPT` ahora avanza correctamente el estado de la traza a `IN_PROGRESS` evitando conflictos con el proceso síncrono. + +## [1.9.1] - 2026-07-17 ### Added - Webhook (`StatusController`): Procesa la configuración de discos, particiones y caché en la respuesta del payload de la tarea `EjecutarScript`, guardándola automáticamente en base de datos. - Perfil de usuario: Añadido campo de preferencia de idioma (`language`). diff --git a/src/Controller/OgAgent/RunScriptAction.php b/src/Controller/OgAgent/RunScriptAction.php index d38f5f3..07a6a41 100644 --- a/src/Controller/OgAgent/RunScriptAction.php +++ b/src/Controller/OgAgent/RunScriptAction.php @@ -161,11 +161,23 @@ class RunScriptAction extends AbstractOgAgentController $this->entityManager->persist($client); $this->entityManager->flush(); - if ($existingTrace) { - $this->updateExistingTrace($existingTrace, $jobId, $inputData, $client); + // Check if START_SCRIPT webhook already created a trace for this job + $webhookTrace = $this->entityManager->getRepository(Trace::class)->findOneBy(['jobId' => $jobId]); + + if ($webhookTrace) { + $webhookTrace->setInput($inputData); + $this->entityManager->persist($webhookTrace); + if ($existingTrace && $existingTrace->getId() !== $webhookTrace->getId()) { + $this->entityManager->remove($existingTrace); + } + $this->entityManager->flush(); } else { - $status = ($this->isLinuxOrWindows($client) || $this->isLinuxOrWindowsSession($client)) ? TraceStatus::SENT : TraceStatus::IN_PROGRESS; - $this->createService->__invoke($client, CommandTypes::RUN_SCRIPT, $status, $jobId, $inputData); + if ($existingTrace) { + $this->updateExistingTrace($existingTrace, $jobId, $inputData, $client); + } else { + $status = ($this->isLinuxOrWindows($client) || $this->isLinuxOrWindowsSession($client)) ? TraceStatus::SENT : TraceStatus::IN_PROGRESS; + $this->createService->__invoke($client, CommandTypes::RUN_SCRIPT, $status, $jobId, $inputData); + } } } diff --git a/src/Controller/OgAgent/Webhook/StatusController.php b/src/Controller/OgAgent/Webhook/StatusController.php index 60e76c2..b356c27 100644 --- a/src/Controller/OgAgent/Webhook/StatusController.php +++ b/src/Controller/OgAgent/Webhook/StatusController.php @@ -149,6 +149,12 @@ class StatusController extends AbstractController $this->entityManager->persist($client); $this->entityManager->flush(); } + } else { + if ($trace->getStatus() !== TraceStatus::SUCCESS && $trace->getStatus() !== TraceStatus::ERROR) { + $trace->setStatus(TraceStatus::IN_PROGRESS); + $this->entityManager->persist($trace); + $this->entityManager->flush(); + } } break;