Fix smartproxy worker heartbeat thread #19816
Merged
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
The heartbeat worker thread and the main thread were competing to define the Workers::MiqDefaults constant. The main thread calls heartbeat from do_work_loop which is unavoidable. So to solve the problem we just wait until the first call to do_work to start the heartbeat worker. This allows the main thread to resolve the constant without contention and the heartbeat worker still gets started before we process the first queue message Fixes ManageIQ#19813
carbonin
commented
Feb 5, 2020
carbonin
changed the title
jerryk55
approved these changes
Feb 6, 2020
|
@miq-bot add_label smartstate |
|
@jerryk55 Cannot apply the following label because they are not recognized: smartstate |
Previously this could call join on a nil. Now that ruby 2.5 logs exceptions raised in threads by default we don't have to worry about joining the thread to re-raise. Instead we can just kill the thread if it's aborting and restart it if it is exited (cleanly or not).
carbonin
force-pushed
the
fix_smartproxy_worker
branch
from
752e2d6 to
8399786
Compare
|
Checked commits carbonin/manageiq@5a1eb86~...8399786 with ruby 2.5.5, rubocop 0.69.0, haml-lint 0.20.0, and yamllint 1.10.0 app/models/miq_smart_proxy_worker/runner.rb
|
carbonin
changed the title
jrafanie
reviewed
Feb 6, 2020
|
|
||
| # if the thread is dead, start a new one and kill it if it is aborting | ||
| if [email protected]? | ||
| @tid.kill if @tid.status == "aborting" |
There was a problem hiding this comment.
It's amazing how much easier this is to grok by splitting apart that conditional into two conditional checks.
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.
The heartbeat worker thread and the main thread were competing
to define the
Workers::MiqDefaultsconstant.The main thread calls heartbeat from
do_work_loopwhich isunavoidable. So to solve the problem we just wait until the first
call to
do_workto start the heartbeat worker.This allows the main thread to resolve the constant without contention
and the heartbeat worker still gets started before we process the
first queue message
Fixes #19813