fix OSD SEGV in heartbeat() #2198
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 dout_prefix for OSDService uses get_osdmap() to grab a shared_ptr for the epoch printout. The OSD one does not, and is not safe to run in all thread contexts. In particular, update_osd_stat() is run by the heartbeat thread and can race with the shared_ptr itself being updated with a new map. Ironically, if this were simply an OSDMap*, there would be no race since the pointer is a single word and updates atomically. Fix this, and any similar issues, by moving the OSDService methods up in OSD.cc so that they use the safe dout macro. Fixes: #8998 Backport: firefly (in a minimal form, I think!) Signed-off-by: Sage Weil <sage@redhat.com>
Use a get_osdmap_epoch() helper that is a bit lighter weight (by avoiding copying around an OSDMapRef). Signed-off-by: Sage Weil <sage@redhat.com>
athanatos
pushed a commit
that referenced
this pull request
Aug 4, 2014
fix OSD SEGV in heartbeat() Reviewed-by: Samuel Just <sam.just@inktank.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.
No description provided.