mds: don't double-shutdown the timer when suiciding #7616
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
Fixes: ceph#14697 Signed-off-by: Greg Farnum <gfarnum@redhat.com>
gregsfortytwo
added a commit
that referenced
this pull request
Feb 12, 2016
… into greg-fs-testing #7616
| @@ -1101,6 +1099,7 @@ void MDSDaemon::suicide() | |||
| if (objecter->initialized.read()) { | |||
| objecter->shutdown(); | |||
| } | |||
| timer.shutdown(); | |||
There was a problem hiding this comment.
In the MDSRank case, we shutdown timer before objecter. However, looking at the things we call back from the timer, I don't think any of them do IO, so this should be safe too.
|
LGTM |
gregsfortytwo
added a commit
that referenced
this pull request
Feb 16, 2016
mds: don't double-shutdown the timer when suiciding Reviewed-by: John Spray <john.spray@redhat.com>
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.
Fixes: #14697
Signed-off-by: Greg Farnum gfarnum@redhat.com