server: close all connections correctly at shutdown

Signed-off-by: Shizuo Fujita <fujita@clear-code.com>

Author: Watson1978

lib/fluent/plugin_helper/server.rb

@@ -356,7 +356,10 @@ def stop
       end
 
       def shutdown
-        @_server_connections.each do |conn|
+        # When it invokes conn.cose, it reduces elements in @_server_connections by close_callback,
+        # and it reduces the number of loops. This prevents the connection closing.
+        # So, it requires invoking #dup to avoid the problem.
+        @_server_connections.dup.each do |conn|
           conn.close rescue nil
         end
 

test/plugin_helper/test_server.rb

@@ -381,6 +381,25 @@ class Dummy < Fluent::Plugin::TestBase
         d2.stop; d2.before_shutdown; d2.shutdown; d2.after_shutdown; d2.close; d2.terminate
       end
     end
+
+    test 'close all connections by shutdown' do
+      @d.server_create_tcp(:s, @port) do |data, conn|
+      end
+
+      client_sockets = []
+      5.times do
+        client_sockets << TCPSocket.open("127.0.0.1", @port)
+      end
+      waiting(4){ sleep 0.1 until @d.instance_variable_get(:@_server_connections).size > 0 }
+
+      @d.before_shutdown
+      @d.shutdown
+
+      connections = @d.instance_variable_get(:@_server_connections)
+      assert_equal(0, connections.size)
+
+      client_sockets.each(&:close)
+    end
   end
 
   sub_test_case '#server_create' do