osdc: After write try merge bh. #11545
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
liewegas
requested changes
Oct 19, 2016
| @@ -182,6 +182,7 @@ void ObjectCacher::Object::merge_left(BufferHead *left, BufferHead *right) | |||
|
|
|||
| // hose right | |||
| delete right; | |||
| right = nullptr; //see bh_write_commit | |||
| while (!hit.empty()) { | ||
| BufferHead *bh = hit.front(); | ||
| hit.pop_front(); | ||
| if (bh) |
There was a problem hiding this comment.
#11262 . In hit, the first may merged w/ the second. So i need know which be merged(delete). Yes as you said, set the local var to nullptr after delete don't indicate the related var in hit. But change the merge_left right to BufferHead **right. I think it's not a goog method.
majianpeng
force-pushed
the
osdc-objectcache-fix-bug
branch
from
a0970cb
to
c80492d
Compare
|
@liewegas . I think this version can work. |
liewegas
reviewed
Oct 21, 2016
|
|
||
| while (!hit.empty()) { | ||
| pair<loff_t, BufferHead*> p = hit.front(); | ||
| hit.erase(hit.begin()); |
There was a problem hiding this comment.
It would be more efficient to just iterate over the vector (for (auto &p : hit) { ... }) without erasing the front element (and shifting everything to the left).
|
Can you remove the Fixes line from the commit? It make me think this fixes a bug but it doesn't--it just optimizes in a non-buggy way :) Thanks! |
majianpeng
force-pushed
the
osdc-objectcache-fix-bug
branch
from
c80492d
to
8aaa854
Compare
Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.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:http://tracker.ceph.com/issues/17270
Signed-off-by: Jianpeng Ma jianpeng.ma@intel.com