fluent-plugin-hash-forward 0.3.4 → 0.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8f74749e5f39d35519ab2ff9c7efb3e3ce762d20
-  data.tar.gz: 3752dac28ed939a2b3f3a32cc302a73cd848a973
+  metadata.gz: 58c1901df40204d868036947204e3ddba0b9deb8
+  data.tar.gz: 49c26894fa7146c4e325421a95cb0fdd18b0c44c
 SHA512:
-  metadata.gz: 33659670df6dabaedb7d48f589c1b3f18b992611a0360646eb844138c2136d57f2f9b6b5106714fd46d4299b0becaf05b447327c8eaa7d426072c7133f710cdd
-  data.tar.gz: 70079997a04d14d43ef96ef84bdf1d41506e6852b8906cff1dcf27344865b1c6acf034d7ffd305e894c5f0fd0fa7c8dd7b0bdb9b60cfa634172b7aea7f690661
+  metadata.gz: 0ae92af4933774b82d51672c97b1a1e7f40b2f0a71bf135e18136771c050f506c3fc773fb5310a84ea0200906ca51079393dbdba5ee60db9d40f447dee76d056
+  data.tar.gz: d592184b580aa7adfaac3cca70ec7681b066d581d0a61336f1d5404a2fa9417e16e454b8f27573048299e9652296dff7f59770d2947a3092539e6d4321f244c0

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+# 0.3.5 (2014/03/24)
+
+Fixes
+
+* Explicitly close standby node socket on recovering in keepalive
+* Explicitly close socket if an error raised even in keepalive
+
 # 0.3.4 (2014/03/19)
 
 Fixes

data/fluent-plugin-hash-forward.gemspec

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

data/lib/fluent/plugin/out_hash_forward.rb

@@ -125,6 +125,9 @@ class Fluent::HashForwardOutput < Fluent::ForwardOutput
     error = nil
     nodes = nodes(tag)
 
+    if @keepalive and primary_available?(nodes)
+      sock_close(nodes.last) # close standby
+    end
     # below is just copy from out_forward
     nodes.each do |node|
       if node.available?
@@ -173,6 +176,10 @@ class Fluent::HashForwardOutput < Fluent::ForwardOutput
     @cache_nodes[tag] = nodes
   end
 
+  def primary_available?(nodes)
+    nodes.size > 1 && nodes.first.available?
+  end
+
   # hashing(key) mod N
   def get_index(key, size)
     str_hash(key) % size
@@ -192,21 +199,29 @@ class Fluent::HashForwardOutput < 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
       end
 
       begin
         sock_write(sock, tag, chunk)
         node.heartbeat(false)
+        log.debug "out_hash_forward: write to", :host=>node.host, :port=>node.port
       rescue Errno::EPIPE, Errno::ECONNRESET, Errno::ECONNABORTED, Errno::ETIMEDOUT => e
-        log.warn "out_hash_forward: send_data failed #{e.class} #{e.message}, try to reconnect", :host=>node.host, :port=>node.port
-        sock = reconnect(node)
-        retry
+        log.warn "out_hash_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
@@ -219,11 +234,6 @@ class Fluent::HashForwardOutput < Fluent::ForwardOutput
     opt = [@send_timeout.to_i, 0].pack('L!L!')  # struct timeval
     sock.setsockopt(Socket::SOL_SOCKET, Socket::SO_SNDTIMEO, opt)
 
-    if @keepalive
-      get_sock[node] = sock
-      get_sock_expired_at[node] = Time.now + @keepalive_time if @keepalive_time
-    end
-
     sock
   end
 
@@ -264,18 +274,41 @@ class Fluent::HashForwardOutput < Fluent::ForwardOutput
             sock.close rescue IOError if sock
             @sock[thread_id][node] = nil
             @sock_expired_at[thread_id][node] = nil
+            log.debug "out_hash_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
+      if sock = get_sock[node]
+        sock.close rescue IOError
+        log.info "out_hash_forward: keepalive connection closed", :host=>node.host, :port=>node.port
+      end
+      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] ||= {}
     @mutex[thread_id][node] ||= Mutex.new
   end
 
+  def cache_sock(node, sock)
+    if sock
+      get_sock[node] = sock
+      get_sock_expired_at[node] = Time.now + @keepalive_time if @keepalive_time
+      log.info "out_hash_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
     @sock[Thread.current.object_id] ||= {}
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-hash-forward
 version: !ruby/object:Gem::Version
-  version: 0.3.4
+  version: 0.3.5
 platform: ruby
 authors:
 - Ryosuke IWANAGA
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-19 00:00:00.000000000 Z
+date: 2014-03-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd