[#84139] server: src: device_mgmt: Do not override completed status

Signed-off-by: Anna Roszkiewicz <aroszkiewicz@antmicro.com>

Author: anroszkiewicz

server/src/database/action_logs.py

@@ -60,6 +60,15 @@ def insert(self, action: models.action_log.ActionLog):
             session.refresh(action)
             return action.id
 
+    def get_status(self, id: int) -> str:
+        """Fetch the status of a specified action.
+        """
+        with Session(self.engine) as session:
+            return session.scalar(
+                select(models.action_log.ActionLog.status)
+                .where(models.action_log.ActionLog.id == id)
+            )
+
     def update_status(self, id: int, status: str):
         """Update the status of a specified action.
         """

server/src/device_mgmt/action.py

@@ -61,7 +61,17 @@ def execute_action(mac_address: str, action_id: str) -> Optional[tuple[int, str]
                 control_msg = execution.execution_control.get(timeout=QUEUE_RESPONSE_TIMEOUT)
                 if control_msg == "ok":
                     print(f"Queued execution '{execution.execution_id}'.", flush=True)
-                    server.instance._action_logs_db.update_status(execution.execution_id, "sent")
+
+                    # Action control may arrive after action result
+                    # We have to make sure we do not override completed status
+                    current_status = server.instance._action_logs_db.get_status(
+                        execution.execution_id
+                    )
+                    if current_status == "pending":
+                        server.instance._action_logs_db.update_status(
+                            execution.execution_id,
+                            "sent"
+                        )
                     break
                 elif control_msg == "full":
                     print(