DNM : osd: avoid multi set osd_op.outdata in tier pool #5888
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
There are two read op on the same object for ec pool. First op read miss happend, calling do_proxy_read and promote_object, The second op only do_proxy_read. but before first op process_copy_chunk finish, the second op finish_proxy_read. first op receive reply from base pool first and then second received. so the second op set the field "outdata" in m->ops first. And then first op requeue_ops in process_copy_chunk, At last in do_osd_ops, it append outdata field. Fixes: 12540 Signed-off-by: Xinze Chi <xmdxcxz@gmail.com> (cherry picked from commit 855ae1f) Conflicts: src/osd/ReplicatedPG.cc
|
ghost
self-assigned this
|
@XinzeChi this commit does not apply cleanly, would you mind taking a look ? http://jenkins.ceph.dachary.org/job/ceph/LABELS=centos-7&&x86_64/7703/console osd/ReplicatedPG.cc:11761:76: error: expected '}' at end of input
void intrusive_ptr_release(ReplicatedPG::RepGather *repop) { repop->put(); }
^
osd/ReplicatedPG.cc:11761:76: error: expected '}' at end of input
|
|
@Abhishekvrshny , it conflicts with proxy write. |
|
@XinzeChi it would be great if you could adapt your patch to hammer. If the differences are such that it does not make sense to resolve the conflicts, a new patch is also fine. @Abhishekvrshny thanks for the reminder :-) |
Abhishekvrshny
changed the title
|
@dachary , @Abhishekvrshny , I have fix this conflict at #6060 |
|
closing this pr, as #6060 supersedes it. |
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/13036