fluentd 1.5.1-x86-mingw32 → 1.5.2-x86-mingw32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5f3afbf08a40686033bdeb716d0e138d9dfbac96138ef64f8b0ee52449228634
-  data.tar.gz: 94e92a0dd777ea310249bb375169a66814054e196bed9473b4242b73c2248ca1
+  metadata.gz: 93fc2c158f80c62d6eb81619ef23f111990f01c0bbb6bbd5b29709664568d655
+  data.tar.gz: 0dd4e5415dd3b328164cf54bed5d306a4b09b2fc537faace0f8f51a4e63c2b2d
 SHA512:
-  metadata.gz: 87f10d3fff183d7f7cdc99c5c4f0bc7d8c9670272de88d23d51390055ab69967fa447f069d983ef1f86b4d054306fa422e13708c144fed0003a10c96537c1470
-  data.tar.gz: bf63050578d0e3b86b2d92994e98857a863f4fee82bd8a11039c8d24a5104bf4ea8b9bee8e6ff7ec32c65443ccfd8eb6b2f97be9d3a89cf29f7e696dc7d70d29
+  metadata.gz: 267d5487dfc88c241d13f12391feeed749849c94ef34639c0a665beef449041a7707f7ef51d7c2552f5f5ce4507e0e244ea84056ee790072d93ea517048bcb2d
+  data.tar.gz: 9d9a19a151340ddd54b65fc1d9bef401303adc4ed30568b71dac4f5333cd401d6c823703c1618c903cedac3afa5f105f6cefb592cce7a4d2cf5ea6606190aff3

data/CHANGELOG.md

@@ -1,5 +1,12 @@
 # v1.5
 
+## Release v1.5.2 - 2019/06/13
+
+### Bug fixes
+
+* out_forward: Fix duplicated handshake bug in keepalive
+  https://github.com/fluent/fluentd/pull/2456
+
 ## Release v1.5.1 - 2019/06/05
 
 ### Enhancement

data/lib/fluent/plugin/out_forward.rb

@@ -770,8 +770,7 @@ module Fluent::Plugin
       end
 
       def verify_connection
-        connect do |sock|
-          ri = RequestInfo.new(@sender.security ? :helo : :established)
+        connect do |sock, ri|
           if ri.state != :established
             establish_connection(sock, ri)
             raise if ri.state != :established
@@ -810,11 +809,6 @@ module Fluent::Plugin
       end
 
       def send_data_actual(sock, tag, chunk)
-        ri = RequestInfo.new(@sender.security ? :helo : :established)
-        if ri.state != :established
-          establish_connection(sock, ri)
-        end
-
         unless available?
           raise ConnectionClosedError, "failed to establish connection with node #{@name}"
         end
@@ -841,7 +835,10 @@ module Fluent::Plugin
       end
 
       def send_data(tag, chunk)
-        sock = connect
+        sock, ri = connect
+        if ri.state != :established
+          establish_connection(sock, ri)
+        end
 
         begin
           send_data_actual(sock, tag, chunk)
@@ -1073,26 +1070,36 @@ module Fluent::Plugin
       private
 
       def connect(host = nil)
-        sock = if @keepalive
-                 @socket_cache.fetch_or { @sender.create_transfer_socket(host || resolved_host, port, @hostname) }
-               else
-                 @log.debug('connect new socket')
-                 @sender.create_transfer_socket(host || resolved_host, port, @hostname)
-               end
+        socket, request_info =
+                if @keepalive
+                  ri = RequestInfo.new(:established)
+                  sock = @socket_cache.fetch_or do
+                    s = @sender.create_transfer_socket(host || resolved_host, port, @hostname)
+                    ri = RequestInfo.new(@sender.security ? :helo : :established) # overwrite if new connection
+                    s
+                  end
+                  [sock, ri]
+                else
+                  @log.debug('connect new socket')
+                  [@sender.create_transfer_socket(host || resolved_host, port, @hostname), RequestInfo.new(@sender.security ? :helo : :established)]
+                end
 
         if block_given?
+          ret = nil
           begin
-            yield(sock)
+            ret = yield(socket, request_info)
           rescue
             @socket_cache.revoke if @keepalive
             raise
           else
             @socket_cache.dec_ref if @keepalive
           ensure
-            sock.close unless @keepalive
+            socket.close unless @keepalive
           end
+
+          ret
         else
-          sock
+          [socket, request_info]
         end
       end
     end

data/lib/fluent/version.rb

@@ -16,6 +16,6 @@
 
 module Fluent
 
-  VERSION = '1.5.1'
+  VERSION = '1.5.2'
 
 end

data/test/plugin/test_out_forward.rb

@@ -649,7 +649,55 @@ EOL
     assert_equal(['test', time, records[1]], events[1])
   end
 
-  test 'authentication_with_user_auth' do
+  test 'keepalive + shared_key' do
+    input_conf = TARGET_CONFIG + %[
+                   <security>
+                     self_hostname in.localhost
+                     shared_key fluentd-sharedkey
+                   </security>
+                 ]
+    target_input_driver = create_target_input_driver(conf: input_conf)
+
+    output_conf = %[
+      send_timeout 51
+      keepalive true
+      <security>
+        self_hostname localhost
+        shared_key fluentd-sharedkey
+      </security>
+      <server>
+        name test
+        host #{TARGET_HOST}
+        port #{TARGET_PORT}
+      </server>
+    ]
+    @d = d = create_driver(output_conf)
+
+    time = event_time('2011-01-02 13:14:15 UTC')
+    records = [{ 'a' => 1 }, { 'a' => 2 }]
+    records2 = [{ 'b' => 1}, { 'b' => 2}]
+    target_input_driver.run(expect_records: 4, timeout: 15) do
+      d.run(default_tag: 'test') do
+        records.each do |record|
+          d.feed(time, record)
+        end
+
+        d.flush # emit buffer to reuse same socket later
+        records2.each do |record|
+          d.feed(time, record)
+        end
+      end
+    end
+
+    events = target_input_driver.events
+    assert{ events != [] }
+    assert_equal(['test', time, records[0]], events[0])
+    assert_equal(['test', time, records[1]], events[1])
+    assert_equal(['test', time, records2[0]], events[2])
+    assert_equal(['test', time, records2[1]], events[3])
+  end
+
+   test 'authentication_with_user_auth' do
     input_conf = TARGET_CONFIG + %[
                    <security>
                      self_hostname in.localhost

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluentd
 version: !ruby/object:Gem::Version
-  version: 1.5.1
+  version: 1.5.2
 platform: x86-mingw32
 authors:
 - Sadayuki Furuhashi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-06-05 00:00:00.000000000 Z
+date: 2019-06-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: msgpack