From 5702b333648c6e47dffbfe7e93a75f6a79aebdd4 Mon Sep 17 00:00:00 2001
From: Yuta Iwama <ganmacs@gmail.com>
Date: Tue, 29 Oct 2019 15:24:51 +0900
Subject: [PATCH 1/7] Dump config if dry-run mode

This change had been introduced since
https://github.com/fluent/fluentd/pull/1580/files .

but even if dry-run mode, config need to show itself

Signed-off-by: Yuta Iwama <ganmacs@gmail.com>
---
 lib/fluent/supervisor.rb | 1 -
 1 file changed, 1 deletion(-)

diff --git a/lib/fluent/supervisor.rb b/lib/fluent/supervisor.rb
index 1a0832f085..46472590ae 100644
--- a/lib/fluent/supervisor.rb
+++ b/lib/fluent/supervisor.rb
@@ -590,7 +590,6 @@ def create_socket_manager
 
     def dry_run_cmd
       $log.info "starting fluentd-#{Fluent::VERSION} as dry run mode", ruby: RUBY_VERSION
-      @system_config.suppress_config_dump = true
       dry_run
       exit 0
     rescue => e

From 6f0ae3b9dce71e1c3529d29e5756030af4a51ada Mon Sep 17 00:00:00 2001
From: Yuta Iwama <ganmacs@gmail.com>
Date: Tue, 29 Oct 2019 17:44:22 +0900
Subject: [PATCH 2/7] Add supervisor_mode to Engine class

and if supervisor_mode, worker_id returns -1 because
we need to identify worker0 and supervisor

Signed-off-by: Yuta Iwama <ganmacs@gmail.com>
---
 lib/fluent/agent.rb      |  4 +++-
 lib/fluent/engine.rb     | 20 ++++++++++++++++----
 lib/fluent/root_agent.rb | 16 +++++++---------
 lib/fluent/supervisor.rb |  2 +-
 4 files changed, 27 insertions(+), 15 deletions(-)

