Windows: Fix an issue where stopping the service immediately after startup could leave the processes #4782
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Signed-off-by: Daijiro Fukuda <[email protected]>
Test
BeforeThe supervisor and worker processes remain if stopping the service immediately after startup. Powershell $ Start-Service fluentdwinsvc; Stop-Service fluentdwinsvc
$ (ps -Name ruby).length
2AfterThe supervisor and worker processes stop correctly if stopping the service immediately after startup. Powershell $ Start-Service fluentdwinsvc; Stop-Service fluentdwinsvc
$ (ps -Name ruby).length
0 |
Test: If max_retries(
|
kenhys
requested changes
Jan 28, 2025
Signed-off-by: Daijiro Fukuda <[email protected]> Co-authored-by: Kentaro Hayashi <[email protected]>
Signed-off-by: Daijiro Fukuda <[email protected]>
|
Thanks for your review! |
kenhys
added a commit
that referenced
this pull request
Jan 29, 2025
…artup could leave the processes (#4782) **Which issue(s) this PR fixes**: * Fixes #3937 **What this PR does / why we need it**: Add retry for stop event for Windows Service to fix #3937. If `Event.open()` ([OpenEvent](https://learn.microsoft.com/en-us/windows/win32/api/synchapi/nf-synchapi-openeventw)) is called before the `Event.new()` ([CreateEvent](https://learn.microsoft.com/en-us/windows/win32/api/synchapi/nf-synchapi-createeventw)), `Event.open()` raises `Errno::ENOENT`. This causes the service to be stopped while the supervisor and worker process remains. It causes #3937. This PR fixes it by adding retry. https://github.com/fluent/fluentd/blob/30c3ce00ff165b1b5d9f53fc0a027074bbcab0da/lib/fluent/winsvc.rb#L90 https://github.com/fluent/fluentd/blob/30c3ce00ff165b1b5d9f53fc0a027074bbcab0da/lib/fluent/supervisor.rb#L299 **Docs Changes**: Not needed. **Release Note**: It would be good to have both of the following. * Windows: Fixed an issue where stopping the service immediately after startup could leave the processes. * Windows: Fixed an issue where stopping service sometimes can not be completed forever. --------- Signed-off-by: Daijiro Fukuda <[email protected]> Co-authored-by: Kentaro Hayashi <[email protected]> Signed-off-by: Kentaro Hayashi <[email protected]>
daipom
added a commit
that referenced
this pull request
Jan 29, 2025
…diately after startup could leave the processes (#4782) (#4802) **Which issue(s) this PR fixes**: Backport #4782 **What this PR does / why we need it**: Add retry for stop event for Windows Service to fix #3937. If `Event.open()` ([OpenEvent](https://learn.microsoft.com/en-us/windows/win32/api/synchapi/nf-synchapi-openeventw)) is called before the `Event.new()` ([CreateEvent](https://learn.microsoft.com/en-us/windows/win32/api/synchapi/nf-synchapi-createeventw)), `Event.open()` raises `Errno::ENOENT`. This causes the service to be stopped while the supervisor and worker process remains. It causes #3937. This PR fixes it by adding retry. https://github.com/fluent/fluentd/blob/30c3ce00ff165b1b5d9f53fc0a027074bbcab0da/lib/fluent/winsvc.rb#L90 https://github.com/fluent/fluentd/blob/30c3ce00ff165b1b5d9f53fc0a027074bbcab0da/lib/fluent/supervisor.rb#L299 **Docs Changes**: Not needed. **Release Note**: It would be good to have both of the following. * Windows: Fixed an issue where stopping the service immediately after startup could leave the processes. * Windows: Fixed an issue where stopping service sometimes can not be completed forever. Signed-off-by: Daijiro Fukuda <[email protected]> Signed-off-by: Kentaro Hayashi <[email protected]> Co-authored-by: Daijiro Fukuda <[email protected]>
Merged
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Which issue(s) this PR fixes:
What this PR does / why we need it:
Add retry for stop event for Windows Service to fix #3937.
If
Event.open()(OpenEvent) is called before theEvent.new()(CreateEvent),Event.open()raisesErrno::ENOENT.This causes the service to be stopped while the supervisor and worker process remains.
It causes #3937.
This PR fixes it by adding retry.
fluentd/lib/fluent/winsvc.rb
Line 90 in 30c3ce0
fluentd/lib/fluent/supervisor.rb
Line 299 in 30c3ce0
Docs Changes:
Not needed.
Release Note:
It would be good to have both of the following.