Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Reload new config without restarting process #2716

Merged
merged 17 commits into from
Jan 7, 2020

Conversation

ganmacs
Copy link
Member

@ganmacs ganmacs commented Dec 9, 2019

Which issue(s) this PR fixes:
Fixes #2624

What this PR does / why we need it:

This change make fluentd be able to reload new config without restarting process with SIGUSR2 signal.

it's very lighter and safer than existing reloading feature. but it has 2 limitations.

  1. A change to system_config is ignored because it needs to restart(kill/spawn) process.
  2. All plugins must not use class variable when restarting.

Docs Changes:

Add USR2 description.

Release Note:

same as title

@ganmacs ganmacs force-pushed the light-reload branch 4 times, most recently from 620e7b0 to 7b64af2 Compare December 11, 2019 09:21
@ganmacs ganmacs added the enhancement Feature request or improve operations label Dec 16, 2019
Signed-off-by: Yuta Iwama <ganmacs@gmail.com>
Signed-off-by: Yuta Iwama <ganmacs@gmail.com>
Signed-off-by: Yuta Iwama <ganmacs@gmail.com>
Signed-off-by: Yuta Iwama <ganmacs@gmail.com>
Signed-off-by: Yuta Iwama <ganmacs@gmail.com>
Signed-off-by: Yuta Iwama <ganmacs@gmail.com>
Signed-off-by: Yuta Iwama <ganmacs@gmail.com>
Signed-off-by: Yuta Iwama <ganmacs@gmail.com>
@ganmacs ganmacs force-pushed the light-reload branch 2 times, most recently from 434d98d to ce616a0 Compare December 18, 2019 09:00
@ganmacs ganmacs changed the title Be able to reload new config without restarting process Reload new config without restarting process Dec 18, 2019
to check if config is valid before invoking configure

Signed-off-by: Yuta Iwama <ganmacs@gmail.com>
Signed-off-by: Yuta Iwama <ganmacs@gmail.com>
Signed-off-by: Yuta Iwama <ganmacs@gmail.com>
Copy link
Contributor

@cosmo0920 cosmo0920 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I feel StaticConfigAnalysis gives us special powers to report misconfiguration checking phase. 💪
I've added two comments for small concerns.

lib/fluent/engine.rb Outdated Show resolved Hide resolved
lib/fluent/engine.rb Outdated Show resolved Hide resolved
because replacing Supervisor#read_config with Fluent::Config.build

Signed-off-by: Yuta Iwama <ganmacs@gmail.com>
Signed-off-by: Yuta Iwama <ganmacs@gmail.com>
Signed-off-by: Yuta Iwama <ganmacs@gmail.com>
@ganmacs
Copy link
Member Author

ganmacs commented Dec 23, 2019

@repeatedly ?

lib/fluent/plugin/buf_file.rb Outdated Show resolved Hide resolved
lib/fluent/static_config_analysis.rb Outdated Show resolved Hide resolved
test/test_config.rb Outdated Show resolved Hide resolved
Signed-off-by: Yuta Iwama <ganmacs@gmail.com>
Signed-off-by: Yuta Iwama <ganmacs@gmail.com>
@repeatedly
Copy link
Member

repeatedly commented Jan 6, 2020

I noticed we need to update HTTP RPC for this feature.
Should we change this to use USR2 or add new path?

@rpc_server.mount_proc('/api/config.reload') { |req, res|

@cosmo0920
Copy link
Contributor

Should we change this to use USR2 or add new path?

I believe that we should add a new path for reloading config.
Windows does not have USR2 signal:

@ganmacs ganmacs self-assigned this Jan 6, 2020
Signed-off-by: Yuta Iwama <ganmacs@gmail.com>
@ganmacs
Copy link
Member Author

ganmacs commented Jan 6, 2020

I noticed we need to update HTTP RPC for this feature.
Should we change this to use USR2 or add new path?

Good catch! I forgot about it. I added new endpoint /api/config.gracefulReload(d8b8bc6) for compatibility.

Windows does not have USR2 signal:

I think this feature can't support windows like USR1 because a supervisor needs to send USR2 signal to workers to do this. https://github.com/fluent/fluentd/pull/2716/files#diff-dbe0e1ec4079138e48ca6a4d7c7248f9R215
We need to introduce another way to communicate between supervisor and workers without using a signal to be able to use this feature in windows.

@repeatedly repeatedly merged commit 2800465 into fluent:master Jan 7, 2020
@repeatedly
Copy link
Member

repeatedly commented Jan 7, 2020

I will release v1.9.0.rc1 soon.

@ganmacs ganmacs deleted the light-reload branch April 2, 2020 05:25
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
enhancement Feature request or improve operations
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Light reloading mechanism
3 participants