Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

mimic: librbd: properly handle potential object map failures #30796

Merged
merged 3 commits into from Oct 17, 2019

Conversation

@dillaman
Copy link
Contributor

dillaman commented Oct 8, 2019

dillaman and others added 3 commits Sep 18, 2018
Remove the "ceph_assert" statements and instead bubble any potential
error code up to the caller. The object map state machines should
attempt to return a 0 upon failure unless it was unable to flag the
object map as invalid.

Fixes: http://tracker.ceph.com/issues/36074
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit 765f8ce)

Conflicts:
	src/librbd/DeepCopyRequest.cc: trivial resolution
	src/librbd/deep_copy/ObjectCopyRequest.cc: trivial resolution
	src/librbd/deep_copy/SnapshotCopyRequest.cc: trivial resolution
	src/librbd/exclusive_lock/PostAcquireRequest.cc: trivial resolution
	src/librbd/exclusive_lock/PreReleaseRequest.cc: trivial resolution
	src/librbd/image/RefreshRequest.cc: trivial resolution
	src/librbd/io/CopyupRequest.cc: trivial resolution
	src/librbd/io/ObjectRequest.cc: trivial resolution
	src/librbd/object_map/InvalidateRequest.cc: trivial resolution
	src/librbd/object_map/RefreshRequest.cc: trivial resolution
	src/librbd/object_map/SnapshotRemoveRequest.cc: trivial resolution
	src/librbd/operation/ResizeRequest.cc: trivial resolution
	src/librbd/operation/SnapshotCreateRequest.cc: trivial resolution
	src/librbd/operation/SnapshotRollbackRequest.cc: trivial resolution
Signed-off-by: Mykola Golub <mgolub@suse.com>
(cherry picked from commit 5a4526c)
This could result in a small race condition where IO is able to write
beyond the current extent of the object map, resulting in an assertion
failure.

Fixes: http://tracker.ceph.com/issues/39952
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit c8ce520)
@dillaman

This comment has been minimized.

Copy link
Contributor Author

dillaman commented Oct 8, 2019

@dillaman dillaman added this to the mimic milestone Oct 8, 2019
@smithfarm smithfarm requested a review from trociny Oct 9, 2019
@trociny
trociny approved these changes Oct 9, 2019
@yuriw

This comment has been minimized.

Copy link
Contributor

yuriw commented Oct 10, 2019

@yuriw yuriw merged commit c6578ed into ceph:mimic Oct 17, 2019
4 checks passed
4 checks passed
Docs: build check OK - docs built
Details
Signed-off-by all commits in this PR are signed
Details
Unmodified Submodules submodules for project are unmodified
Details
make check make check succeeded
Details
@dillaman dillaman deleted the dillaman:wip-36122-mimic branch Oct 17, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
3 participants
You can’t perform that action at this time.