diff --git a/lib/fluent/agent.rb b/lib/fluent/agent.rb
index b75a2570c9..7e662704b1 100644
--- a/lib/fluent/agent.rb
+++ b/lib/fluent/agent.rb
@@ -62,7 +62,9 @@ def configure(conf)
 
       # initialize <match> and <filter> elements
       conf.elements('filter', 'match').each { |e|
-        next if e.for_another_worker?
+        if !Fluent::Engine.supervisor_mode && e.for_another_worker?
+          next
+        end
         pattern = e.arg.empty? ? '**' : e.arg
         type = e['@type']
         raise ConfigError, "Missing '@type' parameter on <#{e.name}> directive" unless type
diff --git a/lib/fluent/engine.rb b/lib/fluent/engine.rb
index e440ce461a..be106a9f33 100644
--- a/lib/fluent/engine.rb
+++ b/lib/fluent/engine.rb
@@ -42,15 +42,17 @@ def initialize
       @system_config = SystemConfig.new
 
       @dry_run_mode = false
+      @supervisor_mode = false
     end
 
     MAINLOOP_SLEEP_INTERVAL = 0.3
 
-    attr_reader :root_agent, :system_config
+    attr_reader :root_agent, :system_config, :supervisor_mode
     attr_accessor :dry_run_mode
 
-    def init(system_config)
+    def init(system_config, supervisor_mode: false)
       @system_config = system_config
+      @supervisor_mode = supervisor_mode
 
       @suppress_config_dump = system_config.suppress_config_dump unless system_config.suppress_config_dump.nil?
       @without_source = system_config.without_source unless system_config.without_source.nil?
@@ -85,17 +87,23 @@ def run_configure(conf)
                     else
                       "section <#{e.name}> is not used in <#{parent_name}>"
                     end
-          if e.for_every_workers?
+
+          if @dry_run_mode && @supervisor_mode
+            $log.warn :supervisor, message
+          elsif e.for_every_workers?
             $log.warn :worker0, message
           elsif e.for_this_worker?
             $log.warn message
           end
           next
         end
+
         unless e.name == 'system'
           unless @without_source && e.name == 'source'
             message = "parameter '#{key}' in #{e.to_s.strip} is not used."
-            if e.for_every_workers?
+            if @dry_run_mode && @supervisor_mode
+              $log.warn :supervisor, message
+            elsif e.for_every_workers?
               $log.warn :worker0, message
             elsif e.for_this_worker?
               $log.warn message
@@ -182,6 +190,10 @@ def push_log_event(tag, time, record)
     end
 
     def worker_id
+      if @supervisor_mode
+        return -1
+      end
+
       return @_worker_id if @_worker_id
       # if ENV doesn't have SERVERENGINE_WORKER_ID, it is a worker under --no-supervisor or in tests
       # so it's (almost) a single worker, worker_id=0
diff --git a/lib/fluent/root_agent.rb b/lib/fluent/root_agent.rb
index 78fb8b81b8..fcceb039e4 100644
--- a/lib/fluent/root_agent.rb
+++ b/lib/fluent/root_agent.rb
@@ -89,7 +89,7 @@ def configure(conf)
               raise Fluent::ConfigError, "worker id #{target_worker_id} specified by <worker> directive is not allowed. Available worker id is between 0 and #{(Fluent::Engine.system_config.workers - 1)}"
             end
             available_worker_ids.delete(target_worker_id) if available_worker_ids.include?(target_worker_id)
-            if used_worker_ids.include?(target_worker_id) && !Fluent::Engine.dry_run_mode
+            if used_worker_ids.include?(target_worker_id)
               raise Fluent::ConfigError, "specified worker_id<#{worker_id}> collisions is detected on <worker> directive. Available worker id(s): #{available_worker_ids}"
             end
             used_worker_ids << target_worker_id
@@ -100,9 +100,6 @@ def configure(conf)
               end
             end
 
-            # On dry_run mode, all worker sections have to be configured on supervisor (recognized as worker_id = 0).
-            target_worker_ids = [0] if Fluent::Engine.dry_run_mode
-
             unless target_worker_ids.empty?
               e.set_target_worker_ids(target_worker_ids.uniq)
             end
@@ -113,9 +110,6 @@ def configure(conf)
             raise Fluent::ConfigError, "worker id #{target_worker_id} specified by <worker> directive is not allowed. Available worker id is between 0 and #{(Fluent::Engine.system_config.workers - 1)}"
           end
 
-          ## On dry_run mode, all worker sections have to be configured on supervisor (recognized as worker_id = 0).
-          target_worker_id = 0 if Fluent::Engine.dry_run_mode
-
           e.elements.each do |elem|
             unless ['source', 'match', 'filter', 'label'].include?(elem.name)
               raise Fluent::ConfigError, "<worker> section cannot have <#{elem.name}> directive"
@@ -132,7 +126,9 @@ def configure(conf)
       # initialize <label> elements before configuring all plugins to avoid 'label not found' in input, filter and output.
       label_configs = {}
       conf.elements(name: 'label').each { |e|
-        next if e.for_another_worker?
+        if !Fluent::Engine.supervisor_mode && e.for_another_worker?
+          next
+        end
         name = e.arg
         raise ConfigError, "Missing symbol argument on <label> directive" if name.empty?
 
@@ -154,7 +150,9 @@ def configure(conf)
         log.info :worker0, "'--without-source' is applied. Ignore <source> sections"
       else
         conf.elements(name: 'source').each { |e|
-          next if e.for_another_worker?
+          if !Fluent::Engine.supervisor_mode && e.for_another_worker?
+            next
+          end
           type = e['@type']
           raise ConfigError, "Missing '@type' parameter on <source> directive" unless type
           add_source(type, e)
diff --git a/lib/fluent/supervisor.rb b/lib/fluent/supervisor.rb
index 46472590ae..f118439da5 100644
--- a/lib/fluent/supervisor.rb
+++ b/lib/fluent/supervisor.rb
@@ -603,7 +603,7 @@ def dry_run
         Fluent::Engine.dry_run_mode = true
         ServerEngine::Privilege.change(@chuser, @chgroup)
         MessagePackFactory.init
-        Fluent::Engine.init(@system_config)
+        Fluent::Engine.init(@system_config, supervisor: true)
         Fluent::Engine.run_configure(@conf)
       rescue Fluent::ConfigError => e
         $log.error "config error", file: @config_path, error: e

From a1d6f3691f4d219a2c0d9d572c1f9c4ba89b08ae Mon Sep 17 00:00:00 2001
From: Yuta Iwama <ganmacs@gmail.com>
Date: Wed, 30 Oct 2019 14:06:06 +0900
Subject: [PATCH 3/7] unify dry_run method and make @dry_run immutable

Signed-off-by: Yuta Iwama <ganmacs@gmail.com>
---
 lib/fluent/engine.rb     |  6 ++---
 lib/fluent/supervisor.rb | 54 ++++++++++++++++++----------------------
 2 files changed, 27 insertions(+), 33 deletions(-)

diff --git a/lib/fluent/engine.rb b/lib/fluent/engine.rb
index be106a9f33..6074a54592 100644
--- a/lib/fluent/engine.rb
+++ b/lib/fluent/engine.rb
@@ -47,12 +47,12 @@ def initialize
 
     MAINLOOP_SLEEP_INTERVAL = 0.3
 
-    attr_reader :root_agent, :system_config, :supervisor_mode
-    attr_accessor :dry_run_mode
+    attr_reader :root_agent, :system_config, :supervisor_mode, :dry_run_mode
 
-    def init(system_config, supervisor_mode: false)
+    def init(system_config, supervisor_mode: false, dry_run_mode: false)
       @system_config = system_config
       @supervisor_mode = supervisor_mode
+      @dry_run_mode = dry_run_mode
 
       @suppress_config_dump = system_config.suppress_config_dump unless system_config.suppress_config_dump.nil?
       @without_source = system_config.without_source unless system_config.without_source.nil?
diff --git a/lib/fluent/supervisor.rb b/lib/fluent/supervisor.rb
index f118439da5..cf10e6baa4 100644
--- a/lib/fluent/supervisor.rb
+++ b/lib/fluent/supervisor.rb
@@ -492,7 +492,30 @@ def run_supervisor
           end
         end
       end
-      dry_run_cmd if @dry_run
+
+      begin
+        if @dry_run
+          $log.info "starting fluentd-#{Fluent::VERSION} as dry run mode", ruby: RUBY_VERSION
+        end
+
+        ServerEngine::Privilege.change(@chuser, @chgroup)
+        MessagePackFactory.init
+        Fluent::Engine.init(@system_config, supervisor: true, dry_run_mode: @dry_run)
+        Fluent::Engine.run_configure(@conf)
+
+        if @dry_run
+          $log.info 'finsihed dry run mode'
+          exit 0
+        end
+      rescue Fluent::ConfigError => e
+        $log.error 'config error', file: @config_path, error: e
+        $log.debug_backtrace
+        exit!(1)
+      rescue => e
+        $log.error(e)
+        exit(1)
+      end
+
       supervise
     end
 
@@ -588,32 +611,6 @@ def create_socket_manager
       ENV['SERVERENGINE_SOCKETMANAGER_PATH'] = socket_manager_path.to_s
     end
 
-    def dry_run_cmd
-      $log.info "starting fluentd-#{Fluent::VERSION} as dry run mode", ruby: RUBY_VERSION
-      dry_run
-      exit 0
-    rescue => e
-      $log.error "dry run failed: #{e}"
-      exit 1
-    end
-
-    ## Set Engine's dry_run_mode true to override all target_id of worker sections
-    def dry_run
-      begin
-        Fluent::Engine.dry_run_mode = true
-        ServerEngine::Privilege.change(@chuser, @chgroup)
-        MessagePackFactory.init
-        Fluent::Engine.init(@system_config, supervisor: true)
-        Fluent::Engine.run_configure(@conf)
-      rescue Fluent::ConfigError => e
-        $log.error "config error", file: @config_path, error: e
-        $log.debug_backtrace
-        exit!(1)
-      ensure
-        Fluent::Engine.dry_run_mode = false
-      end
-    end
-
     def show_plugin_config
       name, type = @show_plugin_config.split(":") # input:tail
       $log.info "show_plugin_config option is deprecated. Use fluent-plugin-config-format --format=txt #{name} #{type}"
@@ -621,9 +618,6 @@ def show_plugin_config
     end
 
     def supervise
-      # Make dumpable conf, which is set corresponding_proxies for all elements in all worker sections
-      dry_run
-
       Process.setproctitle("supervisor:#{@system_config.process_name}") if @system_config.process_name
       $log.info "starting fluentd-#{Fluent::VERSION}", pid: Process.pid, ruby: RUBY_VERSION
 

From 1089d34672966e66d3cf3b79281fdd08481c30e9 Mon Sep 17 00:00:00 2001
From: Yuta Iwama <ganmacs@gmail.com>
Date: Wed, 30 Oct 2019 14:15:39 +0900
Subject: [PATCH 4/7] unify the condition

Signed-off-by: Yuta Iwama <ganmacs@gmail.com>
---
 lib/fluent/engine.rb | 49 +++++++++++++++++---------------------------
 1 file changed, 19 insertions(+), 30 deletions(-)

diff --git a/lib/fluent/engine.rb b/lib/fluent/engine.rb
index 6074a54592..184cb328d1 100644
--- a/lib/fluent/engine.rb
+++ b/lib/fluent/engine.rb
@@ -79,38 +79,27 @@ def parse_config(io, fname, basepath = Dir.pwd, v1_config = false)
 
     def run_configure(conf)
       configure(conf)
-      conf.check_not_fetched { |key, e|
+      conf.check_not_fetched do |key, e|
         parent_name, plugin_name = e.unused_in
-        if parent_name
-          message = if plugin_name
-                      "section <#{e.name}> is not used in <#{parent_name}> of #{plugin_name} plugin"
-                    else
-                      "section <#{e.name}> is not used in <#{parent_name}>"
-                    end
-
-          if @dry_run_mode && @supervisor_mode
-            $log.warn :supervisor, message
-          elsif e.for_every_workers?
-            $log.warn :worker0, message
-          elsif e.for_this_worker?
-            $log.warn message
-          end
-          next
+        message = if parent_name && plugin_name
+                    "section <#{e.name}> is not used in <#{parent_name}> of #{plugin_name} plugin"
+                  elsif parent_name
+                    "section <#{e.name}> is not used in <#{parent_name}>"
+                  elsif e.name != 'system' && !(@without_source && e.name == 'source')
+                    "parameter '#{key}' in #{e.to_s.strip} is not used."
+                  else
+                    nil
+                  end
+        next if message.nil?
+
+        if @dry_run_mode && @supervisor_mode
+          $log.warn :supervisor, message
+        elsif e.for_every_workers?
+          $log.warn :worker0, message
+        elsif e.for_this_worker?
+          $log.warn message
         end
-
-        unless e.name == 'system'
-          unless @without_source && e.name == 'source'
-            message = "parameter '#{key}' in #{e.to_s.strip} is not used."
-            if @dry_run_mode && @supervisor_mode
-              $log.warn :supervisor, message
-            elsif e.for_every_workers?
-              $log.warn :worker0, message
-            elsif e.for_this_worker?
-              $log.warn message
-            end
-          end
-        end
-      }
+      end
     end
 
     def configure(conf)

From 6b64cfcd2452debee94067605e2a258da81426c9 Mon Sep 17 00:00:00 2001
From: Yuta Iwama <ganmacs@gmail.com>
Date: Thu, 31 Oct 2019 11:10:18 +0900
Subject: [PATCH 5/7] rearrange code

Signed-off-by: Yuta Iwama <ganmacs@gmail.com>
---
 lib/fluent/supervisor.rb | 25 +++++++++++--------------
 1 file changed, 11 insertions(+), 14 deletions(-)

diff --git a/lib/fluent/supervisor.rb b/lib/fluent/supervisor.rb
index cf10e6baa4..2694a94c9e 100644
--- a/lib/fluent/supervisor.rb
+++ b/lib/fluent/supervisor.rb
@@ -474,6 +474,10 @@ def initialize(opt)
     end
 
     def run_supervisor
+      if @dry_run
+        $log.info "starting fluentd-#{Fluent::VERSION} as dry run mode", ruby: RUBY_VERSION
+      end
+
       if @system_config.workers < 1
         raise Fluent::ConfigError, "invalid number of workers (must be > 0):#{@system_config.workers}"
       end
@@ -494,29 +498,22 @@ def run_supervisor
       end
 
       begin
-        if @dry_run
-          $log.info "starting fluentd-#{Fluent::VERSION} as dry run mode", ruby: RUBY_VERSION
-        end
-
         ServerEngine::Privilege.change(@chuser, @chgroup)
         MessagePackFactory.init
-        Fluent::Engine.init(@system_config, supervisor: true, dry_run_mode: @dry_run)
+        Fluent::Engine.init(@system_config, supervisor_mode: true, dry_run_mode: @dry_run)
         Fluent::Engine.run_configure(@conf)
-
-        if @dry_run
-          $log.info 'finsihed dry run mode'
-          exit 0
-        end
       rescue Fluent::ConfigError => e
         $log.error 'config error', file: @config_path, error: e
         $log.debug_backtrace
         exit!(1)
-      rescue => e
-        $log.error(e)
-        exit(1)
       end
 
-      supervise
+      if @dry_run
+        $log.info 'finsihed dry run mode'
+        exit 0
+      else
+        supervise
+      end
     end
 
     def options

From 98e303481b072116f27783848fb040dd7a8b452b Mon Sep 17 00:00:00 2001
From: Yuta Iwama <ganmacs@gmail.com>
Date: Thu, 31 Oct 2019 11:13:33 +0900
Subject: [PATCH 6/7] no need to assign dry_run to ivar

Signed-off-by: Yuta Iwama <ganmacs@gmail.com>
---
 lib/fluent/command/fluentd.rb |  2 +-
 lib/fluent/engine.rb          | 10 ++++------
 lib/fluent/supervisor.rb      | 11 +++++------
 3 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/lib/fluent/command/fluentd.rb b/lib/fluent/command/fluentd.rb
index dc5a075b63..924027f038 100644
--- a/lib/fluent/command/fluentd.rb
+++ b/lib/fluent/command/fluentd.rb
@@ -323,7 +323,7 @@
 
   supervisor = Fluent::Supervisor.new(opts)
   supervisor.configure(supervisor: true)
-  supervisor.run_supervisor
+  supervisor.run_supervisor(dry_run: opts[:dry_run])
 else
   if opts[:standalone_worker] && opts[:workers] && opts[:workers] > 1
     puts "Error: multi workers is not supported with --no-supervisor"
diff --git a/lib/fluent/engine.rb b/lib/fluent/engine.rb
index 184cb328d1..368f5e1cf7 100644
--- a/lib/fluent/engine.rb
+++ b/lib/fluent/engine.rb
@@ -41,18 +41,16 @@ def initialize
       @fluent_log_event_router = nil
       @system_config = SystemConfig.new
 
-      @dry_run_mode = false
       @supervisor_mode = false
     end
 
     MAINLOOP_SLEEP_INTERVAL = 0.3
 
-    attr_reader :root_agent, :system_config, :supervisor_mode, :dry_run_mode
+    attr_reader :root_agent, :system_config, :supervisor_mode
 
-    def init(system_config, supervisor_mode: false, dry_run_mode: false)
+    def init(system_config, supervisor_mode: false)
       @system_config = system_config
       @supervisor_mode = supervisor_mode
-      @dry_run_mode = dry_run_mode
 
       @suppress_config_dump = system_config.suppress_config_dump unless system_config.suppress_config_dump.nil?
       @without_source = system_config.without_source unless system_config.without_source.nil?
@@ -77,7 +75,7 @@ def parse_config(io, fname, basepath = Dir.pwd, v1_config = false)
       end
     end
 
-    def run_configure(conf)
+    def run_configure(conf, dry_run: false)
       configure(conf)
       conf.check_not_fetched do |key, e|
         parent_name, plugin_name = e.unused_in
@@ -92,7 +90,7 @@ def run_configure(conf)
                   end
         next if message.nil?
 
-        if @dry_run_mode && @supervisor_mode
+        if dry_run && @supervisor_mode
           $log.warn :supervisor, message
         elsif e.for_every_workers?
           $log.warn :worker0, message
diff --git a/lib/fluent/supervisor.rb b/lib/fluent/supervisor.rb
index 2694a94c9e..1c95773bf1 100644
--- a/lib/fluent/supervisor.rb
+++ b/lib/fluent/supervisor.rb
@@ -450,7 +450,6 @@ def initialize(opt)
       @use_v1_config = opt[:use_v1_config]
       @conf_encoding = opt[:conf_encoding]
       @log_path = opt[:log_path]
-      @dry_run = opt[:dry_run]
       @show_plugin_config = opt[:show_plugin_config]
       @libs = opt[:libs]
       @plugin_dirs = opt[:plugin_dirs]
@@ -473,8 +472,8 @@ def initialize(opt)
       @finished = false
     end
 
-    def run_supervisor
-      if @dry_run
+    def run_supervisor(dry_run: false)
+      if dry_run
         $log.info "starting fluentd-#{Fluent::VERSION} as dry run mode", ruby: RUBY_VERSION
       end
 
@@ -500,15 +499,15 @@ def run_supervisor
       begin
         ServerEngine::Privilege.change(@chuser, @chgroup)
         MessagePackFactory.init
-        Fluent::Engine.init(@system_config, supervisor_mode: true, dry_run_mode: @dry_run)
-        Fluent::Engine.run_configure(@conf)
+        Fluent::Engine.init(@system_config, supervisor_mode: true)
+        Fluent::Engine.run_configure(@conf, dry_run: dry_run)
       rescue Fluent::ConfigError => e
         $log.error 'config error', file: @config_path, error: e
         $log.debug_backtrace
         exit!(1)
       end
 
-      if @dry_run
+      if dry_run
         $log.info 'finsihed dry run mode'
         exit 0
       else

From 4db63ce411de172ccf72c3534cbb9431e91b9667 Mon Sep 17 00:00:00 2001
From: Yuta Iwama <ganmacs@gmail.com>
Date: Thu, 31 Oct 2019 17:43:26 +0900
Subject: [PATCH 7/7] fixed failed spec

Signed-off-by: Yuta Iwama <ganmacs@gmail.com>
---
 lib/fluent/plugin/base.rb    | 2 +-
 test/command/test_fluentd.rb | 9 ++++++---
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/lib/fluent/plugin/base.rb b/lib/fluent/plugin/base.rb
index a7474db007..b5c16a69e6 100644
--- a/lib/fluent/plugin/base.rb
+++ b/lib/fluent/plugin/base.rb
@@ -52,7 +52,7 @@ def fluentd_worker_id
       end
 
       def configure(conf)
-        if conf.respond_to?(:for_this_worker?) && conf.for_this_worker?
+        if Fluent::Engine.supervisor_mode || (conf.respond_to?(:for_this_worker?) && conf.for_this_worker?)
           workers = if conf.target_worker_ids && !conf.target_worker_ids.empty?
                       conf.target_worker_ids.size
                     else
diff --git a/test/command/test_fluentd.rb b/test/command/test_fluentd.rb
index 97bd45a00b..ee0570ac77 100644
--- a/test/command/test_fluentd.rb
+++ b/test/command/test_fluentd.rb
@@ -625,7 +625,8 @@ def assert_fluentd_fails_to_start(cmdline, *pattern_list, timeout: 10)
   workers 2
 </system>
 <source>
-  @type single
+  @type dummy
+  tag dummy
   @id single
   @label @dummydata
 </source>
@@ -669,7 +670,8 @@ def write(chunk)
   workers 2
 </system>
 <source>
-  @type single
+  @type dummy
+  tag dummy
   @id single
   @label @dummydata
 </source>
@@ -793,7 +795,7 @@ def multi_workers_ready?
     @id   blackhole
     <buffer>
       @type file
-      path #{File.join(@root_path, "buf", "file.*.log")}
+      path #{File.join(@root_path, "buf")}
     </buffer>
   </match>
 </worker>
@@ -863,6 +865,7 @@ module Fluent::Plugin
   class FakeInput < Input
     Fluent::Plugin.register_input('fake', self)
     config_param :secret, :string, secret: true
+    def multi_workers_ready?; true; end
   end
 end
 EOC