mgr/telemetry: fix waiting for mgr to warm up #43864
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
liewegas
approved these changes
Nov 9, 2021
1. The implementation of config_notify() in telemetry module sets the flag for event, which is supposed to wake up the 'serve' thread whenever a config option is changed. The problem is that we call config_notify() at the beginning of serve(), before we enter its 'run' loop. This call sets the event which cancels the 10 seconds wait for the mgr to warm up. To fix this, we extract the logic of updating the config options to a separate function (config_update_module_option()), and call it on __init__, instead of calling config_notify() in serve(). 2. We should always wait for the mgr to warm up here (10 seconds). In case of a sporadic event (e.g. a config option change via CLI) the event will be set, and wait will return immediately. We enforce this wait by using time.sleep(10) instead of event.wait(10). Fixes: https://tracker.ceph.com/issues/53204 Signed-off-by: Yaarit Hatuka <yaarit@redhat.com>
yaarith
force-pushed
the
fix-config-notify
branch
from
8bc20a6
to
fa5cc0c
Compare
|
jenkins test make check arm64 |
This was referenced Apr 5, 2022
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 implementation of config_notify() in telemetry module sets the
flag for event, which is supposed to wake up the 'serve' thread whenever
a config option is changed. The problem is that we call config_notify()
at the beginning of serve(), before we enter its 'run' loop. This call
sets the event which cancels the 10 seconds wait for the mgr to warm up.
To fix this, we extract the logic of updating the config options to a
separate function (config_update_module_option()), and call it on
serve(), instead of config_notify().
We should always wait for the mgr to warm up here (10 seconds). In
case of a sporadic event (e.g. a config option change via CLI) the event
will be set, and wait will return immediately. We enforce this wait by
using time.sleep(10) instead of event.wait(10).
Fixes: https://tracker.ceph.com/issues/53204
Signed-off-by: Yaarit Hatuka yaarit@redhat.com
Checklist
Show available Jenkins commands
jenkins retest this pleasejenkins test classic perfjenkins test crimson perfjenkins test signedjenkins test make checkjenkins test make check arm64jenkins test submodulesjenkins test dashboardjenkins test dashboard cephadmjenkins test apijenkins test docsjenkins render docsjenkins test ceph-volume alljenkins test ceph-volume tox