fluent-plugin-keep-forward 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9c2af8c036f4fd144a1db429d94cc08988eec860
-  data.tar.gz: 376bb6ac2acceab104079b72c214e619e1f8afac
+  metadata.gz: 04dd9735323e7d372ac1de93fb8e68388adcb829
+  data.tar.gz: f5d686d0988c06a1872779d52942a87ac7e3c7dd
 SHA512:
-  metadata.gz: 51070129d6930e68aabad1e66c195f1355b3548302673c6bf3bf82585a4f9b3f3df31fdff45c5ce22da00b13c4c31154269f7285d066dcee1c8b19b3aaf5457a
-  data.tar.gz: 7708a5f03c1dae8c93b35525610f1cee0b3f9025aa2519b8fc58e6937dc421c779a3937262693736aa622d10cbd0db74ff4f31f1826d27059cac1d7d0f582630
+  metadata.gz: 328e26c80f20cfbb506a6b777e7bdac47a927ae3280d24ccd351295941a91c67d48a20c4f5da5cd697ba05027a88723d8ef1ab41018fa7a9d974d5ef7e23ffc8
+  data.tar.gz: d732e0a855fd81d8b5536c2a7aaa9edf9b038e33f5234b0e0af8ccfd38e732c9f2f947b2f8ec205cc07db73f9f537c967a8a8711b3375b2102e5e91dca399845

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## 0.1.4 (2014/03/20)
+
+Fixes
+
+* More explicitly close socket the case of non-keepalive
+
 ## 0.1.3 (2014/03/19)
 
 Enhancement

data/fluent-plugin-keep-forward.gemspec

@@ -3,7 +3,7 @@ $:.push File.expand_path("../lib", __FILE__)
 
 Gem::Specification.new do |s|
   s.name        = "fluent-plugin-keep-forward"
-  s.version     = "0.1.3"
+  s.version     = "0.1.4"
   s.authors     = ["Naotoshi Seo"]
   s.email       = ["sonots@gmail.com"]
   s.homepage    = "https://github.com/sonots/fluent-plugin-keep-forward"

data/lib/fluent/plugin/out_keep_forward.rb

@@ -81,22 +81,16 @@ class Fluent::KeepForwardOutput < Fluent::ForwardOutput
         send_data(node, tag, chunk)
         return
       rescue
-        node = weight_send_data(tag, chunk, error_node = node)
-        cache_node(tag, node)
+        weight_send_data(tag, chunk)
       end
     else
-      node = weight_send_data(tag, chunk, error_node = node)
-      cache_node(tag, node)
+      weight_send_data(tag, chunk)
     end
   end
 
-  def weight_send_data(tag, chunk, error_node = nil)
+  def weight_send_data(tag, chunk)
     error = nil
 
-    if error_node
-      sock_close(error_node) if @keepalive and @keepforward == :one
-    end
-
     wlen = @weight_array.length
     wlen.times do
       @rr = (@rr + 1) % wlen
@@ -105,7 +99,8 @@ class Fluent::KeepForwardOutput < Fluent::ForwardOutput
       if node.available?
         begin
           send_data(node, tag, chunk)
-          return node
+          cache_node(tag, node)
+          return
         rescue
           # for load balancing during detecting crashed servers
           error = $!  # use the latest error
@@ -123,8 +118,9 @@ class Fluent::KeepForwardOutput < Fluent::ForwardOutput
 
   # Override for keepalive
   def send_data(node, tag, chunk)
+    sock = nil
     get_mutex(node).synchronize do
-      sock = get_sock[node]
+      sock = get_sock[node] if @keepalive
       unless sock
         sock = reconnect(node)
         cache_sock(node, sock) if @keepalive
@@ -133,14 +129,18 @@ class Fluent::KeepForwardOutput < Fluent::ForwardOutput
       begin
         sock_write(sock, tag, chunk)
         node.heartbeat(false)
+        log.debug "out_keep_forward: write to", :host=>node.host, :port=>node.port
       rescue Errno::EPIPE, Errno::ECONNRESET, Errno::ECONNABORTED, Errno::ETIMEDOUT => e
-        log.warn "out_keep_forward: send_data failed #{e.class} #{e.message}, try to reconnect", :host=>node.host, :port=>node.port
-        sock.close rescue IOError
-        sock = reconnect(node)
-        cache_sock(node, sock) if @keepalive
-        retry
+        log.warn "out_keep_forward: send_data failed #{e.class} #{e.message}", :host=>node.host, :port=>node.port
+        if @keepalive
+          sock.close rescue IOError
+          cache_sock(node, nil)
+        end
+        raise e
       ensure
-        sock.close if sock and !@keepalive
+        unless @keepalive
+          sock.close if sock
+        end
       end
     end
   end
@@ -193,21 +193,13 @@ class Fluent::KeepForwardOutput < Fluent::ForwardOutput
             sock.close rescue IOError if sock
             @sock[thread_id][node] = nil
             @sock_expired_at[thread_id][node] = nil
+            log.debug "out_keep_forward: keepalive connection closed", :host=>node.host, :port=>node.port, :thread_id=>thread_id
           end
         end
       end
     end
   end
 
-  def sock_close(node)
-    get_mutex(node).synchronize do
-      sock = get_sock[node]
-      sock.close rescue IOError if sock
-      get_sock[node] = nil
-      get_sock_expired_at[node] = nil
-    end
-  end
-
   def get_mutex(node)
     thread_id = Thread.current.object_id
     @mutex[thread_id] ||= {}
@@ -215,8 +207,14 @@ class Fluent::KeepForwardOutput < Fluent::ForwardOutput
   end
 
   def cache_sock(node, sock)
-    get_sock[node] = sock
-    get_sock_expired_at[node] = Time.now + @keepalive_time if @keepalive_time
+    if sock
+      get_sock[node] = sock
+      get_sock_expired_at[node] = Time.now + @keepalive_time if @keepalive_time
+      log.info "out_keep_forward: keepalive connection opened", :host=>node.host, :port=>node.port
+    else
+      get_sock[node] = nil
+      get_sock_expired_at[node] = nil
+    end
   end
 
   def get_sock

data/spec/out_keep_forward_spec.rb

@@ -86,7 +86,7 @@ describe Fluent::KeepForwardOutput do
       before { driver.should_receive(:send_data).with(keep_node, tag, chunk) }
     end
     it_should_behave_like 'error_occurs' do
-      before { driver.stub(:weight_send_data).with(tag, chunk, keep_node) } # re-call weight_send_data
+      before { driver.stub(:weight_send_data).with(tag, chunk) } # re-call weight_send_data
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-keep-forward
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Naotoshi Seo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-19 00:00:00.000000000 Z
+date: 2014-03-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd