mimic: Fix ceph-mgr restarts #22051
Merged
mimic: Fix ceph-mgr restarts #22051
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 prometheus serve method uses block which it should not as it can cause several problems when shutting down (restarting) ceph-mgr. As a result the restart of the ceph-mgr module will block until time-out if the prometheus module is enabled. This fixes the problem by using a simple simple shutdown_event instead of block() and stopping the server afterwards. Signed-off-by: Boris Ranto <branto@redhat.com> (cherry picked from commit a662caa)
The dashboard serve method uses block which it should not as it can cause several problems when shutting down (restarting) ceph-mgr. As a result the restart of the ceph-mgr module will block until time-out if the dashboard module is enabled. This fixes the problem by using a simple simple shutdown_event instead of block() and stopping the server afterwards. Signed-off-by: Boris Ranto <branto@redhat.com>
|
The prometheus part lgtm. Adding @rjfd for the dashboard commit. |
|
@s0nea could you run the dashboard QA tests with this PR? (notice this is targeting mimic) |
|
@rjfd yes, I'm going to try it (I'm not really sure if this will be successful because of the issues I'm currently facing in Teuthology). |
jcsp
approved these changes
May 17, 2018
|
The QA test run was successful: http://pulpito.ceph.com/tdehler-2018-05-17_12:16:04-rados:mgr-wip-tdehler-testing-distro-basic-mira/ |
|
That is great. @rjfd ok to merge? |
|
Possibly related: http://tracker.ceph.com/issues/24166 |
rjfd
approved these changes
May 19, 2018
|
already tested. so no need to run rados qa suite again. |
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.
This PR contains a mimic back-port for shutdown/restart fix for prometheus module and a patch to fix the shutdown/restart with dashboard module enabled in the similar way.