From 60a074006ce49a1e41cd93d1b787c3709bc45f79 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafael=20Mendon=C3=A7a=20Fran=C3=A7a?= Date: Thu, 19 Nov 2026 14:49:32 -0500 Subject: [PATCH] Keep test socket descriptors under one owner The serialization tests reload live socket descriptors in the same process. The original and restored Ruby objects can both close each descriptor. Garbage collection can close a socket that another object still uses. This can cause Errno::EBADF in CI. The socket cast tests also create multiple owners for one descriptor. Duplicate the descriptors for child round trips, transfer ownership for the worker round trip, and make socket cast views non-owning. Run garbage collection between child round trips to exercise the socket lifetime. --- test/unit/test_children.rb | 9 +++++++++ test/unit/test_socket_helper.rb | 8 ++++++++ test/unit/test_worker.rb | 2 ++ 3 files changed, 19 insertions(+) diff --git a/test/unit/test_children.rb b/test/unit/test_children.rb index 3dc5d8de..d9ca171c 100644 --- a/test/unit/test_children.rb +++ b/test/unit/test_children.rb @@ -268,6 +268,7 @@ def test_dump_load @children = assert_roundtrip(@children) pipe = Pitchfork.socketpair.last + GC.start service = Worker.new(nil, service: true) @children.register_service(service) @children.update(Message::ServiceSpawned.new(48, 1, 0, pipe)) @@ -281,6 +282,14 @@ def test_dump_load def assert_roundtrip(children) data = children.dump + # The loaded children need their own descriptors in this process. + data.each do |worker| + next unless worker[:monitor_fd] + + socket = IO.for_fd(worker[:monitor_fd], autoclose: false).dup + socket.autoclose = false + worker[:monitor_fd] = socket.fileno + end cloned_children = Children.load(data) assert_equal(data.to_set, cloned_children.dump.to_set) cloned_children diff --git a/test/unit/test_socket_helper.rb b/test/unit/test_socket_helper.rb index 91908c2a..68d47721 100644 --- a/test/unit/test_socket_helper.rb +++ b/test/unit/test_socket_helper.rb @@ -80,7 +80,9 @@ def test_bind_listen_unix_idempotent test_bind_listen_unix a = bind_listen(@unix_listener) assert_equal a.fileno, @unix_listener.fileno + # The listener owns the descriptor; the cast is a borrowed view. unix_server = server_cast(@unix_listener) + unix_server.autoclose = false assert UNIXServer === unix_server a = bind_listen(unix_server) assert_equal a.fileno, unix_server.fileno @@ -92,6 +94,7 @@ def test_bind_listen_tcp_idempotent a = bind_listen(@tcp_listener) assert_equal a.fileno, @tcp_listener.fileno tcp_server = server_cast(@tcp_listener) + tcp_server.autoclose = false assert TCPServer === tcp_server a = bind_listen(tcp_server) assert_equal a.fileno, tcp_server.fileno @@ -127,9 +130,12 @@ def test_bind_listen_unix_rebind def test_server_cast test_bind_listen_unix test_bind_listen_tcp + # Both temporary views borrow the listener's descriptor. unix_listener_socket = Socket.for_fd(@unix_listener.fileno) + unix_listener_socket.autoclose = false assert Socket === unix_listener_socket @unix_server = server_cast(unix_listener_socket) + @unix_server.autoclose = false assert_equal @unix_listener.fileno, @unix_server.fileno assert UNIXServer === @unix_server assert_equal(@unix_server.path, @unix_listener.path, @@ -138,8 +144,10 @@ def test_server_cast assert_equal @unix_listener_path, sock_name(@unix_server) tcp_listener_socket = Socket.for_fd(@tcp_listener.fileno) + tcp_listener_socket.autoclose = false assert Socket === tcp_listener_socket @tcp_server = server_cast(tcp_listener_socket) + @tcp_server.autoclose = false assert_equal @tcp_listener.fileno, @tcp_server.fileno assert TCPServer === @tcp_server assert_equal @tcp_listener_name, sock_name(@tcp_server) diff --git a/test/unit/test_worker.rb b/test/unit/test_worker.rb index a59b38cd..1229109d 100644 --- a/test/unit/test_worker.rb +++ b/test/unit/test_worker.rb @@ -99,6 +99,8 @@ def test_dump_load state = worker.dump assert_equal(expected, state) + # A restart replaces the process image before reloading the descriptor. + worker.monitor.to_io.autoclose = false cloned_worker = Worker.load(state) assert_equal worker.monitor.class, cloned_worker.monitor.class assert_equal worker.monitor.fileno, cloned_worker.monitor.fileno