Backport to hammer: issues 15886, 15745 #10070
Closed
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
Fixes: http://tracker.ceph.com/issues/15886 Only add a rados object to the written_objs list if the write was successful. Otherwise if the write will be canceled for some reason, we'd remove an object that we didn't write to. This was a problem in a case where there's multiple writes that went to the same part. The second writer should fail the write, since we do an exclusive write. However, we added the object's name to the written_objs list anyway, which was a real problem when the old processor was disposed (as it was clearing the objects). Signed-off-by: Yehuda Sadeh <yehuda@redhat.com> (cherry picked from commit 8fd74d1)
Fixes: http://tracker.ceph.com/issues/15745 When complete_writing_data() is called, if pending_data_bl is not empty we still need to handle stripe transition correctly. If pending_data_bl has more data that we can allow in current stripe, move to the next one. Signed-off-by: Yehuda Sadeh <yehuda@redhat.com> (cherry picked from commit b7a7d41) Conflicts: src/rgw/rgw_rados.cc (hammer write_data() takes rgw_obj reference as 4th argument, hammer throttle_data() takes rgw_obj as 2nd argument)
yehudasa
changed the title
|
@yehudasa seems you have a conflict, can you fix it? |
|
@oritwas seems that issue 15886 has already been merged in before. Only need to have 15745, I'll send a new PR |
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.
No description provided.