osd/PrimaryLogPG: maybe_handle_manifest_detail - sanity check obc existence #17298
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
amitkumar50
reviewed
Aug 29, 2017
src/osd/PrimaryLogPG.cc
Outdated
| @@ -2371,6 +2371,11 @@ PrimaryLogPG::cache_result_t PrimaryLogPG::maybe_handle_manifest_detail( | |||
| } | |||
| } | |||
|
|
|||
| if (!obc || !obc->obs.oi.has_manifest()) { | |||
There was a problem hiding this comment.
How good it would be place this check at start of PrimaryLogPG::maybe_handle_manifest_detail
liewegas
requested changes
Aug 29, 2017
src/osd/PrimaryLogPG.cc
Outdated
| dout(10) << __func__ << " obc DNE or has no manifest" << dendl; | ||
| return cache_result_t::NOOP; | ||
| } | ||
|
|
There was a problem hiding this comment.
The caller only calls into handle_manifest of obc && obc->obs.oi.has_manifest(). Can we instead make this an assert at the top of the function, and remove teh various conditional checks for !obc? It will be simpler (this code was originally copy pasted from the cache case, which has to handle a missing object.. the manifest case does not!).
Thanks!
xiexingguo
force-pushed
the
wip-pg-null-obc-access
branch
2 times, most recently
from
a46e9c8
to
56105b8
Compare
…stence Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
|
retest this please |
liewegas
approved these changes
Sep 9, 2017
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.
Signed-off-by: xie xingguo xie.xingguo@zte.com.cn