raindrops 0.20.0 → 0.20.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6f78e29ec57e3f3710146a423cf60915d23a5f4366d70dcabbbef74fb69f71f3
-  data.tar.gz: 8a369d49c33a67af3b6acccaf64b04ed192cba9d163c8d48944cfac887511885
+  metadata.gz: ee0ff94057cce668ffed3609681f205ef8e54bb4e9a6e941b4791cf81992963d
+  data.tar.gz: 258357b6481aa52cae71265529d496fbd264226ed1f3c01ffe5f6c9bed8c5f67
 SHA512:
-  metadata.gz: b9e5de8e7a7a84038bbe19a954d3d559ebec3ed4c7f68db2e2ada6373b045f4fbcd784c5d5b91005cad1d87f1db93f9dc31c9f7fc59ae56a7f73b98d9a96bf2e
-  data.tar.gz: 9913e9205b2527b9f5bd1bae58b0c2c8962505e87280c06257f603fb722978d6656c99cfa0a297ccd0734a7d6110b0a6ecd5155fec9870ec40a31044a00def4d
+  metadata.gz: e4f8a6fedf68bad77b9378044ff6bb2eca2812ad333501ee090b9368f2e8ec6c796f08b076e90be41a7e6f3cf5447d92e0b6fa6f238e6c973a3ca7012e8fd597
+  data.tar.gz: '02475783c3a7830dbbf701edf4511f9fae67771ad081a56460082aa9bda0e5e6714a0b0eef2385fbee315e71b28c90259d5c91c16b881df4b3f9a96e0f1ff6e4'

data/.manifest

@@ -49,6 +49,7 @@ test/test_linux_all_tcp_listen_stats.rb
 test/test_linux_all_tcp_listen_stats_leak.rb
 test/test_linux_ipv6.rb
 test/test_linux_middleware.rb
+test/test_linux_reuseport_tcp_listen_stats.rb
 test/test_middleware.rb
 test/test_middleware_unicorn.rb
 test/test_middleware_unicorn_ipv6.rb

data/GIT-VERSION-FILE

@@ -1 +1 @@
-GIT_VERSION = 0.20.0
+GIT_VERSION = 0.20.1

data/GIT-VERSION-GEN

@@ -1,7 +1,7 @@
 #!/bin/sh
 
 GVF=GIT-VERSION-FILE
-DEF_VER=v0.20.0
+DEF_VER=v0.20.1
 
 LF='
 '

data/LATEST

@@ -1,10 +1,9 @@
-=== raindrops 0.20.0 / 2021-12-06 23:41 UTC
+=== raindrops 0.20.1 / 2023-02-25 00:19 UTC
 
-  Raindrops may now use file-backed mmap() rather than anonymous
-  memory.  Thanks to KJ Tsanaktsidis for the patch:
+  Stats for SO_REUSEPORT sockets are now handled properly.
+  Thanks to Dale Hamel for the patches.
 
-  https://yhbt.net/raindrops-public/20211125065618.3432-1-ktsanaktsidis@zendesk.com/T/
-
-  The documentation is also updated to note our mail archives are now
-  available via IMAP(S).
+  Dale Hamel (2):
+        Fix queue stats for sockets with SO_REUSEPORT
+        Fix off by one error in test
 

data/NEWS

@@ -1,3 +1,12 @@
+=== raindrops 0.20.1 / 2023-02-25 00:19 UTC
+
+  Stats for SO_REUSEPORT sockets are now handled properly.
+  Thanks to Dale Hamel for the patches.
+
+  Dale Hamel (2):
+        Fix queue stats for sockets with SO_REUSEPORT
+        Fix off by one error in test
+
 === raindrops 0.20.0 / 2021-12-06 23:41 UTC
 
   Raindrops may now use file-backed mmap() rather than anonymous

data/ext/raindrops/linux_inet_diag.c

@@ -306,7 +306,7 @@ static void table_set_queued(st_table *table, struct inet_diag_msg *r)
 {
 	struct listen_stats *stats = stats_for(table, r);
 	stats->listener_p = 1;
-	stats->queued = r->idiag_rqueue;
+	stats->queued += r->idiag_rqueue;
 }
 
 /* inner loop of inet_diag, called for every socket returned by netlink */
@@ -328,7 +328,7 @@ static inline void r_acc(struct nogvl_args *args, struct inet_diag_msg *r)
 		if (args->table)
 			table_set_queued(args->table, r);
 		else
-			args->stats.queued = r->idiag_rqueue;
+			args->stats.queued += r->idiag_rqueue;
 	}
 	/*
 	 * we wont get anything else because of the idiag_states filter

data/test/test_linux_reuseport_tcp_listen_stats.rb

@@ -0,0 +1,51 @@
+# -*- encoding: binary -*-
+require "./test/rack_unicorn"
+require 'test/unit'
+require 'socket'
+require 'raindrops'
+$stderr.sync = $stdout.sync = true
+
+class TestLinuxReuseportTcpListenStats < Test::Unit::TestCase
+  include Raindrops::Linux
+  include Unicorn::SocketHelper
+  TEST_ADDR = ENV['UNICORN_TEST_ADDR'] || '127.0.0.1'
+  DEFAULT_BACKLOG = 10
+
+  def setup
+    @socks = []
+  end
+
+  def teardown
+    @socks.each { |io| io.closed? or io.close }
+  end
+
+  def new_socket_server(**kwargs)
+    s = new_tcp_server TEST_ADDR, kwargs[:port] || 0, kwargs
+    s.listen(kwargs[:backlog] || DEFAULT_BACKLOG)
+    @socks << s
+    [ s, s.addr[1] ]
+  end
+
+  def new_client(port)
+    s = TCPSocket.new("127.0.0.1", port)
+    @socks << s
+    s
+  end
+
+  def test_reuseport_queue_stats
+    listeners = 10
+    _, port = new_socket_server(reuseport: true)
+    addr = "#{TEST_ADDR}:#{port}"
+    (listeners - 1).times do
+      new_socket_server(reuseport: true, port: port)
+    end
+
+    listeners.times do |i|
+      all = Raindrops::Linux.tcp_listener_stats
+      assert_equal [0, i], all[addr].to_a
+      new_client(port)
+      all = Raindrops::Linux.tcp_listener_stats
+      assert_equal [0, i+1], all[addr].to_a
+    end
+  end
+end if RUBY_PLATFORM =~ /linux/

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: raindrops
 version: !ruby/object:Gem::Version
-  version: 0.20.0
+  version: 0.20.1
 platform: ruby
 authors:
 - raindrops hackers
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-12-06 00:00:00.000000000 Z
+date: 2023-02-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aggregate
@@ -141,6 +141,7 @@ files:
 - test/test_linux_all_tcp_listen_stats_leak.rb
 - test/test_linux_ipv6.rb
 - test/test_linux_middleware.rb
+- test/test_linux_reuseport_tcp_listen_stats.rb
 - test/test_middleware.rb
 - test/test_middleware_unicorn.rb
 - test/test_middleware_unicorn_ipv6.rb
@@ -168,7 +169,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.2
+rubygems_version: 3.4.1
 signing_key: 
 specification_version: 4
 summary: real-time stats for preforking Rack servers
@@ -181,6 +182,7 @@ test_files:
 - test/test_linux_all_tcp_listen_stats_leak.rb
 - test/test_linux_ipv6.rb
 - test/test_linux_middleware.rb
+- test/test_linux_reuseport_tcp_listen_stats.rb
 - test/test_middleware.rb
 - test/test_middleware_unicorn.rb
 - test/test_middleware_unicorn_ipv6.rb