luminous: osd: do not crash on empty snapset #21638
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
smithfarm
changed the title
trociny
reviewed
Apr 25, 2018
src/osd/PrimaryLogPG.cc
Outdated
| @@ -10190,6 +10190,11 @@ int PrimaryLogPG::find_object_context(const hobject_t& oid, | |||
| first = p->second.back(); | |||
| last = p->second.front(); | |||
| } | |||
| if (p->second.empty()) { | |||
There was a problem hiding this comment.
@smithfarm this needs to be inside the above "else" block. Before first = p->second.back() -- we need to check that we can safely use p->second.back() and p->second.front().
There was a problem hiding this comment.
@trociny Oh, right. Fixing.
smithfarm
force-pushed
the
wip-23852-luminous
branch
from
d02872b
to
f070422
Compare
liewegas
previously approved these changes
Apr 25, 2018
trociny
reviewed
Apr 25, 2018
src/osd/PrimaryLogPG.cc
Outdated
| @@ -10189,6 +10189,11 @@ int PrimaryLogPG::find_object_context(const hobject_t& oid, | |||
| assert(p != obc->ssc->snapset.clone_snaps.end()); | |||
| first = p->second.back(); | |||
| last = p->second.front(); | |||
| if (p->second.empty()) { | |||
There was a problem hiding this comment.
@smithfarm It should be before first = p->second.back(). Because if p->second is empty, p->second.back() and p->second.front() will trigger segfault.
smithfarm
force-pushed
the
wip-23852-luminous
branch
from
f070422
to
c34983c
Compare
|
Ouch! I was not giving this PR the attention it deserved. Sorry for the trouble! |
tchaikov
approved these changes
May 7, 2018
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.
http://tracker.ceph.com/issues/23852