fluentd 0.12.38 → 0.12.39

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8fc381ec2e8ffc7a3f6e196b597a324f3e6e553e
-  data.tar.gz: 2f1832c98553174c7fe96f87832898e669f985cb
+  metadata.gz: 457250d0787e77f19de0da31390b5f6f597fad12
+  data.tar.gz: c41f52a94f1c1a4728dd3721b32978850dd28a53
 SHA512:
-  metadata.gz: cabc4f4b85ff50f0421b63f3ddceb2046a8354fac5097af1cbee43b32124e110ce8b12bf23fc55682c91266a63643ae7f38d142af146f903a4b049b162eb3073
-  data.tar.gz: bd375fc4feee2fa831c4bb03d1ed3118c3807434e250a0be635dadf5cac1654cdab666b069b1754d07d45c91c0207785ca083424968071c7baadb5d6080cb222
+  metadata.gz: 147e84086641e3651908789e80ad9cac70c3cd0a4dc5d0a70128bdc9e670724b4ba80a01a58abdaa5a66aca4aadbe1eba95e2d267e21d62c79317585faddb5f9
+  data.tar.gz: b51d04dea05b51b558c89d703ada04f1c431874b16dcfcfaaf0e8e84e7b0a51c3f8873d7d1580cd0cccc7a2f108a5fb44bdae45eb662e5227f7ff8fa31ee7076

data/ChangeLog

@@ -1,5 +1,13 @@
 # v0.12
 
+## Release 0.12.39 - 2017/07/14
+
+### Bug fixes
+
+* log: Revert 0.12.38 changes to avoid shutdown stuck
+  https://github.com/fluent/fluentd/pull/1631
+  https://github.com/fluent/fluentd/pull/1632
+
 ## Release 0.12.38 - 2017/07/13
 
 ### New features / Enhancement

data/lib/fluent/agent.rb

@@ -38,11 +38,6 @@ module Fluent
       @started_outputs = []
       @started_filters = []
 
-      @outputs_for_log_event = []
-      @filters_for_log_event = []
-      @started_outputs_for_log_event = []
-      @started_filters_for_log_event = []
-
       @log = Engine.log
       @event_router = EventRouter.new(NoMatchMatch.new(log), self)
       @error_collector = nil
@@ -75,47 +70,16 @@ module Fluent
       @outputs.each { |o|
         o.start
         @started_outputs << o
-        @started_outputs_for_log_event << o if @outputs_for_log_event.include?(o)
       }
 
       @filters.each { |f|
         f.start
         @started_filters << f
-        @started_filters_for_log_event << f if @filters_for_log_event.include?(f)
       }
     end
 
     def shutdown
-      (@started_filters - @started_filters_for_log_event).map { |f|
-        Thread.new do
-          begin
-            log.info "shutting down filter#{@context.nil? ? '' : " in #{@context}"}", type: Plugin.lookup_name_from_class(f.class), plugin_id: f.plugin_id
-            f.shutdown
-          rescue => e
-            log.warn "unexpected error while shutting down filter plugins", plugin: f.class, plugin_id: f.plugin_id, error_class: e.class, error: e
-            log.warn_backtrace
-          end
-        end
-      }.each { |t| t.join }
-
-      # Output plugin as filter emits records at shutdown so emit problem still exist.
-      # This problem will be resolved after actual filter mechanizm.
-      (@started_outputs - @started_outputs_for_log_event).map { |o|
-        Thread.new do
-          begin
-            log.info "shutting down output#{@context.nil? ? '' : " in #{@context}"}", type: Plugin.lookup_name_from_class(o.class), plugin_id: o.plugin_id
-            o.shutdown
-          rescue => e
-            log.warn "unexpected error while shutting down output plugins", plugin: o.class, plugin_id: o.plugin_id, error_class: e.class, error: e
-            log.warn_backtrace
-          end
-        end
-      }.each { |t| t.join }
-
-      ## execute callback from Engine to flush log event queue before shutting down corresponding filters and outputs
-      yield if block_given?
-
-      @started_filters_for_log_event.map { |f|
+      @started_filters.map { |f|
         Thread.new do
           begin
             log.info "shutting down filter#{@context.nil? ? '' : " in #{@context}"}", type: Plugin.lookup_name_from_class(f.class), plugin_id: f.plugin_id
@@ -129,7 +93,7 @@ module Fluent
 
       # Output plugin as filter emits records at shutdown so emit problem still exist.
       # This problem will be resolved after actual filter mechanizm.
-      @started_outputs_for_log_event.map { |o|
+      @started_outputs.map { |o|
         Thread.new do
           begin
             log.info "shutting down output#{@context.nil? ? '' : " in #{@context}"}", type: Plugin.lookup_name_from_class(o.class), plugin_id: o.plugin_id
@@ -170,10 +134,6 @@ module Fluent
       @outputs << output
       @event_router.add_rule(pattern, output)
 
-      if match_event_log_tag?(pattern)
-        @outputs_for_log_event << output
-      end
-
       output
     end
 
@@ -186,17 +146,9 @@ module Fluent
       @filters << filter
       @event_router.add_rule(pattern, filter)
 
-      if match_event_log_tag?(pattern)
-        @filters_for_log_event << filter
-      end
-
       filter
     end
 
-    def match_event_log_tag?(pattern)
-      EventRouter::Rule.new(pattern, nil).match?($log.tag)
-    end
-
     # For handling invalid record
     def emit_error_event(tag, time, record, error)
     end

data/lib/fluent/engine.rb

@@ -165,6 +165,7 @@ module Fluent
       $log.disable_events(Thread.current)
 
       while sleep(LOG_EMIT_INTERVAL)
+        break if @log_event_loop_stop
         next if @log_event_queue.empty?
 
         # NOTE: thead-safe of slice! depends on GVL
@@ -178,7 +179,6 @@ module Fluent
             $log.error "failed to emit fluentd's log event", tag: tag, event: record, error_class: e.class, error: e
           end
         }
-        break if @log_event_loop_stop
       end
     end
 
@@ -209,13 +209,10 @@ module Fluent
         $log.error_backtrace
       ensure
         $log.info "shutting down fluentd"
+        shutdown
         if @log_emit_thread
-          shutdown do
-            @log_event_loop_stop = true
-            @log_emit_thread.join
-          end
-        else
-          shutdown
+          @log_event_loop_stop = true
+          @log_emit_thread.join
         end
       end
     end
@@ -240,8 +237,8 @@ module Fluent
       @root_agent.start
     end
 
-    def shutdown(&block)
-      @root_agent.shutdown(&block)
+    def shutdown
+      @root_agent.shutdown
     end
   end
 

data/lib/fluent/version.rb

@@ -16,6 +16,6 @@
 
 module Fluent
 
-  VERSION = '0.12.38'
+  VERSION = '0.12.39'
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluentd
 version: !ruby/object:Gem::Version
-  version: 0.12.38
+  version: 0.12.39
 platform: ruby
 authors:
 - Sadayuki Furuhashi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-13 00:00:00.000000000 Z
+date: 2017-07-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: msgpack