fluentd 0.14.24 → 0.14.25

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3b8e3c3ad160e7b55045cc90693e4ed49e32e4d2
-  data.tar.gz: 0e0d26c585d8f9bd617050ce04936dc8a2d38095
+  metadata.gz: f484a644308a8845fea9a1d1c7e5dffcc1660de0
+  data.tar.gz: eb06fee3d5f392a76ace5fdb2e60f3be250d5249
 SHA512:
-  metadata.gz: 2a1790cd33c2c41176dd0452d918b979d21a5e7ac32f7730ad91d9b8c62404c095303d90f39bf69ea11dfac193bf733613e6926fc1aa7a73d8f6941f71c94bdb
-  data.tar.gz: 254bedd1088b57682cdbe0df7f547cad567702b6872d334c6cc82eb9d95c85f95a6c7537850bc0668a653ce73e4d69093861c482c45f459e9e49490a657521d7
+  metadata.gz: 91d09e99c7c0745af5f578f27e449f82535f763cba786acf8997ca0994166b2b2f481f99fa4236d5b799bdc89948c8d9d447aba879d4e63b6a9744cd56b55f02
+  data.tar.gz: 3c287549f1d5038f58c039ee082fd69661c28400b4d47562039bd229371a6af48d1b3bbd47965664ead892d95077fae4336e4b91b7ff51385d9c785b57b2935e

data/CHANGELOG.md

@@ -1,3 +1,19 @@
+# v1.0
+
+## Release v1.0.0.rc1/v0.14.25 - 2017/11/29
+
+### New features / Enhancements
+
+* Disable tracepoint feature to omit unnecessary insts
+  https://github.com/fluent/fluentd/pull/1764
+
+### Bug fixes
+
+* out_forward: Don't update retry state when failed to get ack response.
+  https://github.com/fluent/fluentd/pull/1686
+* plugin: Combine before_shutdown and shutdown call in one sequence.
+  https://github.com/fluent/fluentd/pull/1763
+
 # v0.14
 
 ## Release v0.14.24 - 2017/11/24

data/lib/fluent/plugin/out_forward.rb

@@ -433,7 +433,7 @@ module Fluent::Plugin
       if raw_data.empty?
         log.warn "destination node closed the connection. regard it as unavailable.", host: info.node.host, port: info.node.port
         info.node.disable!
-        rollback_write(info.chunk_id)
+        rollback_write(info.chunk_id, update_retry: false)
         return nil
       else
         unpacker.feed(raw_data)
@@ -442,7 +442,7 @@ module Fluent::Plugin
         if res['ack'] != info.chunk_id_base64
           # Some errors may have occured when ack and chunk id is different, so send the chunk again.
           log.warn "ack in response and chunk id in sent data are different", chunk_id: dump_unique_id_hex(info.chunk_id), ack: res['ack']
-          rollback_write(info.chunk_id)
+          rollback_write(info.chunk_id, update_retry: false)
           return nil
         else
           log.trace "got a correct ack response", chunk_id: dump_unique_id_hex(info.chunk_id)
@@ -483,7 +483,7 @@ module Fluent::Plugin
                 log.warn "no response from node. regard it as unavailable.", host: info.node.host, port: info.node.port
                 info.node.disable!
                 info.sock.close rescue nil
-                rollback_write(info.chunk_id)
+                rollback_write(info.chunk_id, update_retry: false)
               else
                 sockets << info.sock
                 new_list << info

data/lib/fluent/plugin/output.rb

@@ -226,7 +226,7 @@ module Fluent
 
         singleton_class.module_eval do
           define_method(:commit_write){ |chunk_id| @primary_instance.commit_write(chunk_id, delayed: delayed_commit, secondary: true) }
-          define_method(:rollback_write){ |chunk_id| @primary_instance.rollback_write(chunk_id) }
+          define_method(:rollback_write){ |chunk_id, update_retry: true| @primary_instance.rollback_write(chunk_id, update_retry) }
         end
       end
 
