Fix recording shutdown for node docker

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

Author: VietND96

Makefile

@@ -1170,6 +1170,7 @@ test_node_docker: hub standalone_docker standalone_chrome standalone_firefox sta
 		echo UID=$$(id -u) >> .env ; \
 		echo BINDING_VERSION=$(BINDING_VERSION) >> .env ; \
 		echo BASE_VERSION=$(BASE_VERSION) >> .env ; \
+		echo VIDEO_EVENT_DRIVEN=$(or $(VIDEO_EVENT_DRIVEN), "true") >> .env ; \
 		if [ "$$(uname)" != "Darwin" ]; then \
 			echo HOST_IP=$$(hostname -I | awk '{print $$1}') >> .env ; \
 		else \
@@ -1238,7 +1239,7 @@ test_video_integrity:
 	fi; \
 	for file in $$list_files; do \
 		echo "Checking video file: $$file"; \
-		docker run -u $$(id -u) -v $$(pwd):$$(pwd) -w $$(pwd) --entrypoint="" $(NAME)/video:$(FFMPEG_TAG_VERSION)-$(BUILD_DATE) ffmpeg -v error -i "$$file" -f null - ; \
+		docker run --rm -u $$(id -u) -v $$(pwd):$$(pwd) -w $$(pwd) --entrypoint="" $(NAME)/video:$(FFMPEG_TAG_VERSION)-$(BUILD_DATE) ffmpeg -v error -i "$$file" -f null - ; \
 		if [ $$? -ne 0 ]; then \
 			echo "Video file $$file is corrupted"; \
 			number_corrupted_files=$$((number_corrupted_files+1)); \

Video/recorder.conf

@@ -6,7 +6,7 @@ autostart=%(ENV_SE_RECORD_VIDEO)s
 startsecs=0
 autorestart=%(ENV_SE_RECORD_VIDEO)s
 stopsignal=TERM
-stopwaitsecs=60
+stopwaitsecs=30
 
 ;Logs (all activity redirected to stdout so it can be seen through "docker logs"
 redirect_stderr=true
@@ -20,7 +20,8 @@ killasgroup=true
 autostart=%(ENV_SE_RECORD_VIDEO)s
 startsecs=0
 autorestart=%(ENV_SE_RECORD_VIDEO)s
-stopsignal=KILL
+stopsignal=TERM
+stopwaitsecs=5
 
 ;Logs (all activity redirected to stdout so it can be seen through "docker logs"
 redirect_stderr=true

Video/video_ready.py

@@ -28,7 +28,10 @@ def do_GET(self):
 
 def graceful_shutdown(signum, frame):
     print("Trapped SIGTERM/SIGINT/x so shutting down video-ready...")
-    httpd.shutdown()
+    # httpd.shutdown() must be called from a different thread than serve_forever()
+    # or it deadlocks.  video-ready has no state to drain, so close the socket
+    # and exit directly — supervisord will see the clean exit immediately.
+    httpd.server_close()
     sys.exit(0)
 
 

tests/docker-compose-v3-test-node-docker.yaml

@@ -21,6 +21,7 @@ services:
       - SE_OPTS=--enable-managed-downloads ${SELENIUM_ENABLE_MANAGED_DOWNLOADS}
       - SE_BROWSER_ARGS_DISABLE_DSHM=--disable-dev-shm-usage
       - SE_LOG_LEVEL=${LOG_LEVEL}
+      - SE_VIDEO_EVENT_DRIVEN=${VIDEO_EVENT_DRIVEN}
       - SE_VIDEO_RECORD_STANDALONE=true
       - SE_VIDEO_FILE_NAME=${VIDEO_FILE_NAME}
       - SE_VIDEO_FILE_NAME_SUFFIX=${VIDEO_FILE_NAME_SUFFIX}

tests/docker-compose-v3-test-standalone-docker.yaml

@@ -14,6 +14,7 @@ services:
       - SE_NODE_ENABLE_MANAGED_DOWNLOADS=${SELENIUM_ENABLE_MANAGED_DOWNLOADS}
       - SE_NODE_GRID_URL=${GRID_URL}
       - SE_OPTS=--log-level ${LOG_LEVEL} --enable-managed-downloads ${SELENIUM_ENABLE_MANAGED_DOWNLOADS}
+      - SE_VIDEO_EVENT_DRIVEN=${VIDEO_EVENT_DRIVEN}
       - SE_VIDEO_RECORD_STANDALONE=${RECORD_STANDALONE}
       - SE_VIDEO_FILE_NAME=${VIDEO_FILE_NAME}
       - SE_VIDEO_FILE_NAME_SUFFIX=${VIDEO_FILE_NAME_SUFFIX}