1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Retry on IO::EAGAINWaitReadable when a closed socket is still not available for reading

Browse Source
This commit is contained in:
Andrew Konchin 2025-02-07 15:13:00 +02:00 committed by Benoit Daloze
parent 7178593558
commit 5454188f6b
Notes: git 2025-06-06 00:31:58 +00:00 
Merged: https://github.com/ruby/ruby/pull/12710
3 changed files with 30 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
spec/ruby/library/socket/basicsocket/recv_nonblock_spec.rb
View File

@ -113,7 +113,6 @@ describe "Socket::BasicSocket#recv_nonblock" do
end end
ruby_version_is ""..."3.3" do ruby_version_is ""..."3.3" do
quarantine! do # May fail with "IO::EAGAINWaitReadable: Resource temporarily unavailable - recvfrom(2) would block" error
it "returns an empty String on a closed stream socket" do it "returns an empty String on a closed stream socket" do
ready = false ready = false
@ -121,7 +120,11 @@ describe "Socket::BasicSocket#recv_nonblock" do
client = @server.accept client = @server.accept
Thread.pass while !ready Thread.pass while !ready
client.recv_nonblock(10) begin
client.recv_nonblock(10)
rescue IO::EAGAINWaitReadable
retry
end
ensure ensure
client.close if client client.close if client
end end
@ -135,7 +138,6 @@ describe "Socket::BasicSocket#recv_nonblock" do
t.value.should == "" t.value.should == ""
end end
end
end end
ruby_version_is "3.3" do ruby_version_is "3.3" do
@ -146,7 +148,11 @@ describe "Socket::BasicSocket#recv_nonblock" do
client = @server.accept client = @server.accept
Thread.pass while !ready Thread.pass while !ready
client.recv_nonblock(10) begin
client.recv_nonblock(10)
rescue IO::EAGAINWaitReadable
retry
end
ensure ensure
client.close if client client.close if client
end end

14
spec/ruby/library/socket/basicsocket/recvmsg_nonblock_spec.rb
View File

@ -236,7 +236,6 @@ describe 'BasicSocket#recvmsg_nonblock' do
end end
ruby_version_is ""..."3.3" do ruby_version_is ""..."3.3" do
quarantine! do # May fail with "IO::EAGAINWaitReadable: Resource temporarily unavailable - recvfrom(2) would block" error
it "returns an empty String as received data on a closed stream socket" do it "returns an empty String as received data on a closed stream socket" do
ready = false ready = false
@ -244,7 +243,11 @@ describe 'BasicSocket#recvmsg_nonblock' do
client = @server.accept client = @server.accept
Thread.pass while !ready Thread.pass while !ready
client.recvmsg_nonblock(10) begin
client.recvmsg_nonblock(10)
rescue IO::EAGAINWaitReadable
retry
end
ensure ensure
client.close if client client.close if client
end end
@ -259,7 +262,6 @@ describe 'BasicSocket#recvmsg_nonblock' do
t.value.should.is_a? Array t.value.should.is_a? Array
t.value[0].should == "" t.value[0].should == ""
end end
end
end end
ruby_version_is "3.3" do ruby_version_is "3.3" do
@ -271,7 +273,11 @@ describe 'BasicSocket#recvmsg_nonblock' do
client = @server.accept client = @server.accept
Thread.pass while !ready Thread.pass while !ready
client.recvmsg_nonblock(10) begin
client.recvmsg_nonblock(10)
rescue IO::EAGAINWaitReadable
retry
end
ensure ensure
client.close if client client.close if client
end end

16
spec/ruby/library/socket/socket/recvfrom_nonblock_spec.rb
View File

@ -159,7 +159,6 @@ describe 'Socket#recvfrom_nonblock' do
end end
ruby_version_is ""..."3.3" do ruby_version_is ""..."3.3" do
quarantine! do # May fail with "IO::EAGAINWaitReadable: Resource temporarily unavailable - recvfrom(2) would block" error
it "returns an empty String as received data on a closed stream socket" do it "returns an empty String as received data on a closed stream socket" do
ready = false ready = false
@ -167,7 +166,11 @@ describe 'Socket#recvfrom_nonblock' do
client, _ = @server.accept client, _ = @server.accept
Thread.pass while !ready Thread.pass while !ready
client.recvfrom_nonblock(10) begin
client.recvfrom_nonblock(10)
rescue IO::EAGAINWaitReadable
retry
end
ensure ensure
client.close if client client.close if client
end end
@ -182,11 +185,9 @@ describe 'Socket#recvfrom_nonblock' do
t.value.should.is_a? Array t.value.should.is_a? Array
t.value[0].should == "" t.value[0].should == ""
end end
end
end end
ruby_version_is "3.3" do ruby_version_is "3.3" do
quarantine! do # May fail with "IO::EAGAINWaitReadable: Resource temporarily unavailable - recvfrom(2) would block" error
it "returns nil on a closed stream socket" do it "returns nil on a closed stream socket" do
ready = false ready = false
@ -194,7 +195,11 @@ describe 'Socket#recvfrom_nonblock' do
client, _ = @server.accept client, _ = @server.accept
Thread.pass while !ready Thread.pass while !ready
client.recvfrom_nonblock(10) begin
client.recvfrom_nonblock(10)
rescue IO::EAGAINWaitReadable
retry
end
ensure ensure
client.close if client client.close if client
end end
@ -208,7 +213,6 @@ describe 'Socket#recvfrom_nonblock' do
t.value.should be_nil t.value.should be_nil
end end
end
end end
end end
end end