jewel: librbd: properly order concurrent updates to the object map #12909
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
added 4 commits
January 12, 2017 10:57
Concurrent IO to the same object would previously result in the first IO pausing to update the object map while the other IO would proceed to directly update the object before the object map state was properly updated. Fixes: http://tracker.ceph.com/issues/16176 Signed-off-by: Jason Dillaman <dillaman@redhat.com> (cherry picked from commit 378b810) Conflicts: test/librbd/object_map/test_mock_UpdateRequest.cc: resize op signature
Signed-off-by: Jason Dillaman <dillaman@redhat.com> (cherry picked from commit 477ae54) Conflicts: src/librbd/AioObjectRequest.cc: trivial resolution src/librbd/ObjectMap.cc: trivial resolution src/librbd/operation/TrimRequest.cc: removed optimizations src/tools/rbd_mirror/image_sync/ObjectCopyRequest.cc: trivial resolution
Signed-off-by: Jason Dillaman <dillaman@redhat.com> (cherry picked from commit ea7b30a) Conflicts: src/librbd/image/CreateRequest.cc: not in jewel src/librbd/internal.cc: trivial resolution src/librbd/object_map/CreateRequest.cc: not in jewel src/librbd/object_map/RemoveRequest.cc: not in jewel src/test/librbd/test_ObjectMap.cc: trivial resolution
Signed-off-by: Jason Dillaman <dillaman@redhat.com> (cherry picked from commit b1d624b) Conflicts: src/librbd/BlockGuard.h: fixed compile issue src/librbd/Makefile.am: added BlockGuard src/test/Makefile-client.am: added BlockGuard test src/test/librbd/CMakeLists.txt: trivial resolution
…ject Signed-off-by: Jason Dillaman <dillaman@redhat.com> (cherry picked from commit 7d743bf)
dillaman
force-pushed
the
wip-18290-jewel
branch
from
873927d
to
cdd6cbf
Compare
|
@trociny This PR passed an RBD suite at http://tracker.ceph.com/issues/17851#note-41 [1] The failure was a reoccurrence of http://tracker.ceph.com/issues/17695 |
smithfarm
added a commit
to smithfarm/ceph
that referenced
this pull request
Aug 26, 2017
In master, the "batch update" change [1] was merged before the "order concurrent updates" [2], while in jewel the latter is already backported [3]. A partial backport of [1] was attempted, but the automated cherry-pick missed some parts of it which this commit is adding manually. [1] ceph#11510 [2] ceph#12420 [3] ceph#12909 Signed-off-by: Mykola Golub <mgolub@mirantis.com> Signed-off-by: Nathan Cutler <ncutler@suse.com>
smithfarm
added a commit
to smithfarm/ceph
that referenced
this pull request
Aug 26, 2017
In master, the "batch update" change [1] was merged before the "order concurrent updates" [2], while in jewel the latter is already backported [3]. A backport of [1] to jewel was attempted, and was necessarily applied on top of [3] - i.e. in the reverse order compared to how the commits went into master. This reverse ordering caused the automated cherry-pick to miss some parts of [1] which this commit is adding manually. [1] ceph#11510 [2] ceph#12420 [3] ceph#12909 Signed-off-by: Mykola Golub <mgolub@mirantis.com> Signed-off-by: Nathan Cutler <ncutler@suse.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.
http://tracker.ceph.com/issues/18290