PrimaryLogPG: Keep soid before erase entry#57545
Merged
Conversation
athanatos
previously requested changes
May 20, 2024
src/osd/PrimaryLogPG.cc
Outdated
| auto soid = unreadable_object_entry->first; | ||
| waiting_for_unreadable_object.erase(unreadable_object_entry); | ||
| finish_unreadable_object(unreadable_object_entry->first); | ||
| finish_unreadable_object(soid); |
Contributor
There was a problem hiding this comment.
How about we just move the call to finish_unreadable_object to before erasing the iterator? That saves us a copy and finish_unreadable_object doesn't seem like it cares.
Contributor
Author
There was a problem hiding this comment.
ok, will do that
valgrind errors show when we are erasing entry and then trying to use it. we need to keep the soid before the erase happen. Fixes: https://tracker.ceph.com/issues/64942 Signed-off-by: Nitzan Mordechai <nmordech@redhat.com>
ecdebfd to
f7bc4e4
Compare
ronen-fr
approved these changes
Jun 19, 2024
Contributor
Author
Contributor
|
@NitzanMordhai @athanatos This is ready for merge as soon as comments are resolved |
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
6 participants
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.
valgrind errors show when we are erasing entry and then trying to use it. we need to keep the soid before the erase happen.
Fixes: https://tracker.ceph.com/issues/64942
Contribution Guidelines
To sign and title your commits, please refer to Submitting Patches to Ceph.
If you are submitting a fix for a stable branch (e.g. "quincy"), please refer to Submitting Patches to Ceph - Backports for the proper workflow.
When filling out the below checklist, you may click boxes directly in the GitHub web UI. When entering or editing the entire PR message in the GitHub web UI editor, you may also select a checklist item by adding an
xbetween the brackets:[x]. Spaces and capitalization matter when checking off items this way.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 toxjenkins test windowsjenkins test rook e2e