Fix recording shutdown for node docker

Signed-off-by: Viet Nguyen Duc <nguyenducviet4496@gmail.com>

Author: VietND96

Makefile

@@ -1125,7 +1125,7 @@ test_node_relay: hub node_base standalone_firefox
 
 test_standalone_docker: standalone_docker
 	DOCKER_COMPOSE_FILE=docker-compose-v3-test-standalone-docker.yaml CONFIG_FILE=standalone_docker_config.toml HUB_CHECKS_INTERVAL=45 TEST_CUSTOM_SPECIFIC_NAME=true \
-	RECORD_STANDALONE=true GRID_URL=http://0.0.0.0:4444 LIST_OF_TESTS_AMD64="DeploymentAutoscaling" TEST_PARALLEL_HARDENING=true TEST_DELAY_AFTER_TEST=0 \
+	RECORD_STANDALONE=true GRID_URL=http://0.0.0.0:4444 LIST_OF_TESTS_AMD64="DeploymentAutoscaling" TEST_PARALLEL_HARDENING=true TEST_DELAY_AFTER_TEST=1 \
 	SELENIUM_ENABLE_MANAGED_DOWNLOADS=true LOG_LEVEL=SEVERE SKIP_CHECK_DOWNLOADS_VOLUME=true make test_node_docker
 
 test_standalone_docker_video_sidecar: standalone_docker

Video/video_service.py

@@ -507,7 +507,12 @@ async def stop_recording(self, session: SessionState) -> bool:
             return False
         session.ffmpeg_process = None
 
-        session.status = SessionStatus.STOPPING
+        # Only move to STOPPING if we are still in the RECORDING state.
+        # handle_session_closed() sets status to CLOSED before calling us;
+        # overwriting that with STOPPING would prevent _cleanup_session_delayed
+        # from ever cleaning up the session (it checks status == CLOSED).
+        if session.status == SessionStatus.RECORDING:
+            session.status = SessionStatus.STOPPING
         session.end_time = datetime.now()
 
         try:
@@ -528,9 +533,11 @@ async def stop_recording(self, session: SessionState) -> bool:
             # 255 is ffmpeg's own graceful-stop exit code (exit_program(255) in its SIGTERM handler).
             if rc not in (0, 255, -signal.SIGTERM, -signal.SIGKILL):
                 logger.error(f"ffmpeg exited with unexpected code {rc} for {session.session_id}")
+                session.status = SessionStatus.CLOSED
                 return False
 
             self.recorded_count += 1
+            session.status = SessionStatus.CLOSED
             duration = session.duration_seconds
             logger.info(
                 f"Stopped recording: session={session.session_id}, " f"duration={duration:.1f}s"
@@ -540,6 +547,7 @@ async def stop_recording(self, session: SessionState) -> bool:
             return True
         except Exception as e:
             logger.error(f"Failed to stop recording for {session.session_id}: {e}")
+            session.status = SessionStatus.CLOSED
             return False
 
     # ==================== Upload Functions ====================
@@ -611,7 +619,12 @@ async def process_upload(self, task: UploadTask) -> None:
                 except asyncio.TimeoutError:
                     logger.warning(f"Upload timed out after {self.upload_timeout}s: {task.video_file}, killing process")
                     proc.kill()
-                    await proc.communicate()
+                    _, stderr_bytes = await proc.communicate()
+                    if stderr_bytes:
+                        logger.debug(
+                            f"Upload stderr at timeout for {task.video_file}: "
+                            f"{stderr_bytes.decode(errors='replace').strip()}"
+                        )
                     return
             finally:
                 try:
@@ -641,6 +654,10 @@ async def upload_worker(self) -> None:
                     logger.warning("Upload worker cancelled, pending uploads may be lost")
                     for t in active_tasks:
                         t.cancel()
+                    # Await cancelled tasks so they are not left as orphaned
+                    # asyncio tasks (which causes "Task destroyed but pending" warnings
+                    # and makes the active_uploads kill loop in run() the sole cleanup).
+                    await asyncio.gather(*active_tasks, return_exceptions=True)
                     raise
 
                 # None is the sentinel pushed by cleanup() to signal no more uploads