@@ -991,7 +991,9 @@ module Fluent
         end
       end
 
-      def rollback_write(chunk_id)
+      # update_retry parameter is for preventing busy loop by async write
+      # We will remove this parameter by re-design retry_state management between threads.
+      def rollback_write(chunk_id, update_retry: true)
         # This API is to rollback chunks explicitly from plugins.
         # 3rd party plugins can depend it on automatic rollback of #try_rollback_write
         @dequeued_chunks_mutex.synchronize do
@@ -1002,8 +1004,10 @@ module Fluent
         # in many cases, false can be just ignored
         if @buffer.takeback_chunk(chunk_id)
           @counters_monitor.synchronize{ @rollback_count += 1 }
-          primary = @as_secondary ? @primary_instance : self
-          primary.update_retry_state(chunk_id, @as_secondary)
+          if update_retry
+            primary = @as_secondary ? @primary_instance : self
+            primary.update_retry_state(chunk_id, @as_secondary)
+          end
           true
         else
           false

data/lib/fluent/root_agent.rb

@@ -212,7 +212,6 @@ module Fluent
 
       lifecycle_unsafe_sequence = ->(method, checker) {
         operation = case method
-                    when :before_shutdown then "preparing shutdown"
                     when :shutdown then "shutting down"
                     when :close    then "closing"
                     else
@@ -228,11 +227,23 @@ module Fluent
             Thread.current.abort_on_exception = true
             begin
               if method == :shutdown
+                # To avoid Input#shutdown and Output#before_shutdown mismatch problem, combine before_shutdown and shutdown call in one sequence.
+                # The problem is in_tail flushes buffered multiline in shutdown but output's flush_at_shutdown is invoked in before_shutdown
+                operation = "preparing shutdown" # for logging
+                log.debug "#{operation} #{kind} plugin", type: Plugin.lookup_type_from_class(instance.class), plugin_id: instance.plugin_id
+                begin
+                  instance.send(:before_shutdown) unless instance.send(:before_shutdown?)
+                rescue Exception => e
+                  log.warn "unexpected error while #{operation} on #{kind} plugin", plugin: instance.class, plugin_id: instance.plugin_id, error: e
+                  log.warn_backtrace
+                end
+                operation = "shutting down"
                 log.info "#{operation} #{kind} plugin", type: Plugin.lookup_type_from_class(instance.class), plugin_id: instance.plugin_id
+                instance.send(:shutdown) unless instance.send(:shutdown?)
               else
                 log.debug "#{operation} #{kind} plugin", type: Plugin.lookup_type_from_class(instance.class), plugin_id: instance.plugin_id
+                instance.send(method) unless instance.send(checker)
               end
-              instance.send(method) unless instance.send(checker)
             rescue Exception => e
               log.warn "unexpected error while #{operation} on #{kind} plugin", plugin: instance.class, plugin_id: instance.plugin_id, error: e
               log.warn_backtrace
@@ -245,8 +256,6 @@ module Fluent
       lifecycle_safe_sequence.call(:stop, :stopped?)
 
       # before_shutdown does force_flush for output plugins: it should block, so it's unsafe operation
-      lifecycle_unsafe_sequence.call(:before_shutdown, :before_shutdown?)
-
       lifecycle_unsafe_sequence.call(:shutdown, :shutdown?)
 
       lifecycle_safe_sequence.call(:after_shutdown, :after_shutdown?)

data/lib/fluent/version.rb

@@ -16,6 +16,6 @@
 
 module Fluent
 
-  VERSION = '0.14.24'
+  VERSION = '0.14.25'
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluentd
 version: !ruby/object:Gem::Version
-  version: 0.14.24
+  version: 0.14.25
 platform: ruby
 authors:
 - Sadayuki Furuhashi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-24 00:00:00.000000000 Z
+date: 2017-11-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: msgpack